cs fixes

Author: kbond

src/JsPackageManager.php

@@ -85,6 +85,6 @@ private function addToPackageJson(string $package, string $version): void
 
         $packageJson['devDependencies'] = $devDeps;
 
-        $this->files->dumpFile('package.json', json_encode($packageJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        $this->files->dumpFile('package.json', json_encode($packageJson, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
     }
 }

src/Maker/MakeScaffold.php

@@ -59,7 +59,7 @@ public static function getCommandDescription(): string
     public function configureCommand(Command $command, InputConfiguration $inputConfig): void
     {
         $command
-            ->addArgument('name', InputArgument::OPTIONAL|InputArgument::IS_ARRAY, 'Scaffold name(s) to create')
+            ->addArgument('name', InputArgument::OPTIONAL | InputArgument::IS_ARRAY, 'Scaffold name(s) to create')
         ;
 
         $inputConfig->setArgumentAsNonInteractive('name');
@@ -103,7 +103,7 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
 
         $availableScaffolds = array_combine(
             array_keys($this->availableScaffolds()),
-            array_map(fn(array $scaffold) => $scaffold['description'], $this->availableScaffolds())
+            array_map(fn (array $scaffold) => $scaffold['description'], $this->availableScaffolds())
         );
 
         $input->setArgument('name', [$io->choice('Available scaffolds', $availableScaffolds)]);
@@ -176,14 +176,14 @@ private function generateScaffold(string $name, ConsoleStyle $io): void
 
     private function availableScaffolds(): array
     {
-        if (is_array($this->availableScaffolds)) {
+        if (\is_array($this->availableScaffolds)) {
             return $this->availableScaffolds;
         }
 
         $this->availableScaffolds = [];
         $finder = Finder::create()
             // todo, improve versioning system
-            ->in(\sprintf('%s/../Resources/scaffolds/%s.0', __DIR__, Kernel::MAJOR_VERSION))
+            ->in(sprintf('%s/../Resources/scaffolds/%s.0', __DIR__, Kernel::MAJOR_VERSION))
             ->name('*.php')
             ->depth(0)
         ;
@@ -193,7 +193,7 @@ private function availableScaffolds(): array
 
             $this->availableScaffolds[$name] = array_merge(
                 require $file,
-                ['dir' => dirname($file->getRealPath()).'/'.$name]
+                ['dir' => \dirname($file->getRealPath()).'/'.$name]
             );
         }
 

src/Resources/scaffolds/6.0/auth.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Symfony\Bundle\MakerBundle\FileManager;
 
 return [
@@ -12,16 +21,16 @@
         'symfony/web-profiler-bundle' => 'dev',
         'symfony/stopwatch' => 'dev',
     ],
-    'configure' => function(FileManager $files) {
+    'configure' => function (FileManager $files) {
         // add LoginUser service
-        $files->manipulateYaml('config/services.yaml', function(array $data) {
-            $data['services']['App\Security\LoginUser']['$authenticator'] ='@security.authenticator.form_login.main';
+        $files->manipulateYaml('config/services.yaml', function (array $data) {
+            $data['services']['App\Security\LoginUser']['$authenticator'] = '@security.authenticator.form_login.main';
 
             return $data;
         });
 
         // make security.yaml adjustments
-        $files->manipulateYaml('config/packages/security.yaml', function(array $data) {
+        $files->manipulateYaml('config/packages/security.yaml', function (array $data) {
             $data['security']['providers'] = [
                 'app_user_provider' => [
                     'entity' => [

src/Resources/scaffolds/6.0/auth/tests/Browser/Authentication.php

@@ -12,14 +12,14 @@ class Authentication extends Component
 {
     public static function assertAuthenticated(): \Closure
     {
-        return static function(self $auth) {
+        return static function (self $auth) {
             Assert::assertTrue($auth->collector()->isAuthenticated());
         };
     }
 
     public static function assertAuthenticatedAs(string $email): \Closure
     {
-        return static function(self $auth) use ($email) {
+        return static function (self $auth) use ($email) {
             $collector = $auth->collector();
 
             Assert::assertTrue($collector->isAuthenticated());
@@ -29,14 +29,14 @@ public static function assertAuthenticatedAs(string $email): \Closure
 
     public static function assertNotAuthenticated(): \Closure
     {
-        return static function(self $auth) {
+        return static function (self $auth) {
             Assert::assertFalse($auth->collector()->isAuthenticated());
         };
     }
 
     public static function expireSession(): \Closure
     {
-        return static function(CookieJar $cookies) {
+        return static function (CookieJar $cookies) {
             $cookies->expire('MOCKSESSID');
         };
     }
@@ -45,7 +45,7 @@ private function collector(): SecurityDataCollector
     {
         $browser = $this->browser();
 
-        assert($browser instanceof KernelBrowser);
+        \assert($browser instanceof KernelBrowser);
 
         $collector = $browser
             ->withProfiling()
@@ -54,7 +54,7 @@ private function collector(): SecurityDataCollector
             ->getCollector('security')
         ;
 
-        assert($collector instanceof SecurityDataCollector);
+        \assert($collector instanceof SecurityDataCollector);
 
         return $collector;
     }

src/Resources/scaffolds/6.0/auth/tests/Functional/AuthenticationTest.php

@@ -11,12 +11,11 @@
 
 class AuthenticationTest extends KernelTestCase
 {
-    use HasBrowser, Factories, ResetDatabase;
+    use Factories;
+    use HasBrowser;
+    use ResetDatabase;
 
-    /**
-     * @test
-     */
-    public function can_login_and_logout(): void
+    public function testCanLoginAndLogout(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -35,10 +34,7 @@ public function can_login_and_logout(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function login_with_target(): void
+    public function testLoginWithTarget(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -53,10 +49,7 @@ public function login_with_target(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function login_with_invalid_password(): void
+    public function testLoginWithInvalidPassword(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -73,10 +66,7 @@ public function login_with_invalid_password(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function login_with_invalid_email(): void
+    public function testLoginWithInvalidEmail(): void
     {
         $this->browser()
             ->visit('/login')
@@ -91,10 +81,7 @@ public function login_with_invalid_email(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function login_with_invalid_csrf(): void
+    public function testLoginWithInvalidCsrf(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -108,10 +95,7 @@ public function login_with_invalid_csrf(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function remember_me_enabled_by_default(): void
+    public function testRememberMeEnabledByDefault(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -128,10 +112,7 @@ public function remember_me_enabled_by_default(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function can_disable_remember_me(): void
+    public function testCanDisableRememberMe(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -149,10 +130,7 @@ public function can_disable_remember_me(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function fully_authenticated_login_redirect(): void
+    public function testFullyAuthenticatedLoginRedirect(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -169,10 +147,7 @@ public function fully_authenticated_login_redirect(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function fully_authenticated_login_target(): void
+    public function testFullyAuthenticatedLoginTarget(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -189,10 +164,7 @@ public function fully_authenticated_login_target(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function can_fully_authenticate_if_only_remembered(): void
+    public function testCanFullyAuthenticateIfOnlyRemembered(): void
     {
         UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
@@ -213,18 +185,15 @@ public function can_fully_authenticate_if_only_remembered(): void
         ;
     }
 
-    /**
-     * @test
-     */
-    public function legacy_password_hash_is_automatically_migrated_on_login(): void
+    public function testLegacyPasswordHashIsAutomaticallyMigratedOnLogin(): void
     {
         $user = UserFactory::createOne(['email' => '[email protected]', 'password' => '1234']);
 
         // set the password to a legacy hash (argon2id, 1234)
         $user->setPassword('$argon2id$v=19$m=10,t=3,p=1$K9AFR15goJiUD6AdpK0a6Q$RsP6y+FRnYUBovBmhVZO7wN6Caj2eI8dMTnm3+5aTxk');
         $user->save();
 
-        $this->assertSame(\PASSWORD_ARGON2ID, \password_get_info($user->getPassword())['algo']);
+        $this->assertSame(\PASSWORD_ARGON2ID, password_get_info($user->getPassword())['algo']);
 
         $this->browser()
             ->use(Authentication::assertNotAuthenticated())
@@ -237,22 +206,16 @@ public function legacy_password_hash_is_automatically_migrated_on_login(): void
             ->use(Authentication::assertAuthenticatedAs('[email protected]'))
         ;
 
-        $this->assertSame(\PASSWORD_DEFAULT, \password_get_info($user->getPassword())['algo']);
+        $this->assertSame(\PASSWORD_DEFAULT, password_get_info($user->getPassword())['algo']);
     }
 
-    /**
-     * @test
-     */
-    public function auto_redirected_to_authenticated_resource_after_login(): void
+    public function testAutoRedirectedToAuthenticatedResourceAfterLogin(): void
     {
         // complete this test when you have a page that requires authentication
         $this->markTestIncomplete();
     }
 
-    /**
-     * @test
-     */
-    public function auto_redirected_to_fully_authenticated_resource_after_fully_authenticated(): void
+    public function testAutoRedirectedToFullyAuthenticatedResourceAfterFullyAuthenticated(): void
     {
         // complete this test when/if you have a page that requires the user be "fully authenticated"
         $this->markTestIncomplete();

src/Resources/scaffolds/6.0/bootstrapcss.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Symfony\Bundle\MakerBundle\FileManager;
 
 return [
@@ -12,9 +21,9 @@
         'bootstrap' => '^5.0.0',
         '@popperjs/core' => '^2.0.0',
     ],
-    'configure' => function(FileManager $files) {
+    'configure' => function (FileManager $files) {
         // add bootstrap form theme
-        $files->manipulateYaml('config/packages/twig.yaml', function(array $data) {
+        $files->manipulateYaml('config/packages/twig.yaml', function (array $data) {
             $data['twig']['form_themes'] = ['bootstrap_5_layout.html.twig'];
 
             return $data;

src/Resources/scaffolds/6.0/change-password.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 return [
     'description' => 'Create change password form and tests.',
     'dependents' => [
@@ -8,5 +17,5 @@
     'packages' => [
         'symfony/form' => 'all',
         'symfony/validator' => 'all',
-    ]
+    ],
 ];

src/Resources/scaffolds/6.0/change-password/src/Controller/User/ChangePasswordController.php

@@ -20,8 +20,7 @@ public function __invoke(
         UserPasswordHasherInterface $userPasswordHasher,
         UserRepository $userRepository,
         ?UserInterface $user = null,
-    ): Response
-    {
+    ): Response {
         if (!$user) {
             throw $this->createAccessDeniedException();
         }
@@ -49,7 +48,7 @@ public function __invoke(
         }
 
         return $this->render('user/change_password.html.twig', [
-            'changePasswordForm' => $form->createView()
+            'changePasswordForm' => $form->createView(),
         ]);
     }
 }