Reduce code smell (#32)

chris-doehring · web-flow · commit e9584cfd4eb9 · 2020-10-29T12:25:59.000+01:00
* Reduce code smell

* Reduce code smell
diff --git a/src/Faker/Factory.php b/src/Faker/Factory.php
@@ -49,13 +49,15 @@ protected static function getProviderClassname($provider, $locale = '')
     /**
      * @param string $provider
      * @param string $locale
-     * @return string
+     * @return string|null
      */
     protected static function findProviderClassname($provider, $locale = '')
     {
         $providerClass = 'Faker\\' . ($locale ? sprintf('Provider\%s\%s', $locale, $provider) : sprintf('Provider\%s', $provider));
         if (class_exists($providerClass, true)) {
             return $providerClass;
         }
+
+        return null;
     }
 }
diff --git a/src/Faker/Guesser/Name.php b/src/Faker/Guesser/Name.php
@@ -19,7 +19,7 @@ public function __construct(\Faker\Generator $generator)
     /**
      * @param string $name
      * @param int|null $size Length of field, if known
-     * @return callable
+     * @return callable|null
      */
     public function guessFormat($name, $size = null)
     {
@@ -152,5 +152,7 @@ public function guessFormat($name, $size = null)
                     return $generator->text;
                 };
         }
+
+        return null;
     }
 }
diff --git a/src/Faker/ORM/Mandango/EntityPopulator.php b/src/Faker/ORM/Mandango/EntityPopulator.php
@@ -85,6 +85,8 @@ public function guessColumnFormatters(\Faker\Generator $generator, Mandango $man
                 if (isset($insertedEntities[$referenceClass])) {
                     return Base::randomElement($insertedEntities[$referenceClass]);
                 }
+
+                return null;
             };
         }
 
diff --git a/src/Faker/Provider/Base.php b/src/Faker/Provider/Base.php
@@ -248,9 +248,7 @@ public static function randomKey($array = array())
             return null;
         }
         $keys = array_keys($array);
-        $key = $keys[mt_rand(0, count($keys) - 1)];
-
-        return $key;
+        return $keys[mt_rand(0, count($keys) - 1)];
     }
 
     /**
diff --git a/src/Faker/Provider/Uuid.php b/src/Faker/Provider/Uuid.php
@@ -38,7 +38,7 @@ public static function uuid()
         $tHi |= (3 << 12);
 
         // cast to string
-        $uuid = sprintf(
+        return sprintf(
             '%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x',
             $tLo,
             $tMi,
@@ -52,7 +52,5 @@ public static function uuid()
             $byte[14],
             $byte[15]
         );
-
-        return $uuid;
     }
 }
diff --git a/src/Faker/Provider/fr_CH/Person.php b/src/Faker/Provider/fr_CH/Person.php
@@ -108,8 +108,6 @@ public static function avs13()
 
         $checksum = \Faker\Calculator\Ean::checksum(implode($p));
 
-        $avs = sprintf("%s.%s.%s.%s%s", $p[0], $p[1], $p[2], $p[3], $checksum);
-
-        return $avs;
+        return sprintf("%s.%s.%s.%s%s", $p[0], $p[1], $p[2], $p[3], $checksum);
     }
 }
diff --git a/src/Faker/Provider/kk_KZ/Person.php b/src/Faker/Provider/kk_KZ/Person.php
@@ -189,6 +189,8 @@ private static function getCenturyByYear($year)
         } elseif ($year >= 1800) {
             return self::CENTURY_19TH;
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Faker/Provider/ro_RO/PhoneNumber.php b/src/Faker/Provider/ro_RO/PhoneNumber.php
@@ -52,15 +52,11 @@ public function phoneNumber()
 
     public static function tollFreePhoneNumber()
     {
-        $number = static::numerify(static::randomElement(static::$specialFormats['toll-free']));
-
-        return $number;
+        return static::numerify(static::randomElement(static::$specialFormats['toll-free']));
     }
 
     public static function premiumRatePhoneNumber()
     {
-        $number = static::numerify(static::randomElement(static::$specialFormats['premium-rate']));
-
-        return $number;
+        return static::numerify(static::randomElement(static::$specialFormats['premium-rate']));
     }
 }
diff --git a/src/Faker/Provider/zh_TW/Person.php b/src/Faker/Provider/zh_TW/Person.php
@@ -194,8 +194,6 @@ public function personalIdentityNumber($gender = null)
             $checkSumDigit = 0;
         }
 
-        $id = $birthPlace . $genderCode . $randomNumberCode . $checkSumDigit;
-
-        return $id;
+        return $birthPlace . $genderCode . $randomNumberCode . $checkSumDigit;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,13 +49,15 @@ protected static function getProviderClassname($provider, $locale = '')`
`49`	`49`	`/**`
`50`	`50`	`* @param string $provider`
`51`	`51`	`* @param string $locale`
`52`		`- * @return string`
	`52`	`+ * @return string\|null`
`53`	`53`	`*/`
`54`	`54`	`protected static function findProviderClassname($provider, $locale = '')`
`55`	`55`	`{`
`56`	`56`	`$providerClass = 'Faker\\' . ($locale ? sprintf('Provider\%s\%s', $locale, $provider) : sprintf('Provider\%s', $provider));`
`57`	`57`	`if (class_exists($providerClass, true)) {`
`58`	`58`	`return $providerClass;`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ return null;`
`60`	`62`	`}`
`61`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function __construct(\Faker\Generator $generator)`
`19`	`19`	`/**`
`20`	`20`	`* @param string $name`
`21`	`21`	`* @param int\|null $size Length of field, if known`
`22`		`- * @return callable`
	`22`	`+ * @return callable\|null`
`23`	`23`	`*/`
`24`	`24`	`public function guessFormat($name, $size = null)`
`25`	`25`	`{`
`@@ -152,5 +152,7 @@ public function guessFormat($name, $size = null)`
`152`	`152`	`return $generator->text;`
`153`	`153`	`};`
`154`	`154`	`}`
	`155`	`+`
	`156`	`+ return null;`
`155`	`157`	`}`
`156`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,8 @@ public function guessColumnFormatters(\Faker\Generator $generator, Mandango $man`
`85`	`85`	`if (isset($insertedEntities[$referenceClass])) {`
`86`	`86`	`return Base::randomElement($insertedEntities[$referenceClass]);`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ return null;`
`88`	`90`	`};`
`89`	`91`	`}`
`90`	`92`
Original file line number	Diff line number	Diff line change
`@@ -248,9 +248,7 @@ public static function randomKey($array = array())`
`248`	`248`	`return null;`
`249`	`249`	`}`
`250`	`250`	`$keys = array_keys($array);`
`251`		`- $key = $keys[mt_rand(0, count($keys) - 1)];`
`252`		`-`
`253`		`- return $key;`
	`251`	`+ return $keys[mt_rand(0, count($keys) - 1)];`
`254`	`252`	`}`
`255`	`253`
`256`	`254`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,6 @@ public static function avs13()`
`108`	`108`
`109`	`109`	`$checksum = \Faker\Calculator\Ean::checksum(implode($p));`
`110`	`110`
`111`		`- $avs = sprintf("%s.%s.%s.%s%s", $p[0], $p[1], $p[2], $p[3], $checksum);`
`112`		`-`
`113`		`- return $avs;`
	`111`	`+ return sprintf("%s.%s.%s.%s%s", $p[0], $p[1], $p[2], $p[3], $checksum);`
`114`	`112`	`}`
`115`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,8 @@ private static function getCenturyByYear($year)`
`189`	`189`	`} elseif ($year >= 1800) {`
`190`	`190`	`return self::CENTURY_19TH;`
`191`	`191`	`}`
	`192`	`+`
	`193`	`+ return null;`
`192`	`194`	`}`
`193`	`195`
`194`	`196`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -52,15 +52,11 @@ public function phoneNumber()`
`52`	`52`
`53`	`53`	`public static function tollFreePhoneNumber()`
`54`	`54`	`{`
`55`		`- $number = static::numerify(static::randomElement(static::$specialFormats['toll-free']));`
`56`		`-`
`57`		`- return $number;`
	`55`	`+ return static::numerify(static::randomElement(static::$specialFormats['toll-free']));`
`58`	`56`	`}`
`59`	`57`
`60`	`58`	`public static function premiumRatePhoneNumber()`
`61`	`59`	`{`
`62`		`- $number = static::numerify(static::randomElement(static::$specialFormats['premium-rate']));`
`63`		`-`
`64`		`- return $number;`
	`60`	`+ return static::numerify(static::randomElement(static::$specialFormats['premium-rate']));`
`65`	`61`	`}`
`66`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,6 @@ public function personalIdentityNumber($gender = null)`
`194`	`194`	`$checkSumDigit = 0;`
`195`	`195`	`}`
`196`	`196`
`197`		`- $id = $birthPlace . $genderCode . $randomNumberCode . $checkSumDigit;`
`198`		`-`
`199`		`- return $id;`
	`197`	`+ return $birthPlace . $genderCode . $randomNumberCode . $checkSumDigit;`
`200`	`198`	`}`
`201`	`199`	`}`