Enhancement: Enable is_null fixer (#193)

localheinz · web-flow · commit be765af9b09d · 2020-12-21T14:40:55.000+01:00
* Enhancement: Enable is_null fixer

* Fix: Run 'make cs'
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -67,6 +67,7 @@ return $config
         ],
         'implode_call' => true,
         'increment_style' => true,
+        'is_null' => true,
         'lambda_not_used_import' => true,
         'lowercase_cast' => true,
         'lowercase_static_reference' => true,
diff --git a/src/Faker/ORM/CakePHP/EntityPopulator.php b/src/Faker/ORM/CakePHP/EntityPopulator.php
@@ -133,7 +133,7 @@ public function execute($class, $insertedEntities, $options = [])
         $entity = $table->newEntity();
 
         foreach ($this->columnFormatters as $column => $format) {
-            if (!is_null($format)) {
+            if (null !== $format) {
                 $entity->{$column} = is_callable($format) ? $format($insertedEntities, $table) : $format;
             }
         }
diff --git a/src/Faker/Provider/Image.php b/src/Faker/Provider/Image.php
@@ -88,7 +88,7 @@ public static function image(
         $word = null,
         $gray = false
     ) {
-        $dir = is_null($dir) ? sys_get_temp_dir() : $dir; // GNU/Linux / OS X / Windows compatible
+        $dir = null === $dir ? sys_get_temp_dir() : $dir; // GNU/Linux / OS X / Windows compatible
         // Validate directory path
         if (!is_dir($dir) || !is_writable($dir)) {
             throw new \InvalidArgumentException(sprintf('Cannot write to directory "%s"', $dir));
diff --git a/src/Faker/Provider/Payment.php b/src/Faker/Provider/Payment.php
@@ -161,7 +161,7 @@ public static function creditCardType()
      */
     public static function creditCardNumber($type = null, $formatted = false, $separator = '-')
     {
-        if (is_null($type)) {
+        if (null === $type) {
             $type = static::creditCardType();
         }
         $mask = static::randomElement(static::$cardParams[$type]);
@@ -206,7 +206,7 @@ public function creditCardExpirationDate($valid = true)
      */
     public function creditCardExpirationDateString($valid = true, $expirationDateFormat = null)
     {
-        return $this->creditCardExpirationDate($valid)->format(is_null($expirationDateFormat) ? static::$expirationDateFormat : $expirationDateFormat);
+        return $this->creditCardExpirationDate($valid)->format(null === $expirationDateFormat ? static::$expirationDateFormat : $expirationDateFormat);
     }
 
     /**
@@ -239,7 +239,7 @@ public function creditCardDetails($valid = true)
      */
     public static function iban($countryCode = null, $prefix = '', $length = null)
     {
-        $countryCode = is_null($countryCode) ? self::randomKey(self::$ibanFormats) : strtoupper($countryCode);
+        $countryCode = null === $countryCode ? self::randomKey(self::$ibanFormats) : strtoupper($countryCode);
 
         $format = !isset(static::$ibanFormats[$countryCode]) ? null : static::$ibanFormats[$countryCode];
 
diff --git a/src/Faker/Provider/ms_MY/Address.php b/src/Faker/Provider/ms_MY/Address.php
@@ -658,7 +658,7 @@ public static function postcode($state = null)
             ]
         ];
 
-        $postcode = is_null($state) ? static::randomElement($format) : $format[$state];
+        $postcode = null === $state ? static::randomElement($format) : $format[$state];
 
         return (string) static::randomElement($postcode);
     }
diff --git a/src/Faker/Provider/ro_RO/Person.php b/src/Faker/Provider/ro_RO/Person.php
@@ -127,7 +127,7 @@ public function cnp($gender = null, $dateOfBirth = null, $county = null, $isResi
 
         $date = $this->getDateOfBirth($dateOfBirth);
 
-        if (is_null($county)) {
+        if (null === $county) {
             $countyCode = static::randomElement(array_values(static::$cnpCountyCodes));
         } elseif (!array_key_exists($county, static::$cnpCountyCodes)) {
             throw new \InvalidArgumentException("Invalid county code '{$county}' received");
diff --git a/src/Faker/ValidGenerator.php b/src/Faker/ValidGenerator.php
@@ -19,7 +19,7 @@ class ValidGenerator
      */
     public function __construct(Generator $generator, $validator = null, $maxRetries = 10000)
     {
-        if (is_null($validator)) {
+        if (null === $validator) {
             $validator = function () {
                 return true;
             };
diff --git a/test/Faker/Provider/pt_PT/PersonTest.php b/test/Faker/Provider/pt_PT/PersonTest.php
@@ -24,7 +24,7 @@ private static function isValidTin($tin)
     {
         $regex = '(([1,2,3,5,6,8]{1}[0-9]{8})|((45)|(70)|(71)|(72)|(77)|(79)|(90|(98|(99))))[0-9]{7})';
 
-        if (is_null($tin) || !is_numeric($tin) || !strlen($tin) == 9 || preg_match("/$regex/", $tin) !== 1) {
+        if (null === $tin || !is_numeric($tin) || !strlen($tin) == 9 || preg_match("/$regex/", $tin) !== 1) {
             return false;
         }
         $n = str_split($tin);

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function execute($class, $insertedEntities, $options = [])`
`133`	`133`	`$entity = $table->newEntity();`
`134`	`134`
`135`	`135`	`foreach ($this->columnFormatters as $column => $format) {`
`136`		`- if (!is_null($format)) {`
	`136`	`+ if (null !== $format) {`
`137`	`137`	`$entity->{$column} = is_callable($format) ? $format($insertedEntities, $table) : $format;`
`138`	`138`	`}`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public static function creditCardType()`
`161`	`161`	`*/`
`162`	`162`	`public static function creditCardNumber($type = null, $formatted = false, $separator = '-')`
`163`	`163`	`{`
`164`		`- if (is_null($type)) {`
	`164`	`+ if (null === $type) {`
`165`	`165`	`$type = static::creditCardType();`
`166`	`166`	`}`
`167`	`167`	`$mask = static::randomElement(static::$cardParams[$type]);`
`@@ -206,7 +206,7 @@ public function creditCardExpirationDate($valid = true)`
`206`	`206`	`*/`
`207`	`207`	`public function creditCardExpirationDateString($valid = true, $expirationDateFormat = null)`
`208`	`208`	`{`
`209`		`- return $this->creditCardExpirationDate($valid)->format(is_null($expirationDateFormat) ? static::$expirationDateFormat : $expirationDateFormat);`
	`209`	`+ return $this->creditCardExpirationDate($valid)->format(null === $expirationDateFormat ? static::$expirationDateFormat : $expirationDateFormat);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`/**`
`@@ -239,7 +239,7 @@ public function creditCardDetails($valid = true)`
`239`	`239`	`*/`
`240`	`240`	`public static function iban($countryCode = null, $prefix = '', $length = null)`
`241`	`241`	`{`
`242`		`- $countryCode = is_null($countryCode) ? self::randomKey(self::$ibanFormats) : strtoupper($countryCode);`
	`242`	`+ $countryCode = null === $countryCode ? self::randomKey(self::$ibanFormats) : strtoupper($countryCode);`
`243`	`243`
`244`	`244`	`$format = !isset(static::$ibanFormats[$countryCode]) ? null : static::$ibanFormats[$countryCode];`
`245`	`245`
Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ public static function postcode($state = null)`
`658`	`658`	`]`
`659`	`659`	`];`
`660`	`660`
`661`		`- $postcode = is_null($state) ? static::randomElement($format) : $format[$state];`
	`661`	`+ $postcode = null === $state ? static::randomElement($format) : $format[$state];`
`662`	`662`
`663`	`663`	`return (string) static::randomElement($postcode);`
`664`	`664`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class ValidGenerator`
`19`	`19`	`*/`
`20`	`20`	`public function __construct(Generator $generator, $validator = null, $maxRetries = 10000)`
`21`	`21`	`{`
`22`		`- if (is_null($validator)) {`
	`22`	`+ if (null === $validator) {`
`23`	`23`	`$validator = function () {`
`24`	`24`	`return true;`
`25`	`25`	`};`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ private static function isValidTin($tin)`
`24`	`24`	`{`
`25`	`25`	`$regex = '(([1,2,3,5,6,8]{1}[0-9]{8})\|((45)\|(70)\|(71)\|(72)\|(77)\|(79)\|(90\|(98\|(99))))[0-9]{7})';`
`26`	`26`
`27`		`- if (is_null($tin) \|\| !is_numeric($tin) \|\| !strlen($tin) == 9 \|\| preg_match("/$regex/", $tin) !== 1) {`
	`27`	`+ if (null === $tin \|\| !is_numeric($tin) \|\| !strlen($tin) == 9 \|\| preg_match("/$regex/", $tin) !== 1) {`
`28`	`28`	`return false;`
`29`	`29`	`}`
`30`	`30`	`$n = str_split($tin);`