fixes CS

fabpot · fabpot · commit d83582a21634 · 2015-08-24T09:13:45.000+02:00
diff --git a/Button.php b/Button.php
@@ -336,8 +336,6 @@ public function isSynchronized()
 
     /**
      * Unsupported method.
-     *
-     * @return null Always returns null
      */
     public function getTransformationFailure()
     {
diff --git a/ChoiceList/Loader/ChoiceLoaderInterface.php b/ChoiceList/Loader/ChoiceLoaderInterface.php
@@ -48,9 +48,9 @@ public function loadChoiceList($value = null);
      * The callable receives the choice as first and the array key as the second
      * argument.
      *
-     * @param string[] $values     An array of choice values. Non-existing
-     *                             values in this array are ignored
-     * @param null|callable $value The callable generating the choice values
+     * @param string[]      $values An array of choice values. Non-existing
+     *                              values in this array are ignored
+     * @param null|callable $value  The callable generating the choice values
      *
      * @return array An array of choices
      */
@@ -66,9 +66,9 @@ public function loadChoicesForValues(array $values, $value = null);
      * The callable receives the choice as first and the array key as the second
      * argument.
      *
-     * @param array $choices       An array of choices. Non-existing choices in
-     *                             this array are ignored
-     * @param null|callable $value The callable generating the choice values
+     * @param array         $choices An array of choices. Non-existing choices in
+     *                               this array are ignored
+     * @param null|callable $value   The callable generating the choice values
      *
      * @return string[] An array of choice values
      */
diff --git a/ChoiceList/View/ChoiceGroupView.php b/ChoiceList/View/ChoiceGroupView.php
@@ -19,14 +19,14 @@
 class ChoiceGroupView implements \IteratorAggregate
 {
     /**
-     * The label of the group
+     * The label of the group.
      *
      * @var string
      */
     public $label;
 
     /**
-     * The choice views in the group
+     * The choice views in the group.
      *
      * @var ChoiceGroupView[]|ChoiceView[]
      */
@@ -35,7 +35,7 @@ class ChoiceGroupView implements \IteratorAggregate
     /**
      * Creates a new choice group view.
      *
-     * @param string $label                           The label of the group.
+     * @param string                         $label   The label of the group.
      * @param ChoiceGroupView[]|ChoiceView[] $choices The choice views in the
      *                                                group.
      */
diff --git a/Deprecated/FormEvents.php b/Deprecated/FormEvents.php
@@ -15,6 +15,7 @@
 
 /**
  * @deprecated since version 2.7, to be removed in 3.0.
+ *
  * @internal
  */
 final class FormEvents
diff --git a/Extension/Core/DataMapper/CheckboxListMapper.php b/Extension/Core/DataMapper/CheckboxListMapper.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\DataMapperInterface;
-use Symfony\Component\Form\Exception;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
 /**
diff --git a/Extension/Core/View/ChoiceView.php b/Extension/Core/View/ChoiceView.php
@@ -13,7 +13,7 @@
 
 @trigger_error('The '.__NAMESPACE__.'\ChoiceView class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Form\ChoiceList\View\ChoiceView instead.', E_USER_DEPRECATED);
 
-/**
+/*
  * Represents a choice in templates.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
diff --git a/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php b/Extension/Csrf/CsrfProvider/CsrfProviderAdapter.php
@@ -22,6 +22,7 @@
  * is expected.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @deprecated since version 2.4, to be removed in 3.0.
diff --git a/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php b/Extension/Csrf/CsrfProvider/CsrfTokenManagerAdapter.php
@@ -18,6 +18,7 @@
  * Adapter for using the new token generator with the old interface.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @deprecated since version 2.4, to be removed in 3.0.
diff --git a/Extension/DataCollector/DataCollectorExtension.php b/Extension/DataCollector/DataCollectorExtension.php
@@ -18,6 +18,7 @@
  * Extension for collecting data of the forms on a page.
  *
  * @since  2.4
+ *
  * @author Robert Schönthal <robert.schoenthal@gmail.com>
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
diff --git a/Extension/DataCollector/EventListener/DataCollectorListener.php b/Extension/DataCollector/EventListener/DataCollectorListener.php
@@ -21,6 +21,7 @@
  * and {@link FormEvents::POST_SUBMIT} events.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class DataCollectorListener implements EventSubscriberInterface
diff --git a/Extension/DataCollector/FormDataCollector.php b/Extension/DataCollector/FormDataCollector.php
@@ -21,6 +21,7 @@
  * Data collector for {@link FormInterface} instances.
  *
  * @since  2.4
+ *
  * @author Robert Schönthal <robert.schoenthal@gmail.com>
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
diff --git a/Extension/DataCollector/FormDataCollectorInterface.php b/Extension/DataCollector/FormDataCollectorInterface.php
@@ -19,6 +19,7 @@
  * Collects and structures information about forms.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 interface FormDataCollectorInterface extends DataCollectorInterface
diff --git a/Extension/DataCollector/FormDataExtractor.php b/Extension/DataCollector/FormDataExtractor.php
@@ -20,6 +20,7 @@
  * Default implementation of {@link FormDataExtractorInterface}.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class FormDataExtractor implements FormDataExtractorInterface
diff --git a/Extension/DataCollector/FormDataExtractorInterface.php b/Extension/DataCollector/FormDataExtractorInterface.php
@@ -18,6 +18,7 @@
  * Extracts arrays of information out of forms.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 interface FormDataExtractorInterface
diff --git a/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
@@ -22,6 +22,7 @@
  * Proxy that invokes a data collector when creating a form and its view.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface
diff --git a/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php b/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php
@@ -21,6 +21,7 @@
  * instances.
  *
  * @since  2.4
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
 class ResolvedTypeFactoryDataCollectorProxy implements ResolvedFormTypeFactoryInterface
diff --git a/Extension/DataCollector/Type/DataCollectorTypeExtension.php b/Extension/DataCollector/Type/DataCollectorTypeExtension.php
@@ -20,6 +20,7 @@
  * Type extension for collecting data of a form with this type.
  *
  * @since  2.4
+ *
  * @author Robert Schönthal <robert.schoenthal@gmail.com>
  * @author Bernhard Schussek <bschussek@gmail.com>
  */
diff --git a/Extension/Validator/ValidatorExtension.php b/Extension/Validator/ValidatorExtension.php
@@ -50,7 +50,7 @@ public function __construct($validator)
         // the DIC, where the XML file is loaded automatically. Thus the following
         // code must be kept synchronized with validation.xml
 
-        /** @var $metadata ClassMetadata */
+        /* @var $metadata ClassMetadata */
         $metadata->addConstraint(new Form());
         $metadata->addPropertyConstraint('children', new Valid());
 
diff --git a/FormErrorIterator.php b/FormErrorIterator.php
@@ -87,7 +87,7 @@ public function __toString()
             if ($error instanceof FormError) {
                 $string .= 'ERROR: '.$error->getMessage()."\n";
             } else {
-                /** @var $error FormErrorIterator */
+                /* @var $error FormErrorIterator */
                 $string .= $error->form->getName().":\n";
                 $string .= self::indent((string) $error);
             }
diff --git a/Tests/Extension/DataCollector/FormDataCollectorTest.php b/Tests/Extension/DataCollector/FormDataCollectorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Symfony package.
  *
diff --git a/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php b/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of the Symfony package.
  *
diff --git a/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Form\Extension\Validator\Constraints\Form;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\Form\SubmitButtonBuilder;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
diff --git a/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php b/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php
@@ -15,6 +15,7 @@
 
 /**
  * @since  2.5.3
+ *
  * @author Bernhard Schussek <bschussek@gmail.com>
  * @group  legacy
  */
diff --git a/Tests/FormIntegrationTestCase.php b/Tests/FormIntegrationTestCase.php
@@ -20,8 +20,8 @@
 abstract class FormIntegrationTestCase extends BaseFormIntegrationTestCase
 {
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         @trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Test\FormIntegrationTestCase class instead.', E_USER_DEPRECATED);
diff --git a/Tests/FormPerformanceTestCase.php b/Tests/FormPerformanceTestCase.php
@@ -20,8 +20,8 @@
 abstract class FormPerformanceTestCase extends BaseFormPerformanceTestCase
 {
     /**
-    * {@inheritdoc}
-    */
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         @trigger_error('The '.__CLASS__.' class is deprecated since version 2.3 and will be removed in 3.0. Use the Symfony\Component\Form\Test\FormPerformanceTestCase class instead.', E_USER_DEPRECATED);

Original file line number	Diff line number	Diff line change
`@@ -336,8 +336,6 @@ public function isSynchronized()`
`336`	`336`
`337`	`337`	`/**`
`338`	`338`	`* Unsupported method.`
`339`		`- *`
`340`		`- * @return null Always returns null`
`341`	`339`	`*/`
`342`	`340`	`public function getTransformationFailure()`
`343`	`341`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@`
`19`	`19`	`class ChoiceGroupView implements \IteratorAggregate`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * The label of the group`
	`22`	`+ * The label of the group.`
`23`	`23`	`*`
`24`	`24`	`* @var string`
`25`	`25`	`*/`
`26`	`26`	`public $label;`
`27`	`27`
`28`	`28`	`/**`
`29`		`- * The choice views in the group`
	`29`	`+ * The choice views in the group.`
`30`	`30`	`*`
`31`	`31`	`* @var ChoiceGroupView[]\|ChoiceView[]`
`32`	`32`	`*/`
`@@ -35,7 +35,7 @@ class ChoiceGroupView implements \IteratorAggregate`
`35`	`35`	`/**`
`36`	`36`	`* Creates a new choice group view.`
`37`	`37`	`*`
`38`		`- * @param string $label The label of the group.`
	`38`	`+ * @param string $label The label of the group.`
`39`	`39`	`* @param ChoiceGroupView[]\|ChoiceView[] $choices The choice views in the`
`40`	`40`	`* group.`
`41`	`41`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`@trigger_error('The '.__NAMESPACE__.'\ChoiceView class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\Form\ChoiceList\View\ChoiceView instead.', E_USER_DEPRECATED);`
`15`	`15`
`16`		`-/**`
	`16`	`+/*`
`17`	`17`	`* Represents a choice in templates.`
`18`	`18`	`*`
`19`	`19`	`* @author Bernhard Schussek <bschussek@gmail.com>`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`* is expected.`
`23`	`23`	`*`
`24`	`24`	`* @since 2.4`
	`25`	`+ *`
`25`	`26`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`26`	`27`	`*`
`27`	`28`	`* @deprecated since version 2.4, to be removed in 3.0.`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`* Adapter for using the new token generator with the old interface.`
`19`	`19`	`*`
`20`	`20`	`* @since 2.4`
	`21`	`+ *`
`21`	`22`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`22`	`23`	`*`
`23`	`24`	`* @deprecated since version 2.4, to be removed in 3.0.`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`* and {@link FormEvents::POST_SUBMIT} events.`
`22`	`22`	`*`
`23`	`23`	`* @since 2.4`
	`24`	`+ *`
`24`	`25`	`* @author Bernhard Schussek <bschussek@gmail.com>`
`25`	`26`	`*/`
`26`	`27`	`class DataCollectorListener implements EventSubscriberInterface`