Merge branch '2.8' into 3.3

* 2.8:
  [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.
  .php_cs.dist - simplify config
  [WebProfilerBundle] fixed TemplateManager when using Twig 2 without compat interfaces

Author: nicolas-grekas

Constraint.php

@@ -141,7 +141,7 @@ public function __construct($options = null)
                     $invalidOptions[] = $option;
                 }
             }
-        } elseif (null !== $options && !(is_array($options) && count($options) === 0)) {
+        } elseif (null !== $options && !(is_array($options) && 0 === count($options))) {
             $option = $this->getDefaultOption();
 
             if (null === $option) {

Constraints/ChoiceValidator.php

@@ -77,7 +77,7 @@ public function validate($value, Constraint $constraint)
 
             $count = count($value);
 
-            if ($constraint->min !== null && $count < $constraint->min) {
+            if (null !== $constraint->min && $count < $constraint->min) {
                 $this->context->buildViolation($constraint->minMessage)
                     ->setParameter('{{ limit }}', $constraint->min)
                     ->setPlural((int) $constraint->min)
@@ -87,7 +87,7 @@ public function validate($value, Constraint $constraint)
                 return;
             }
 
-            if ($constraint->max !== null && $count > $constraint->max) {
+            if (null !== $constraint->max && $count > $constraint->max) {
                 $this->context->buildViolation($constraint->maxMessage)
                     ->setParameter('{{ limit }}', $constraint->max)
                     ->setPlural((int) $constraint->max)

Constraints/Collection.php

@@ -63,7 +63,7 @@ protected function initializeNestedConstraints()
         foreach ($this->fields as $fieldName => $field) {
             // the XmlFileLoader and YamlFileLoader pass the field Optional
             // and Required constraint as an array with exactly one element
-            if (is_array($field) && count($field) == 1) {
+            if (is_array($field) && 1 == count($field)) {
                 $this->fields[$fieldName] = $field = $field[0];
             }
 

Constraints/ImageValidator.php

@@ -54,7 +54,7 @@ public function validate($value, Constraint $constraint)
 
         $size = @getimagesize($value);
 
-        if (empty($size) || ($size[0] === 0) || ($size[1] === 0)) {
+        if (empty($size) || (0 === $size[0]) || (0 === $size[1])) {
             $this->context->buildViolation($constraint->sizeNotDetectedMessage)
                 ->setCode(Image::SIZE_NOT_DETECTED_ERROR)
                 ->addViolation();

Constraints/TypeValidator.php

@@ -34,7 +34,7 @@ public function validate($value, Constraint $constraint)
         }
 
         $type = strtolower($constraint->type);
-        $type = $type == 'boolean' ? 'bool' : $constraint->type;
+        $type = 'boolean' == $type ? 'bool' : $constraint->type;
         $isFunction = 'is_'.$type;
         $ctypeFunction = 'ctype_'.$type;
 

Constraints/UuidValidator.php

@@ -240,7 +240,7 @@ private function validateStrict($value, Uuid $constraint)
         //   0b10xx
         // & 0b1100 (12)
         // = 0b1000 (8)
-        if ((hexdec($value[self::STRICT_VARIANT_POSITION]) & 12) !== 8) {
+        if (8 !== (hexdec($value[self::STRICT_VARIANT_POSITION]) & 12)) {
             $this->context->buildViolation($constraint->message)
                 ->setParameter('{{ value }}', $this->formatValue($value))
                 ->setCode(Uuid::INVALID_VARIANT_ERROR)

Mapping/Loader/AbstractLoader.php

@@ -72,9 +72,9 @@ protected function addNamespaceAlias($alias, $namespace)
      */
     protected function newConstraint($name, $options = null)
     {
-        if (strpos($name, '\\') !== false && class_exists($name)) {
+        if (false !== strpos($name, '\\') && class_exists($name)) {
             $className = (string) $name;
-        } elseif (strpos($name, ':') !== false) {
+        } elseif (false !== strpos($name, ':')) {
             list($prefix, $className) = explode(':', $name, 2);
 
             if (!isset($this->namespaces[$prefix])) {