php-cs-fixer round

EmanueleMinotto · EmanueleMinotto · commit 3e91406d4170 · 2015-10-05T10:43:29.000+02:00
diff --git a/src/Bridge/FormFactory/ConsoleFormWithDefaultValuesAndOptionsFactory.php b/src/Bridge/FormFactory/ConsoleFormWithDefaultValuesAndOptionsFactory.php
@@ -44,7 +44,7 @@ public function create($formType, InputInterface $input, array $options = [])
         $formBuilder = $this->formFactory->createBuilder($formType, null, $options);
 
         foreach ($formBuilder as $name => $childBuilder) {
-            /** @var FormBuilderInterface $childBuilder */
+            /* @var FormBuilderInterface $childBuilder */
             if (!$input->hasOption($name)) {
                 continue;
             }
diff --git a/test/AppKernel.php b/test/AppKernel.php
@@ -13,22 +13,22 @@ public function registerBundles()
     {
         return array(
             new FrameworkBundle(),
-            new SymfonyConsoleFormBundle()
+            new SymfonyConsoleFormBundle(),
         );
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__ . '/config.yml');
+        $loader->load(__DIR__.'/config.yml');
     }
 
     public function getCacheDir()
     {
-        return __DIR__ . '/temp/cache';
+        return __DIR__.'/temp/cache';
     }
 
     public function getLogDir()
     {
-        return __DIR__ . '/temp/logs';
+        return __DIR__.'/temp/logs';
     }
 }
diff --git a/test/Command/PrintFormDataCommand.php b/test/Command/PrintFormDataCommand.php
@@ -10,6 +10,6 @@ class PrintFormDataCommand extends DynamicFormBasedCommand
 {
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $output->write(print_r($this->formData(),true));
+        $output->write(print_r($this->formData(), true));
     }
 }
diff --git a/test/Form/AddressType.php b/test/Form/AddressType.php
@@ -15,7 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'street',
                 'text',
                 [
-                    'label' => 'Street'
+                    'label' => 'Street',
                 ]
             );
     }
@@ -24,7 +24,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(
             [
-                'data_class' => 'Matthias\SymfonyConsoleForm\Tests\Form\Data\Address'
+                'data_class' => 'Matthias\SymfonyConsoleForm\Tests\Form\Data\Address',
             ]
         );
     }
diff --git a/test/Form/ColorType.php b/test/Form/ColorType.php
@@ -15,9 +15,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'choices' => array(
                     'red' => 'Red',
                     'blue' => 'Blue',
-                    'yellow' => 'Yellow'
+                    'yellow' => 'Yellow',
                 ),
-                'data' => 'red'
+                'data' => 'red',
             ));
     }
 
diff --git a/test/Form/ColorWithChoicesAsValuesType.php b/test/Form/ColorWithChoicesAsValuesType.php
@@ -15,10 +15,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'choices' => array(
                     'Red' => 'red',
                     'Blue' => 'blue',
-                    'Yellow' => 'yellow'
+                    'Yellow' => 'yellow',
                 ),
                 'data' => 'red',
-                'choices_as_values' => true
+                'choices_as_values' => true,
             ));
     }
 
diff --git a/test/Form/DemoType.php b/test/Form/DemoType.php
@@ -19,7 +19,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 [
                     'label' => 'Your name',
                     'required' => true,
-                    'data' => 'Matthias'
+                    'data' => 'Matthias',
                 ]
             )
             ->add(
@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 [
                     'type' => new AddressType(),
                     'allow_add' => true,
-                    'label' => 'Addresses'
+                    'label' => 'Addresses',
                 ]
             )
             ->add(
@@ -37,8 +37,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 [
                     'label' => 'Your email address',
                     'constraints' => [
-                        new Email()
-                    ]
+                        new Email(),
+                    ],
                 ]
             )
             ->add(
@@ -47,8 +47,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 [
                     'label' => 'Where do you live?',
                     'constraints' => [
-                        new Country()
-                    ]
+                        new Country(),
+                    ],
                 ]
             )
         ;
@@ -58,7 +58,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
         $resolver->setDefaults(
             [
-                'data_class' => 'Matthias\SymfonyConsoleForm\Tests\Form\Data\Demo'
+                'data_class' => 'Matthias\SymfonyConsoleForm\Tests\Form\Data\Demo',
             ]
         );
     }
diff --git a/test/Form/NameType.php b/test/Form/NameType.php
@@ -17,14 +17,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'label' => 'Your name',
                 'data' => 'Matthias',
                 'constraints' => array(
-                    new Length(array('min' => 4))
-                )
+                    new Length(array('min' => 4)),
+                ),
             ]
         )->add(
             'submit',
             'submit',
             [
-                'label' => 'Submit'
+                'label' => 'Submit',
             ]
         );
     }
diff --git a/test/Helper/ApplicationTester.php b/test/Helper/ApplicationTester.php
@@ -10,7 +10,7 @@
 use Symfony\Component\Console\Output\StreamOutput;
 
 /**
- * Copied and modified from https://github.com/phpspec/phpspec/blob/master/features/bootstrap/Console/ApplicationTester.php
+ * Copied and modified from https://github.com/phpspec/phpspec/blob/master/features/bootstrap/Console/ApplicationTester.php.
  */
 class ApplicationTester
 {
@@ -54,7 +54,7 @@ public function run($input, array $options = array())
     }
 
     /**
-     * @param boolean
+     * @param bool
      *
      * @return string
      */
@@ -118,7 +118,7 @@ public function getStatusCode()
     private function setInputStream($inputStream)
     {
         $helper = $this->application->getHelperSet()->get('question');
-        /** @var $helper QuestionHelper */
+        /* @var $helper QuestionHelper */
         $helper->setInputStream($inputStream);
     }
 
diff --git a/test/Helper/InteractiveStringInput.php b/test/Helper/InteractiveStringInput.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Input\StringInput;
 
 /**
- * Copied from https://github.com/phpspec/phpspec/blob/master/features/bootstrap/Console/InteractiveStringInput.php
+ * Copied from https://github.com/phpspec/phpspec/blob/master/features/bootstrap/Console/InteractiveStringInput.php.
  */
 class InteractiveStringInput extends StringInput
 {
diff --git a/test/console.php b/test/console.php
@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 use Matthias\SymfonyConsoleForm\Tests\AppKernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function create($formType, InputInterface $input, array $options = [])`
`44`	`44`	`$formBuilder = $this->formFactory->createBuilder($formType, null, $options);`
`45`	`45`
`46`	`46`	`foreach ($formBuilder as $name => $childBuilder) {`
`47`		`- /** @var FormBuilderInterface $childBuilder */`
	`47`	`+ /* @var FormBuilderInterface $childBuilder */`
`48`	`48`	`if (!$input->hasOption($name)) {`
`49`	`49`	`continue;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,22 +13,22 @@ public function registerBundles()`
`13`	`13`	`{`
`14`	`14`	`return array(`
`15`	`15`	`new FrameworkBundle(),`
`16`		`- new SymfonyConsoleFormBundle()`
	`16`	`+ new SymfonyConsoleFormBundle(),`
`17`	`17`	`);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public function registerContainerConfiguration(LoaderInterface $loader)`
`21`	`21`	`{`
`22`		`- $loader->load(__DIR__ . '/config.yml');`
	`22`	`+ $loader->load(__DIR__.'/config.yml');`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function getCacheDir()`
`26`	`26`	`{`
`27`		`- return __DIR__ . '/temp/cache';`
	`27`	`+ return __DIR__.'/temp/cache';`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function getLogDir()`
`31`	`31`	`{`
`32`		`- return __DIR__ . '/temp/logs';`
	`32`	`+ return __DIR__.'/temp/logs';`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ class PrintFormDataCommand extends DynamicFormBasedCommand`
`10`	`10`	`{`
`11`	`11`	`protected function execute(InputInterface $input, OutputInterface $output)`
`12`	`12`	`{`
`13`		`- $output->write(print_r($this->formData(),true));`
	`13`	`+ $output->write(print_r($this->formData(), true));`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`15`	`15`	`'street',`
`16`	`16`	`'text',`
`17`	`17`	`[`
`18`		`- 'label' => 'Street'`
	`18`	`+ 'label' => 'Street',`
`19`	`19`	`]`
`20`	`20`	`);`
`21`	`21`	`}`
`@@ -24,7 +24,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)`
`24`	`24`	`{`
`25`	`25`	`$resolver->setDefaults(`
`26`	`26`	`[`
`27`		`- 'data_class' => 'Matthias\SymfonyConsoleForm\Tests\Form\Data\Address'`
	`27`	`+ 'data_class' => 'Matthias\SymfonyConsoleForm\Tests\Form\Data\Address',`
`28`	`28`	`]`
`29`	`29`	`);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`19`	`19`	`[`
`20`	`20`	`'label' => 'Your name',`
`21`	`21`	`'required' => true,`
`22`		`- 'data' => 'Matthias'`
	`22`	`+ 'data' => 'Matthias',`
`23`	`23`	`]`
`24`	`24`	`)`
`25`	`25`	`->add(`
`@@ -28,7 +28,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`28`	`28`	`[`
`29`	`29`	`'type' => new AddressType(),`
`30`	`30`	`'allow_add' => true,`
`31`		`- 'label' => 'Addresses'`
	`31`	`+ 'label' => 'Addresses',`
`32`	`32`	`]`
`33`	`33`	`)`
`34`	`34`	`->add(`
`@@ -37,8 +37,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`37`	`37`	`[`
`38`	`38`	`'label' => 'Your email address',`
`39`	`39`	`'constraints' => [`
`40`		`- new Email()`
`41`		`- ]`
	`40`	`+ new Email(),`
	`41`	`+ ],`
`42`	`42`	`]`
`43`	`43`	`)`
`44`	`44`	`->add(`
`@@ -47,8 +47,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`47`	`47`	`[`
`48`	`48`	`'label' => 'Where do you live?',`
`49`	`49`	`'constraints' => [`
`50`		`- new Country()`
`51`		`- ]`
	`50`	`+ new Country(),`
	`51`	`+ ],`
`52`	`52`	`]`
`53`	`53`	`)`
`54`	`54`	`;`
`@@ -58,7 +58,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)`
`58`	`58`	`{`
`59`	`59`	`$resolver->setDefaults(`
`60`	`60`	`[`
`61`		`- 'data_class' => 'Matthias\SymfonyConsoleForm\Tests\Form\Data\Demo'`
	`61`	`+ 'data_class' => 'Matthias\SymfonyConsoleForm\Tests\Form\Data\Demo',`
`62`	`62`	`]`
`63`	`63`	`);`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`17`	`17`	`'label' => 'Your name',`
`18`	`18`	`'data' => 'Matthias',`
`19`	`19`	`'constraints' => array(`
`20`		`- new Length(array('min' => 4))`
`21`		`- )`
	`20`	`+ new Length(array('min' => 4)),`
	`21`	`+ ),`
`22`	`22`	`]`
`23`	`23`	`)->add(`
`24`	`24`	`'submit',`
`25`	`25`	`'submit',`
`26`	`26`	`[`
`27`		`- 'label' => 'Submit'`
	`27`	`+ 'label' => 'Submit',`
`28`	`28`	`]`
`29`	`29`	`);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Symfony\Component\Console\Output\StreamOutput;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * Copied and modified from https://github.com/phpspec/phpspec/blob/master/features/bootstrap/Console/ApplicationTester.php`
	`13`	`+ * Copied and modified from https://github.com/phpspec/phpspec/blob/master/features/bootstrap/Console/ApplicationTester.php.`
`14`	`14`	`*/`
`15`	`15`	`class ApplicationTester`
`16`	`16`	`{`
`@@ -54,7 +54,7 @@ public function run($input, array $options = array())`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`/**`
`57`		`- * @param boolean`
	`57`	`+ * @param bool`
`58`	`58`	`*`
`59`	`59`	`* @return string`
`60`	`60`	`*/`
`@@ -118,7 +118,7 @@ public function getStatusCode()`
`118`	`118`	`private function setInputStream($inputStream)`
`119`	`119`	`{`
`120`	`120`	`$helper = $this->application->getHelperSet()->get('question');`
`121`		`- /** @var $helper QuestionHelper */`
	`121`	`+ /* @var $helper QuestionHelper */`
`122`	`122`	`$helper->setInputStream($inputStream);`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`use Symfony\Component\Console\Input\StringInput;`
`6`	`6`
`7`	`7`	`/**`
`8`		`- * Copied from https://github.com/phpspec/phpspec/blob/master/features/bootstrap/Console/InteractiveStringInput.php`
	`8`	`+ * Copied from https://github.com/phpspec/phpspec/blob/master/features/bootstrap/Console/InteractiveStringInput.php.`
`9`	`9`	`*/`
`10`	`10`	`class InteractiveStringInput extends StringInput`
`11`	`11`	`{`