Merge branch '2.7' into 2.8

* 2.7:
  [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction

Author: nicolas-grekas

Extension/Core/DataTransformer/ChoiceToBooleanArrayTransformer.php

@@ -109,7 +109,7 @@ public function reverseTransform($values)
         foreach ($values as $i => $selected) {
             if ($selected) {
                 if (isset($choices[$i])) {
-                    return $choices[$i] === '' ? null : $choices[$i];
+                    return '' === $choices[$i] ? null : $choices[$i];
                 } elseif ($this->placeholderPresent && 'placeholder' === $i) {
                     return;
                 } else {

Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php

@@ -90,7 +90,7 @@ public function transform($dateTime)
 
         $value = $this->getIntlDateFormatter()->format($dateTime->getTimestamp());
 
-        if (intl_get_error_code() != 0) {
+        if (0 != intl_get_error_code()) {
             throw new TransformationFailedException(intl_get_error_message());
         }
 
@@ -123,7 +123,7 @@ public function reverseTransform($value)
 
         $timestamp = $this->getIntlDateFormatter($dateOnly)->parse($value);
 
-        if (intl_get_error_code() != 0) {
+        if (0 != intl_get_error_code()) {
             throw new TransformationFailedException(intl_get_error_message());
         }
 

Extension/Csrf/EventListener/CsrfValidationListener.php

@@ -101,7 +101,7 @@ public function __construct($fieldName, $tokenManager, $tokenId, $errorMessage,
     public function preSubmit(FormEvent $event)
     {
         $form = $event->getForm();
-        $postRequestSizeExceeded = $form->getConfig()->getMethod() === 'POST' && $this->serverParams->hasPostMaxSizeBeenExceeded();
+        $postRequestSizeExceeded = 'POST' === $form->getConfig()->getMethod() && $this->serverParams->hasPostMaxSizeBeenExceeded();
 
         if ($form->isRoot() && $form->getConfig()->getOption('compound') && !$postRequestSizeExceeded) {
             $data = $event->getData();

ResolvedFormType.php

@@ -62,10 +62,10 @@ public function __construct(FormTypeInterface $innerType, array $typeExtensions
 
         if (method_exists($innerType, 'getBlockPrefix')) {
             $reflector = new \ReflectionMethod($innerType, 'getName');
-            $isOldOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractType';
+            $isOldOverwritten = 'Symfony\Component\Form\AbstractType' !== $reflector->getDeclaringClass()->getName();
 
             $reflector = new \ReflectionMethod($innerType, 'getBlockPrefix');
-            $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractType';
+            $isNewOverwritten = 'Symfony\Component\Form\AbstractType' !== $reflector->getDeclaringClass()->getName();
 
             // Bundles compatible with both 2.3 and 2.8 should implement both methods
             // Anyone else should only override getBlockPrefix() if they actually
@@ -254,10 +254,10 @@ public function getOptionsResolver()
 
             if (method_exists($this->innerType, 'configureOptions')) {
                 $reflector = new \ReflectionMethod($this->innerType, 'setDefaultOptions');
-                $isOldOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractType';
+                $isOldOverwritten = 'Symfony\Component\Form\AbstractType' !== $reflector->getDeclaringClass()->getName();
 
                 $reflector = new \ReflectionMethod($this->innerType, 'configureOptions');
-                $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractType';
+                $isNewOverwritten = 'Symfony\Component\Form\AbstractType' !== $reflector->getDeclaringClass()->getName();
 
                 if ($isOldOverwritten && !$isNewOverwritten) {
                     @trigger_error(get_class($this->innerType).': The FormTypeInterface::setDefaultOptions() method is deprecated since version 2.7 and will be removed in 3.0. Use configureOptions() instead. This method will be added to the FormTypeInterface with Symfony 3.0.', E_USER_DEPRECATED);
@@ -271,10 +271,10 @@ public function getOptionsResolver()
 
                 if (method_exists($extension, 'configureOptions')) {
                     $reflector = new \ReflectionMethod($extension, 'setDefaultOptions');
-                    $isOldOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractTypeExtension';
+                    $isOldOverwritten = 'Symfony\Component\Form\AbstractTypeExtension' !== $reflector->getDeclaringClass()->getName();
 
                     $reflector = new \ReflectionMethod($extension, 'configureOptions');
-                    $isNewOverwritten = $reflector->getDeclaringClass()->getName() !== 'Symfony\Component\Form\AbstractTypeExtension';
+                    $isNewOverwritten = 'Symfony\Component\Form\AbstractTypeExtension' !== $reflector->getDeclaringClass()->getName();
 
                     if ($isOldOverwritten && !$isNewOverwritten) {
                         @trigger_error(get_class($extension).': The FormTypeExtensionInterface::setDefaultOptions() method is deprecated since version 2.7 and will be removed in 3.0. Use configureOptions() instead. This method will be added to the FormTypeExtensionInterface with Symfony 3.0.', E_USER_DEPRECATED);

Test/FormPerformanceTestCase.php

@@ -35,7 +35,7 @@ protected function runTest()
         parent::runTest();
         $time = microtime(true) - $s;
 
-        if ($this->maxRunningTime != 0 && $time > $this->maxRunningTime) {
+        if (0 != $this->maxRunningTime && $time > $this->maxRunningTime) {
             $this->fail(
                 sprintf(
                     'expected running time: <= %s but was: %s',

Tests/AbstractLayoutTest.php

@@ -78,8 +78,8 @@ protected function assertMatchesXpath($html, $expression, $count = 1)
             $this->fail(sprintf(
                 "Failed asserting that \n\n%s\n\nmatches exactly %s. Matches %s in \n\n%s",
                 $expression,
-                $count == 1 ? 'once' : $count.' times',
-                $nodeList->length == 1 ? 'once' : $nodeList->length.' times',
+                1 == $count ? 'once' : $count.' times',
+                1 == $nodeList->length ? 'once' : $nodeList->length.' times',
                 // strip away <root> and </root>
                 substr($dom->saveHTML(), 6, -8)
             ));

Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php

@@ -1260,7 +1260,7 @@ public function testCustomDataErrorMapping($target, $mapFrom, $mapTo, $childName
         // Only add it if we expect the error to come up on a different
         // level than LEVEL_0, because in this case the error would
         // (correctly) be mapped to the distraction field
-        if ($target !== self::LEVEL_0) {
+        if (self::LEVEL_0 !== $target) {
             $mapFromPath = new PropertyPath($mapFrom);
             $mapFromPrefix = $mapFromPath->isIndex(0)
                 ? '['.$mapFromPath->getElement(0).']'
@@ -1274,7 +1274,7 @@ public function testCustomDataErrorMapping($target, $mapFrom, $mapTo, $childName
 
         $this->mapper->mapViolation($violation, $parent);
 
-        if ($target !== self::LEVEL_0) {
+        if (self::LEVEL_0 !== $target) {
             $this->assertCount(0, $distraction->getErrors(), 'distraction should not have an error, but has one');
         }
 

Tests/Fixtures/AlternatingRowType.php

@@ -15,7 +15,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($formFactory) {
             $form = $event->getForm();
-            $type = $form->getName() % 2 === 0
+            $type = 0 === $form->getName() % 2
                 ? 'Symfony\Component\Form\Extension\Core\Type\TextType'
                 : 'Symfony\Component\Form\Extension\Core\Type\TextareaType';
             $form->add('title', $type);

Tests/Fixtures/FixedDataTransformer.php

@@ -36,7 +36,7 @@ public function reverseTransform($value)
     {
         $result = array_search($value, $this->mapping, true);
 
-        if ($result === false) {
+        if (false === $result) {
             throw new TransformationFailedException(sprintf('No reverse mapping for value "%s"', $value));
         }