Merge branch '3.3' into 3.4

* 3.3:
  [CS][2.7] yoda_style, no_unneeded_curly_braces, no_unneeded_final_method, semicolon_after_instruction
  [Filesystem] mirror - fix copying content with same name as source/target.
  Removed unnecessary getDefinition() call.
  .php_cs.dist - simplify config
  [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces

Author: nicolas-grekas

Encoder/XmlEncoder.php

@@ -99,10 +99,10 @@ public function decode($data, $format, array $context = array())
 
         $rootNode = null;
         foreach ($dom->childNodes as $child) {
-            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+            if (XML_DOCUMENT_TYPE_NODE === $child->nodeType) {
                 throw new UnexpectedValueException('Document types are not allowed.');
             }
-            if (!$rootNode && $child->nodeType !== XML_PI_NODE) {
+            if (!$rootNode && XML_PI_NODE !== $child->nodeType) {
                 $rootNode = $child;
             }
         }
@@ -345,7 +345,7 @@ private function parseXmlValue(\DOMNode $node, array $context = array())
         $value = array();
 
         foreach ($node->childNodes as $subnode) {
-            if ($subnode->nodeType === XML_PI_NODE) {
+            if (XML_PI_NODE === $subnode->nodeType) {
                 continue;
             }
 
@@ -394,7 +394,7 @@ private function buildXml(\DOMNode $parentNode, $data, $xmlRootNodeName = null)
                         $data = $this->serializer->normalize($data, $this->format, $this->context);
                     }
                     $parentNode->setAttribute($attributeName, $data);
-                } elseif ($key === '#') {
+                } elseif ('#' === $key) {
                     $append = $this->selectNodeType($parentNode, $data);
                 } elseif (is_array($data) && false === is_numeric($key)) {
                     // Is this array fully numeric keys?

Normalizer/AbstractNormalizer.php

@@ -337,7 +337,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
                 $paramName = $constructorParameter->name;
                 $key = $this->nameConverter ? $this->nameConverter->normalize($paramName) : $paramName;
 
-                $allowed = $allowedAttributes === false || in_array($paramName, $allowedAttributes);
+                $allowed = false === $allowedAttributes || in_array($paramName, $allowedAttributes);
                 $ignored = !$this->isAllowedAttribute($class, $paramName, $format, $context);
                 if (method_exists($constructorParameter, 'isVariadic') && $constructorParameter->isVariadic()) {
                     if ($allowed && !$ignored && (isset($data[$key]) || array_key_exists($key, $data))) {

Normalizer/AbstractObjectNormalizer.php

@@ -187,7 +187,7 @@ public function denormalize($data, $class, $format = null, array $context = arra
                 $attribute = $this->nameConverter->denormalize($attribute);
             }
 
-            if (($allowedAttributes !== false && !in_array($attribute, $allowedAttributes)) || !$this->isAllowedAttribute($class, $attribute, $format, $context)) {
+            if ((false !== $allowedAttributes && !in_array($attribute, $allowedAttributes)) || !$this->isAllowedAttribute($class, $attribute, $format, $context)) {
                 if (isset($context[self::ALLOW_EXTRA_ATTRIBUTES]) && !$context[self::ALLOW_EXTRA_ATTRIBUTES]) {
                     $extraAttributes[] = $attribute;
                 }

Normalizer/ArrayDenormalizer.php

@@ -36,13 +36,13 @@ class ArrayDenormalizer implements DenormalizerInterface, SerializerAwareInterfa
      */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
-        if ($this->serializer === null) {
+        if (null === $this->serializer) {
             throw new BadMethodCallException('Please set a serializer before calling denormalize()!');
         }
         if (!is_array($data)) {
             throw new InvalidArgumentException('Data expected to be an array, '.gettype($data).' given.');
         }
-        if (substr($class, -2) !== '[]') {
+        if ('[]' !== substr($class, -2)) {
             throw new InvalidArgumentException('Unsupported class: '.$class);
         }
 
@@ -68,7 +68,7 @@ public function supportsDenormalization($data, $type, $format = null/*, array $c
     {
         $context = func_num_args() > 3 ? func_get_arg(3) : array();
 
-        return substr($type, -2) === '[]'
+        return '[]' === substr($type, -2)
             && $this->serializer->supportsDenormalization($data, substr($type, 0, -2), $format, $context);
     }
 

Normalizer/ObjectNormalizer.php

@@ -49,7 +49,7 @@ protected function extractAttributes($object, $format = null, array $context = a
         $reflClass = new \ReflectionClass($object);
         foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) {
             if (
-                $reflMethod->getNumberOfRequiredParameters() !== 0 ||
+                0 !== $reflMethod->getNumberOfRequiredParameters() ||
                 $reflMethod->isStatic() ||
                 $reflMethod->isConstructor() ||
                 $reflMethod->isDestructor()
@@ -67,7 +67,7 @@ protected function extractAttributes($object, $format = null, array $context = a
                 if (!$reflClass->hasProperty($attributeName)) {
                     $attributeName = lcfirst($attributeName);
                 }
-            } elseif (strpos($name, 'is') === 0) {
+            } elseif (0 === strpos($name, 'is')) {
                 // issers
                 $attributeName = substr($name, 2);
 

Tests/Fixtures/ScalarDummy.php

@@ -23,12 +23,12 @@ class ScalarDummy implements NormalizableInterface, DenormalizableInterface
 
     public function normalize(NormalizerInterface $normalizer, $format = null, array $context = array())
     {
-        return $format === 'xml' ? $this->xmlFoo : $this->foo;
+        return 'xml' === $format ? $this->xmlFoo : $this->foo;
     }
 
     public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array())
     {
-        if ($format === 'xml') {
+        if ('xml' === $format) {
             $this->xmlFoo = $data;
         } else {
             $this->foo = $data;