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

SpacePossum · nicolas-grekas · commit f5d926495fd2 · 2017-09-15T11:46:57.000+02:00
diff --git a/Data/Bundle/Compiler/GenrbCompiler.php b/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,
diff --git a/DateFormatter/DateFormat/TimeZoneTransformer.php b/DateFormatter/DateFormat/TimeZoneTransformer.php
@@ -101,7 +101,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(
@@ -110,7 +110,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));
diff --git a/Exception/MethodArgumentValueNotImplementedException.php b/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);
diff --git a/NumberFormatter/NumberFormatter.php b/NumberFormatter/NumberFormatter.php
@@ -330,7 +330,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);
         }
 
@@ -369,21 +369,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');
         }
 
@@ -526,7 +526,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;
@@ -773,7 +773,7 @@ private function formatNumber($value, $precision)
      */
     private function getUninitializedPrecision($value, $precision)
     {
-        if ($this->style == self::CURRENCY) {
+        if (self::CURRENCY == $this->style) {
             return $precision;
         }
 
@@ -809,11 +809,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);
         }
 
diff --git a/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php b/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
@@ -676,15 +676,15 @@ function ($currency) { return array($currency); },
      */
     public function testGetFractionDigits($currency)
     {
-        $this->assertTrue(is_numeric($this->dataProvider->getFractionDigits($currency)));
+        $this->assertInternalType('numeric', $this->dataProvider->getFractionDigits($currency));
     }
 
     /**
      * @dataProvider provideCurrencies
      */
     public function testGetRoundingIncrement($currency)
     {
-        $this->assertTrue(is_numeric($this->dataProvider->getRoundingIncrement($currency)));
+        $this->assertInternalType('numeric', $this->dataProvider->getRoundingIncrement($currency));
     }
 
     public function provideCurrenciesWithNumericEquivalent()
diff --git a/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/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()
diff --git a/Util/SvnRepository.php b/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');
             }
 

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public static function getEtcTimeZoneId($formattedTimeZone)`
`101`	`101`	`if (preg_match('/GMT(?P<signal>[+-])(?P<hours>\d{2}):?(?P<minutes>\d{2})/', $formattedTimeZone, $matches)) {`
`102`	`102`	`$hours = (int) $matches['hours'];`
`103`	`103`	`$minutes = (int) $matches['minutes'];`
`104`		`- $signal = $matches['signal'] == '-' ? '+' : '-';`
	`104`	`+ $signal = '-' == $matches['signal'] ? '+' : '-';`
`105`	`105`
`106`	`106`	`if (0 < $minutes) {`
`107`	`107`	`throw new NotImplementedException(sprintf(`
`@@ -110,7 +110,7 @@ public static function getEtcTimeZoneId($formattedTimeZone)`
`110`	`110`	`));`
`111`	`111`	`}`
`112`	`112`
`113`		`- return 'Etc/GMT'.($hours !== 0 ? $signal.$hours : '');`
	`113`	`+ return 'Etc/GMT'.(0 !== $hours ? $signal.$hours : '');`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`throw new \InvalidArgumentException(sprintf('The GMT time zone "%s" does not match with the supported formats GMT[+-]HH:MM or GMT[+-]HHMM.', $formattedTimeZone));`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ public static function create($locale = 'en', $style = null, $pattern = null)`
`330`	`330`	`*/`
`331`	`331`	`public function formatCurrency($value, $currency)`
`332`	`332`	`{`
`333`		`- if ($this->style == self::DECIMAL) {`
	`333`	`+ if (self::DECIMAL == $this->style) {`
`334`	`334`	`return $this->format($value);`
`335`	`335`	`}`
`336`	`336`
`@@ -369,21 +369,21 @@ public function formatCurrency($value, $currency)`
`369`	`369`	`public function format($value, $type = self::TYPE_DEFAULT)`
`370`	`370`	`{`
`371`	`371`	`// The original NumberFormatter does not support this format type`
`372`		`- if ($type == self::TYPE_CURRENCY) {`
	`372`	`+ if (self::TYPE_CURRENCY == $type) {`
`373`	`373`	`trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);`
`374`	`374`
`375`	`375`	`return false;`
`376`	`376`	`}`
`377`	`377`
`378`		`- if ($this->style == self::CURRENCY) {`
	`378`	`+ if (self::CURRENCY == $this->style) {`
`379`	`379`	`throw new NotImplementedException(sprintf(`
`380`	`380`	`'%s() method does not support the formatting of currencies (instance with CURRENCY style). %s',`
`381`	`381`	`__METHOD__, NotImplementedException::INTL_INSTALL_MESSAGE`
`382`	`382`	`));`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`// Only the default type is supported.`
`386`		`- if ($type != self::TYPE_DEFAULT) {`
	`386`	`+ if (self::TYPE_DEFAULT != $type) {`
`387`	`387`	`throw new MethodArgumentValueNotImplementedException(__METHOD__, 'type', $type, 'Only TYPE_DEFAULT is supported');`
`388`	`388`	`}`
`389`	`389`
`@@ -526,7 +526,7 @@ public function parseCurrency($value, &$currency, &$position = null)`
`526`	`526`	`*/`
`527`	`527`	`public function parse($value, $type = self::TYPE_DOUBLE, &$position = 0)`
`528`	`528`	`{`
`529`		`- if ($type == self::TYPE_DEFAULT \|\| $type == self::TYPE_CURRENCY) {`
	`529`	`+ if (self::TYPE_DEFAULT == $type \|\| self::TYPE_CURRENCY == $type) {`
`530`	`530`	`trigger_error(__METHOD__.'(): Unsupported format type '.$type, \E_USER_WARNING);`
`531`	`531`
`532`	`532`	`return false;`
`@@ -773,7 +773,7 @@ private function formatNumber($value, $precision)`
`773`	`773`	`*/`
`774`	`774`	`private function getUninitializedPrecision($value, $precision)`
`775`	`775`	`{`
`776`		`- if ($this->style == self::CURRENCY) {`
	`776`	`+ if (self::CURRENCY == $this->style) {`
`777`	`777`	`return $precision;`
`778`	`778`	`}`
`779`	`779`
`@@ -809,11 +809,11 @@ private function isInitializedAttribute($attr)`
`809`	`809`	`*/`
`810`	`810`	`private function convertValueDataType($value, $type)`
`811`	`811`	`{`
`812`		`- if ($type == self::TYPE_DOUBLE) {`
	`812`	`+ if (self::TYPE_DOUBLE == $type) {`
`813`	`813`	`$value = (float) $value;`
`814`		`- } elseif ($type == self::TYPE_INT32) {`
	`814`	`+ } elseif (self::TYPE_INT32 == $type) {`
`815`	`815`	`$value = $this->getInt32Value($value);`
`816`		`- } elseif ($type == self::TYPE_INT64) {`
	`816`	`+ } elseif (self::TYPE_INT64 == $type) {`
`817`	`817`	`$value = $this->getInt64Value($value);`
`818`	`818`	`}`
`819`	`819`
Original file line number	Diff line number	Diff line change
`@@ -676,15 +676,15 @@ function ($currency) { return array($currency); },`
`676`	`676`	`*/`
`677`	`677`	`public function testGetFractionDigits($currency)`
`678`	`678`	`{`
`679`		`- $this->assertTrue(is_numeric($this->dataProvider->getFractionDigits($currency)));`
	`679`	`+ $this->assertInternalType('numeric', $this->dataProvider->getFractionDigits($currency));`
`680`	`680`	`}`
`681`	`681`
`682`	`682`	`/**`
`683`	`683`	`* @dataProvider provideCurrencies`
`684`	`684`	`*/`
`685`	`685`	`public function testGetRoundingIncrement($currency)`
`686`	`686`	`{`
`687`		`- $this->assertTrue(is_numeric($this->dataProvider->getRoundingIncrement($currency)));`
	`687`	`+ $this->assertInternalType('numeric', $this->dataProvider->getRoundingIncrement($currency));`
`688`	`688`	`}`
`689`	`689`
`690`	`690`	`public function provideCurrenciesWithNumericEquivalent()`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static function download($url, $targetDir)`
`50`	`50`	`{`
`51`	`51`	`exec('which svn', $output, $result);`
`52`	`52`
`53`		`- if ($result !== 0) {`
	`53`	`+ if (0 !== $result) {`
`54`	`54`	`throw new RuntimeException('The command "svn" is not installed.');`
`55`	`55`	`}`
`56`	`56`
`@@ -62,7 +62,7 @@ public static function download($url, $targetDir)`
`62`	`62`
`63`	`63`	`exec('svn checkout '.$url.' '.$targetDir, $output, $result);`
`64`	`64`
`65`		`- if ($result !== 0) {`
	`65`	`+ if (0 !== $result) {`
`66`	`66`	`throw new RuntimeException('The SVN checkout of '.$url.'failed.');`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -128,7 +128,7 @@ private function getSvnInfo()`
`128`	`128`
`129`	`129`	`$svnInfo = simplexml_load_string(implode("\n", $output));`
`130`	`130`
`131`		`- if ($result !== 0) {`
	`131`	`+ if (0 !== $result) {`
`132`	`132`	`throw new RuntimeException('svn info failed');`
`133`	`133`	`}`
`134`	`134`