adding phpcs rules and using short arrays

weaverryan · weaverryan · commit 34f8bbd3d478 · 2017-11-28T13:46:25.000-05:00
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,18 @@
+<?php
+
+if (!file_exists(__DIR__.'/src')) {
+    exit(0);
+}
+return PhpCsFixer\Config::create()
+    ->setRules(array(
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => array('syntax' => 'short'),
+        'protected_to_private' => false,
+    ))
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__.'/src')
+    )
+;
diff --git a/src/Command/MakerCommand.php b/src/Command/MakerCommand.php
@@ -78,7 +78,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
                 continue;
             }
 
-            $value = $this->io->ask($argument->getDescription(), $argument->getDefault(), array(Validator::class, 'notBlank'));
+            $value = $this->io->ask($argument->getDescription(), $argument->getDefault(), [Validator::class, 'notBlank']);
             $input->setArgument($argument->getName(), $value);
         }
 
diff --git a/src/DependencyInjection/CompilerPass/MakeCommandRegistrationPass.php b/src/DependencyInjection/CompilerPass/MakeCommandRegistrationPass.php
@@ -26,10 +26,10 @@ public function process(ContainerBuilder $container)
             $container->register(
                 sprintf('maker.auto_command.%s', Str::asTwigVariable($class::getCommandName())),
                 MakerCommand::class
-            )->setArguments(array(
+            )->setArguments([
                 new Reference($id),
                 new Reference('maker.generator'),
-            ))->addTag('console.command', array('command' => $class::getCommandName()));
+            ])->addTag('console.command', ['command' => $class::getCommandName()]);
         }
     }
 }
diff --git a/src/EventRegistry.php b/src/EventRegistry.php
@@ -34,7 +34,7 @@
 class EventRegistry
 {
     // list of *known* events to always include (if they exist)
-    private static $eventsMap = array(
+    private static $eventsMap = [
         'console.command' => ConsoleCommandEvent::class,
         'console.terminate' => ConsoleTerminateEvent::class,
         'console.error' => ConsoleErrorEvent::class,
@@ -50,7 +50,7 @@ class EventRegistry
         'security.authentication.failure' => AuthenticationFailureEvent::class,
         'security.interactive_login' => InteractiveLoginEvent::class,
         'security.switch_user' => SwitchUserEvent::class,
-    );
+    ];
 
     private $eventDispatcher;
 
@@ -64,7 +64,7 @@ public function __construct(EventDispatcherInterface $eventDispatcher)
      */
     public function getAllActiveEvents(): array
     {
-        $activeEvents = array();
+        $activeEvents = [];
         foreach (self::$eventsMap as $eventName => $eventClass) {
             if (!class_exists($eventClass)) {
                 continue;
diff --git a/src/InputConfiguration.php b/src/InputConfiguration.php
@@ -4,7 +4,7 @@
 
 final class InputConfiguration
 {
-    private $nonInteractiveArguments = array();
+    private $nonInteractiveArguments = [];
 
     /**
      * Call in MakerInterface::configureCommand() to disable the automatic interactive
diff --git a/src/Maker/MakeAuthenticator.php b/src/Maker/MakeAuthenticator.php
@@ -50,24 +50,24 @@ public function getParameters(InputInterface $input): array
         $className = Str::asClassName($input->getArgument('authenticator-class'));
         Validator::validateClassName($className);
 
-        return array(
+        return [
             'class_name' => $className,
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/authenticator/Empty.php.txt' => 'src/Security/'.$params['class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: Customize your new authenticator.',
             'Then, configure the "guard" key on your firewall to use it.',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeCommand.php b/src/Maker/MakeCommand.php
@@ -51,25 +51,25 @@ public function getParameters(InputInterface $input): array
         $commandClassName = Str::asClassName($commandName, 'Command');
         Validator::validateClassName($commandClassName, sprintf('The "%s" command name is not valid because it would be implemented by "%s" class, which is not valid as a PHP class name (it must start with a letter or underscore, followed by any number of letters, numbers, or underscores).', $commandName, $commandClassName));
 
-        return array(
+        return [
             'command_name' => $commandName,
             'command_class_name' => $commandClassName,
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/command/Command.php.txt' => 'src/Command/'.$params['command_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: open your new command class and customize it!',
             'Find the documentation at <fg=yellow>https://symfony.com/doc/current/console.html</>',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeController.php b/src/Maker/MakeController.php
@@ -60,20 +60,20 @@ public function getParameters(InputInterface $input): array
         $controllerClassName = Str::asClassName($input->getArgument('controller-class'), 'Controller');
         Validator::validateClassName($controllerClassName);
 
-        return array(
+        return [
             'controller_class_name' => $controllerClassName,
             'route_path' => Str::asRoutePath(str_replace('Controller', '', $controllerClassName)),
             'route_name' => Str::asRouteName(str_replace('Controller', '', $controllerClassName)),
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
         $skeletonFile = $this->isTwigInstalled() ? 'ControllerWithTwig.php.txt' : 'Controller.php.txt';
 
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/controller/'.$skeletonFile => 'src/Controller/'.$params['controller_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
diff --git a/src/Maker/MakeEntity.php b/src/Maker/MakeEntity.php
@@ -53,27 +53,27 @@ public function getParameters(InputInterface $input): array
         $entityAlias = strtolower($entityClassName[0]);
         $repositoryClassName = Str::addSuffix($entityClassName, 'Repository');
 
-        return array(
+        return [
             'entity_class_name' => $entityClassName,
             'entity_alias' => $entityAlias,
             'repository_class_name' => $repositoryClassName,
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/doctrine/Entity.php.txt' => 'src/Entity/'.$params['entity_class_name'].'.php',
             __DIR__.'/../Resources/skeleton/doctrine/Repository.php.txt' => 'src/Repository/'.$params['repository_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: Add more fields to your entity and start using it.',
             'Find the documentation at <fg=yellow>https://symfony.com/doc/current/doctrine.html#creating-an-entity-class</>',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeForm.php b/src/Maker/MakeForm.php
@@ -53,25 +53,25 @@ public function getParameters(InputInterface $input): array
         Validator::validateClassName($formClassName);
         $entityClassName = Str::removeSuffix($formClassName, 'Type');
 
-        return array(
+        return [
             'form_class_name' => $formClassName,
             'entity_class_name' => $entityClassName,
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/form/Type.php.txt' => 'src/Form/'.$params['form_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: Add fields to your form and start using it.',
             'Find the documentation at <fg=yellow>https://symfony.com/doc/current/forms.html</>',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeFunctionalTest.php b/src/Maker/MakeFunctionalTest.php
@@ -50,24 +50,24 @@ public function getParameters(InputInterface $input): array
         $testClassName = Str::asClassName($input->getArgument('name'), 'Test');
         Validator::validateClassName($testClassName);
 
-        return array(
+        return [
             'test_class_name' => $testClassName,
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/test/Functional.php.txt' => 'tests/'.$params['test_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: Open your new test class and start customizing it.',
             'Find the documentation at <fg=yellow>https://symfony.com/doc/current/testing.html#functional-tests</>',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeSerializerEncoder.php b/src/Maker/MakeSerializerEncoder.php
@@ -52,25 +52,25 @@ public function getParameters(InputInterface $input): array
         Validator::validateClassName($encoderClassName);
         $format = $input->getArgument('format');
 
-        return array(
+        return [
             'encoder_class_name' => $encoderClassName,
             'format' => $format,
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/serializer/Encoder.php.txt' => 'src/Serializer/'.$params['encoder_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: Open your new serializer encoder class and start customizing it.',
             'Find the documentation at <fg=yellow>http://symfony.com/doc/current/serializer/custom_encoders.html</>',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeSubscriber.php b/src/Maker/MakeSubscriber.php
@@ -62,7 +62,7 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
             $io->listing($events);
             $question = new Question(sprintf(' <fg=green>%s</>', $command->getDefinition()->getArgument('event')->getDescription()));
             $question->setAutocompleterValues($events);
-            $question->setValidator(array(Validator::class, 'notBlank'));
+            $question->setValidator([Validator::class, 'notBlank']);
             $event = $io->askQuestion($question);
             $input->setArgument('event', $event);
         }
@@ -80,28 +80,28 @@ public function getParameters(InputInterface $input): array
             $eventShortName = end($pieces);
         }
 
-        return array(
+        return [
             'subscriber_class_name' => $subscriberClassName,
             'event' => $event,
             'eventArg' => $eventShortName ? sprintf('%s $event', $eventShortName) : '$event',
             'methodName' => Str::asEventMethod($event),
             'eventUseStatement' => $eventClass ? sprintf("use $eventClass;\n") : '',
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/event/Subscriber.php.txt' => 'src/EventSubscriber/'.$params['subscriber_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: Open your new subscriber class and start customizing it.',
             'Find the documentation at <fg=yellow>https://symfony.com/doc/current/event_dispatcher.html#creating-an-event-subscriber</>',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeTwigExtension.php b/src/Maker/MakeTwigExtension.php
@@ -51,24 +51,24 @@ public function getParameters(InputInterface $input): array
         $extensionClassName = Str::asClassName($input->getArgument('name'), 'Extension');
         Validator::validateClassName($extensionClassName);
 
-        return array(
+        return [
             'extension_class_name' => $extensionClassName,
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/twig/Extension.php.txt' => 'src/Twig/'.$params['extension_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: Open your new extension class and start customizing it.',
             'Find the documentation at <fg=yellow>http://symfony.com/doc/current/templating/twig_extension.html</>',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeUnitTest.php b/src/Maker/MakeUnitTest.php
@@ -50,24 +50,24 @@ public function getParameters(InputInterface $input): array
         $testClassName = Str::asClassName($input->getArgument('name'), 'Test');
         Validator::validateClassName($testClassName);
 
-        return array(
+        return [
             'test_class_name' => $testClassName,
-        );
+        ];
     }
 
     public function getFiles(array $params): array
     {
-        return array(
+        return [
             __DIR__.'/../Resources/skeleton/test/Unit.php.txt' => 'tests/'.$params['test_class_name'].'.php',
-        );
+        ];
     }
 
     public function writeNextStepsMessage(array $params, ConsoleStyle $io): void
     {
-        $io->text(array(
+        $io->text([
             'Next: Open your new test class and start customizing it.',
             'Find the documentation at <fg=yellow>https://symfony.com/doc/current/testing.html#unit-tests</>',
-        ));
+        ]);
     }
 
     public function configureDependencies(DependencyBuilder $dependencies): void
diff --git a/src/Maker/MakeValidator.php b/src/Maker/MakeValidator.php
diff --git a/src/Maker/MakeVoter.php b/src/Maker/MakeVoter.php
diff --git a/src/Str.php b/src/Str.php

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ protected function interact(InputInterface $input, OutputInterface $output)`
`78`	`78`	`continue;`
`79`	`79`	`}`
`80`	`80`
`81`		`- $value = $this->io->ask($argument->getDescription(), $argument->getDefault(), array(Validator::class, 'notBlank'));`
	`81`	`+ $value = $this->io->ask($argument->getDescription(), $argument->getDefault(), [Validator::class, 'notBlank']);`
`82`	`82`	`$input->setArgument($argument->getName(), $value);`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,10 @@ public function process(ContainerBuilder $container)`
`26`	`26`	`$container->register(`
`27`	`27`	`sprintf('maker.auto_command.%s', Str::asTwigVariable($class::getCommandName())),`
`28`	`28`	`MakerCommand::class`
`29`		`- )->setArguments(array(`
	`29`	`+ )->setArguments([`
`30`	`30`	`new Reference($id),`
`31`	`31`	`new Reference('maker.generator'),`
`32`		`- ))->addTag('console.command', array('command' => $class::getCommandName()));`
	`32`	`+ ])->addTag('console.command', ['command' => $class::getCommandName()]);`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`final class InputConfiguration`
`6`	`6`	`{`
`7`		`- private $nonInteractiveArguments = array();`
	`7`	`+ private $nonInteractiveArguments = [];`
`8`	`8`
`9`	`9`	`/**`
`10`	`10`	`* Call in MakerInterface::configureCommand() to disable the automatic interactive`
Original file line number	Diff line number	Diff line change
`@@ -50,24 +50,24 @@ public function getParameters(InputInterface $input): array`
`50`	`50`	`$className = Str::asClassName($input->getArgument('authenticator-class'));`
`51`	`51`	`Validator::validateClassName($className);`
`52`	`52`
`53`		`- return array(`
	`53`	`+ return [`
`54`	`54`	`'class_name' => $className,`
`55`		`- );`
	`55`	`+ ];`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function getFiles(array $params): array`
`59`	`59`	`{`
`60`		`- return array(`
	`60`	`+ return [`
`61`	`61`	`__DIR__.'/../Resources/skeleton/authenticator/Empty.php.txt' => 'src/Security/'.$params['class_name'].'.php',`
`62`		`- );`
	`62`	`+ ];`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public function writeNextStepsMessage(array $params, ConsoleStyle $io): void`
`66`	`66`	`{`
`67`		`- $io->text(array(`
	`67`	`+ $io->text([`
`68`	`68`	`'Next: Customize your new authenticator.',`
`69`	`69`	`'Then, configure the "guard" key on your firewall to use it.',`
`70`		`- ));`
	`70`	`+ ]);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public function configureDependencies(DependencyBuilder $dependencies): void`
Original file line number	Diff line number	Diff line change
`@@ -51,25 +51,25 @@ public function getParameters(InputInterface $input): array`
`51`	`51`	`$commandClassName = Str::asClassName($commandName, 'Command');`
`52`	`52`	`Validator::validateClassName($commandClassName, sprintf('The "%s" command name is not valid because it would be implemented by "%s" class, which is not valid as a PHP class name (it must start with a letter or underscore, followed by any number of letters, numbers, or underscores).', $commandName, $commandClassName));`
`53`	`53`
`54`		`- return array(`
	`54`	`+ return [`
`55`	`55`	`'command_name' => $commandName,`
`56`	`56`	`'command_class_name' => $commandClassName,`
`57`		`- );`
	`57`	`+ ];`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public function getFiles(array $params): array`
`61`	`61`	`{`
`62`		`- return array(`
	`62`	`+ return [`
`63`	`63`	`__DIR__.'/../Resources/skeleton/command/Command.php.txt' => 'src/Command/'.$params['command_class_name'].'.php',`
`64`		`- );`
	`64`	`+ ];`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public function writeNextStepsMessage(array $params, ConsoleStyle $io): void`
`68`	`68`	`{`
`69`		`- $io->text(array(`
	`69`	`+ $io->text([`
`70`	`70`	`'Next: open your new command class and customize it!',`
`71`	`71`	`'Find the documentation at <fg=yellow>https://symfony.com/doc/current/console.html</>',`
`72`		`- ));`
	`72`	`+ ]);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public function configureDependencies(DependencyBuilder $dependencies): void`
Original file line number	Diff line number	Diff line change
`@@ -53,25 +53,25 @@ public function getParameters(InputInterface $input): array`
`53`	`53`	`Validator::validateClassName($formClassName);`
`54`	`54`	`$entityClassName = Str::removeSuffix($formClassName, 'Type');`
`55`	`55`
`56`		`- return array(`
	`56`	`+ return [`
`57`	`57`	`'form_class_name' => $formClassName,`
`58`	`58`	`'entity_class_name' => $entityClassName,`
`59`		`- );`
	`59`	`+ ];`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public function getFiles(array $params): array`
`63`	`63`	`{`
`64`		`- return array(`
	`64`	`+ return [`
`65`	`65`	`__DIR__.'/../Resources/skeleton/form/Type.php.txt' => 'src/Form/'.$params['form_class_name'].'.php',`
`66`		`- );`
	`66`	`+ ];`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public function writeNextStepsMessage(array $params, ConsoleStyle $io): void`
`70`	`70`	`{`
`71`		`- $io->text(array(`
	`71`	`+ $io->text([`
`72`	`72`	`'Next: Add fields to your form and start using it.',`
`73`	`73`	`'Find the documentation at <fg=yellow>https://symfony.com/doc/current/forms.html</>',`
`74`		`- ));`
	`74`	`+ ]);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public function configureDependencies(DependencyBuilder $dependencies): void`