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

Data/Bundle/Compiler/GenrbCompiler.php

@@ -61,7 +61,7 @@ public function compile($sourcePath, $targetDir)
 
         exec($this->genrb.' --quiet -e UTF-8 -d '.$targetDir.' '.$sourcePath, $output, $status);
 
-        if ($status !== 0) {
+        if (0 !== $status) {
             throw new RuntimeException(sprintf(
                 'genrb failed with status %d while compiling %s to %s.',
                 $status,

DateFormatter/DateFormat/TimezoneTransformer.php

@@ -103,7 +103,7 @@ public static function getEtcTimeZoneId($formattedTimeZone)
         if (preg_match('/GMT(?P<signal>[+-])(?P<hours>\d{2}):?(?P<minutes>\d{2})/', $formattedTimeZone, $matches)) {
             $hours = (int) $matches['hours'];
             $minutes = (int) $matches['minutes'];
-            $signal = $matches['signal'] == '-' ? '+' : '-';
+            $signal = '-' == $matches['signal'] ? '+' : '-';
 
             if (0 < $minutes) {
                 throw new NotImplementedException(sprintf(
@@ -112,7 +112,7 @@ public static function getEtcTimeZoneId($formattedTimeZone)
                 ));
             }
 
-            return 'Etc/GMT'.($hours !== 0 ? $signal.$hours : '');
+            return 'Etc/GMT'.(0 !== $hours ? $signal.$hours : '');
         }
 
         throw new \InvalidArgumentException(sprintf('The GMT time zone "%s" does not match with the supported formats GMT[+-]HH:MM or GMT[+-]HHMM.', $formattedTimeZone));

Exception/MethodArgumentValueNotImplementedException.php

@@ -31,7 +31,7 @@ public function __construct($methodName, $argName, $argValue, $additionalMessage
             $methodName,
             $argName,
             var_export($argValue, true),
-            $additionalMessage !== '' ? ' '.$additionalMessage.'. ' : ''
+            '' !== $additionalMessage ? ' '.$additionalMessage.'. ' : ''
         );
 
         parent::__construct($message);

NumberFormatter/NumberFormatter.php

@@ -332,7 +332,7 @@ public static function create($locale = 'en', $style = null, $pattern = null)
      */
     public function formatCurrency($value, $currency)
     {
-        if ($this->style == self::DECIMAL) {
+        if (self::DECIMAL == $this->style) {
             return $this->format($value);
         }
 
@@ -371,21 +371,21 @@ public function formatCurrency($value, $currency)
     public function format($value, $type = self::TYPE_DEFAULT)
     {
         // The original NumberFormatter does not support this format type
-        if ($type == self::TYPE_CURRENCY) {
+        if (self::TYPE_CURRENCY == $type) {
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
         }
 
-        if ($this->style == self::CURRENCY) {
+        if (self::CURRENCY == $this->style) {
             throw new NotImplementedException(sprintf(
                 '%s() method does not support the formatting of currencies (instance with CURRENCY style). %s',
                 __METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE
             ));
         }
 
         // Only the default type is supported.
-        if ($type != self::TYPE_DEFAULT) {
+        if (self::TYPE_DEFAULT != $type) {
             throw new MethodArgumentValueNotImplementedException(__METHOD__, 'type', $type, 'Only TYPE_DEFAULT is supported');
         }
 
@@ -528,7 +528,7 @@ public function parseCurrency($value, &$currency, &$position = null)
      */
     public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)
     {
-        if ($type == self::TYPE_DEFAULT || $type == self::TYPE_CURRENCY) {
+        if (self::TYPE_DEFAULT == $type || self::TYPE_CURRENCY == $type) {
             trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);
 
             return false;
@@ -775,7 +775,7 @@ private function formatNumber($value, $precision)
      */
     private function getUninitializedPrecision($value, $precision)
     {
-        if ($this->style == self::CURRENCY) {
+        if (self::CURRENCY == $this->style) {
             return $precision;
         }
 
@@ -811,11 +811,11 @@ private function isInitializedAttribute($attr)
      */
     private function convertValueDataType($value, $type)
     {
-        if ($type == self::TYPE_DOUBLE) {
+        if (self::TYPE_DOUBLE == $type) {
             $value = (float) $value;
-        } elseif ($type == self::TYPE_INT32) {
+        } elseif (self::TYPE_INT32 == $type) {
             $value = $this->getInt32Value($value);
-        } elseif ($type == self::TYPE_INT64) {
+        } elseif (self::TYPE_INT64 == $type) {
             $value = $this->getInt64Value($value);
         }
 

Tests/NumberFormatter/AbstractNumberFormatterTest.php

@@ -621,7 +621,7 @@ public function testParse($value, $expected, $message, $expectedPosition, $group
         $this->assertSame($expected, $parsedValue, $message);
         $this->assertSame($expectedPosition, $position, $message);
 
-        if ($expected === false) {
+        if (false === $expected) {
             $errorCode = IntlGlobals::U_PARSE_ERROR;
             $errorMessage = 'Number parsing failed: U_PARSE_ERROR';
         } else {
@@ -631,10 +631,10 @@ public function testParse($value, $expected, $message, $expectedPosition, $group
 
         $this->assertSame($errorMessage, $this->getIntlErrorMessage());
         $this->assertSame($errorCode, $this->getIntlErrorCode());
-        $this->assertSame($errorCode !== 0, $this->isIntlFailure($this->getIntlErrorCode()));
+        $this->assertSame(0 !== $errorCode, $this->isIntlFailure($this->getIntlErrorCode()));
         $this->assertSame($errorMessage, $formatter->getErrorMessage());
         $this->assertSame($errorCode, $formatter->getErrorCode());
-        $this->assertSame($errorCode !== 0, $this->isIntlFailure($formatter->getErrorCode()));
+        $this->assertSame(0 !== $errorCode, $this->isIntlFailure($formatter->getErrorCode()));
     }
 
     public function parseProvider()

Util/SvnRepository.php

@@ -50,7 +50,7 @@ public static function download($url, $targetDir)
     {
         exec('which svn', $output, $result);
 
-        if ($result !== 0) {
+        if (0 !== $result) {
             throw new RuntimeException('The command "svn" is not installed.');
         }
 
@@ -62,7 +62,7 @@ public static function download($url, $targetDir)
 
             exec('svn checkout '.$url.' '.$targetDir, $output, $result);
 
-            if ($result !== 0) {
+            if (0 !== $result) {
                 throw new RuntimeException('The SVN checkout of '.$url.'failed.');
             }
         }
@@ -128,7 +128,7 @@ private function getSvnInfo()
 
             $svnInfo = simplexml_load_string(implode("\n", $output));
 
-            if ($result !== 0) {
+            if (0 !== $result) {
                 throw new RuntimeException('svn info failed');
             }