extending php-cs to the tests/ directory

weaverryan · weaverryan · commit 28c26b5f385f · 2020-03-04T08:56:19.000-05:00
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -5,7 +5,10 @@ if (!file_exists(__DIR__.'/src')) {
 }
 
 $finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__.'/src')
+    ->in(__DIR__)
+    ->exclude('vendor')
+    ->exclude('tests/tmp')
+    ->exclude('fixtures')
     // the PHP template files are a bit special
     ->notName('*.tpl.php')
 ;
diff --git a/tests/EventRegistryTest.php b/tests/EventRegistryTest.php
@@ -35,7 +35,7 @@ public function testGetEventClassNameReturnsType()
 
         // less than PHP 7.2, unset object type-hint example
         // otherwise, it looks like a class in this namespace
-        if (PHP_VERSION_ID < 70200) {
+        if (\PHP_VERSION_ID < 70200) {
             unset($listenersMap[3]);
         }
 
diff --git a/tests/GeneratorTwigHelperTest.php b/tests/GeneratorTwigHelperTest.php
@@ -19,11 +19,6 @@ class GeneratorTwigHelperTest extends TestCase
 {
     /**
      * @dataProvider getEntityFieldPrintCodeTests
-     *
-     * @param string $entity
-     * @param string $fieldName
-     * @param string $fieldType
-     * @param string $expect
      */
     public function testGetEntityFieldPrintCode(string $entity, string $fieldName, string $fieldType, string $expect)
     {
diff --git a/tests/Maker/FunctionalTest.php b/tests/Maker/FunctionalTest.php
@@ -40,7 +40,7 @@ public function testWiring()
                 continue;
             }
 
-            /** Skip make forgotten password as it is temp. disabled (tkt#537) */
+            /* Skip make forgotten password as it is temp. disabled (tkt#537) */
             if (MakeForgottenPassword::class === $class) {
                 continue;
             }
diff --git a/tests/Maker/MakeAuthenticatorTest.php b/tests/Maker/MakeAuthenticatorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeAuthenticator;
diff --git a/tests/Maker/MakeCommandTest.php b/tests/Maker/MakeCommandTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeCommand;
@@ -29,4 +38,4 @@ public function getTestDetails()
             ->changeRootNamespace('Custom'),
         ];
     }
-}
+}
diff --git a/tests/Maker/MakeControllerTest.php b/tests/Maker/MakeControllerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeController;
diff --git a/tests/Maker/MakeCrudTest.php b/tests/Maker/MakeCrudTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeCrud;
diff --git a/tests/Maker/MakeEntityTest.php b/tests/Maker/MakeEntityTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeEntity;
diff --git a/tests/Maker/MakeFixturesTest.php b/tests/Maker/MakeFixturesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeFixtures;
diff --git a/tests/Maker/MakeForgottenPasswordTest.php b/tests/Maker/MakeForgottenPasswordTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeForgottenPassword;
@@ -10,6 +19,7 @@ class MakeForgottenPasswordTest extends MakerTestCase
 {
     /**
      * Test skipped until make forgotten password is enabled again.
+     *
      * @see https://github.com/symfony/maker-bundle/issues/537
      */
     public function getTestDetails()
@@ -27,7 +37,7 @@ public function getTestDetails()
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeForgottenPassword')
             ->configureDatabase()
             ->updateSchemaAfterCommand()
-            ->addExtraDependencies('symfony/swiftmailer-bundle')
+            ->addExtraDependencies('symfony/swiftmailer-bundle'),
         ];
     }
 }
diff --git a/tests/Maker/MakeFormTest.php b/tests/Maker/MakeFormTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeForm;
diff --git a/tests/Maker/MakeFunctionalTestTest.php b/tests/Maker/MakeFunctionalTestTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeFunctionalTest;
diff --git a/tests/Maker/MakeMigrationTest.php b/tests/Maker/MakeMigrationTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeMigration;
diff --git a/tests/Maker/MakeRegistrationFormTest.php b/tests/Maker/MakeRegistrationFormTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeRegistrationForm;
@@ -28,7 +37,7 @@ public function getTestDetails()
             // test run, the UniqueEntity would not be seen, because
             // the the validation cache was out of date. The cause
             // is currently unknown, so this workaround was added
-            ->addPostMakeCommand('php bin/console cache:clear --env=test')
+            ->addPostMakeCommand('php bin/console cache:clear --env=test'),
         ];
 
         // sanity check on all the interactive questions
@@ -59,7 +68,7 @@ public function getTestDetails()
             ->updateSchemaAfterCommand()
             // workaround for strange failure - see test case
             // registration_form_entity_guard_authenticate for details
-            ->addPostMakeCommand('php bin/console cache:clear --env=test')
+            ->addPostMakeCommand('php bin/console cache:clear --env=test'),
         ];
     }
 }
diff --git a/tests/Maker/MakeSerializerEncoderTest.php b/tests/Maker/MakeSerializerEncoderTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeSerializerEncoder;
diff --git a/tests/Maker/MakeSubscriberTest.php b/tests/Maker/MakeSubscriberTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeSubscriber;
diff --git a/tests/Maker/MakeTwigExtensionTest.php b/tests/Maker/MakeTwigExtensionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeTwigExtension;
diff --git a/tests/Maker/MakeUnitTestTest.php b/tests/Maker/MakeUnitTestTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeUnitTest;
diff --git a/tests/Maker/MakeUserTest.php b/tests/Maker/MakeUserTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeUser;
diff --git a/tests/Maker/MakeValidatorTest.php b/tests/Maker/MakeValidatorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeValidator;
diff --git a/tests/Maker/MakeVoterTest.php b/tests/Maker/MakeVoterTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Bundle\MakerBundle\Tests\Maker;
 
 use Symfony\Bundle\MakerBundle\Maker\MakeVoter;
diff --git a/tests/Security/InteractiveSecurityHelperTest.php b/tests/Security/InteractiveSecurityHelperTest.php

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,10 @@ if (!file_exists(__DIR__.'/src')) {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`$finder = PhpCsFixer\Finder::create()`
`8`		`- ->in(__DIR__.'/src')`
	`8`	`+ ->in(__DIR__)`
	`9`	`+ ->exclude('vendor')`
	`10`	`+ ->exclude('tests/tmp')`
	`11`	`+ ->exclude('fixtures')`
`9`	`12`	`// the PHP template files are a bit special`
`10`	`13`	`->notName('*.tpl.php')`
`11`	`14`	`;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function testGetEventClassNameReturnsType()`
`35`	`35`
`36`	`36`	`// less than PHP 7.2, unset object type-hint example`
`37`	`37`	`// otherwise, it looks like a class in this namespace`
`38`		`- if (PHP_VERSION_ID < 70200) {`
	`38`	`+ if (\PHP_VERSION_ID < 70200) {`
`39`	`39`	`unset($listenersMap[3]);`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,6 @@ class GeneratorTwigHelperTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`	`21`	`* @dataProvider getEntityFieldPrintCodeTests`
`22`		`- *`
`23`		`- * @param string $entity`
`24`		`- * @param string $fieldName`
`25`		`- * @param string $fieldType`
`26`		`- * @param string $expect`
`27`	`22`	`*/`
`28`	`23`	`public function testGetEntityFieldPrintCode(string $entity, string $fieldName, string $fieldType, string $expect)`
`29`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function testWiring()`
`40`	`40`	`continue;`
`41`	`41`	`}`
`42`	`42`
`43`		`- /** Skip make forgotten password as it is temp. disabled (tkt#537) */`
	`43`	`+ /* Skip make forgotten password as it is temp. disabled (tkt#537) */`
`44`	`44`	`if (MakeForgottenPassword::class === $class) {`
`45`	`45`	`continue;`
`46`	`46`	`}`