Enhancement: Use Helper to select random element instead of array_rand() (#754)

localheinz · web-flow · commit 51794a1064a8 · 2023-09-14T07:40:28.000+02:00
diff --git a/src/Faker/Core/File.php b/src/Faker/Core/File.php
@@ -547,14 +547,14 @@ final class File implements Extension\FileExtension
 
     public function mimeType(): string
     {
-        return array_rand($this->mimeTypes, 1);
+        return Extension\Helper::randomElement(array_keys($this->mimeTypes));
     }
 
     public function extension(): string
     {
-        $extension = $this->mimeTypes[array_rand($this->mimeTypes, 1)];
+        $extension = Extension\Helper::randomElement($this->mimeTypes);
 
-        return is_array($extension) ? $extension[array_rand($extension, 1)] : $extension;
+        return is_array($extension) ? Extension\Helper::randomElement($extension) : $extension;
     }
 
     public function filePath(): string
diff --git a/src/Faker/ORM/CakePHP/EntityPopulator.php b/src/Faker/ORM/CakePHP/EntityPopulator.php
@@ -3,6 +3,7 @@
 namespace Faker\ORM\CakePHP;
 
 use Cake\ORM\TableRegistry;
+use Faker\Extension;
 
 class EntityPopulator
 {
@@ -112,7 +113,7 @@ public function guessModifiers()
                     throw new \Exception(sprintf('%s belongsTo %s, which seems empty at this point.', $this->getTable($this->class)->table(), $assoc->table()));
                 }
 
-                $foreignKey = $foreignKeys[array_rand($foreignKeys)];
+                $foreignKey = Extension\Helper::randomElement($foreignKeys);
                 $data[$assoc->foreignKey()] = $foreignKey;
 
                 return $data;

Original file line number	Diff line number	Diff line change
`@@ -547,14 +547,14 @@ final class File implements Extension\FileExtension`
`547`	`547`
`548`	`548`	`public function mimeType(): string`
`549`	`549`	`{`
`550`		`- return array_rand($this->mimeTypes, 1);`
	`550`	`+ return Extension\Helper::randomElement(array_keys($this->mimeTypes));`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`public function extension(): string`
`554`	`554`	`{`
`555`		`- $extension = $this->mimeTypes[array_rand($this->mimeTypes, 1)];`
	`555`	`+ $extension = Extension\Helper::randomElement($this->mimeTypes);`
`556`	`556`
`557`		`- return is_array($extension) ? $extension[array_rand($extension, 1)] : $extension;`
	`557`	`+ return is_array($extension) ? Extension\Helper::randomElement($extension) : $extension;`
`558`	`558`	`}`
`559`	`559`
`560`	`560`	`public function filePath(): string`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace Faker\ORM\CakePHP;`
`4`	`4`
`5`	`5`	`use Cake\ORM\TableRegistry;`
	`6`	`+use Faker\Extension;`
`6`	`7`
`7`	`8`	`class EntityPopulator`
`8`	`9`	`{`
`@@ -112,7 +113,7 @@ public function guessModifiers()`
`112`	`113`	`throw new \Exception(sprintf('%s belongsTo %s, which seems empty at this point.', $this->getTable($this->class)->table(), $assoc->table()));`
`113`	`114`	`}`
`114`	`115`
`115`		`- $foreignKey = $foreignKeys[array_rand($foreignKeys)];`
	`116`	`+ $foreignKey = Extension\Helper::randomElement($foreignKeys);`
`116`	`117`	`$data[$assoc->foreignKey()] = $foreignKey;`
`117`	`118`
`118`	`119`	`return $data;`