Code refactoring

Smile-SA · Dec 4, 2023 · adf8d62 · adf8d62
1 parent da5dee9
commit adf8d62
Show file tree

Hide file tree

Showing 26 changed files with 30 additions and 36 deletions.
diff --git a/src/Converter/Anonymizer/AnonymizeDate.php b/src/Converter/Anonymizer/AnonymizeDate.php
@@ -32,7 +32,7 @@ public function __construct(array $parameters = [])
      * @inheritdoc
      * @throws UnexpectedValueException
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
         if ($value === '') {

diff --git a/src/Converter/Anonymizer/AnonymizeEmail.php b/src/Converter/Anonymizer/AnonymizeEmail.php
@@ -35,7 +35,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
         if ($value === '') {

diff --git a/src/Converter/Anonymizer/AnonymizeNumber.php b/src/Converter/Anonymizer/AnonymizeNumber.php
@@ -35,7 +35,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
         if ($value === '') {

diff --git a/src/Converter/Anonymizer/AnonymizeText.php b/src/Converter/Anonymizer/AnonymizeText.php
@@ -45,7 +45,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
         if ($value === '') {

diff --git a/src/Converter/ConditionBuilder.php b/src/Converter/ConditionBuilder.php
@@ -65,12 +65,12 @@ private function sanitizeCondition(string $condition): string
         $condition = (string) preg_replace('/[\r\n]+/', ' ', $condition);
 
         // Add instruction separator
-        if (substr($condition, -1) !== ';') {
+        if (!str_ends_with($condition, ';')) {
             $condition .= ';';
         }
 
         // Add return statement
-        if (substr($condition, 0, 6) !== 'return') {
+        if (!str_starts_with($condition, 'return')) {
             $condition = 'return ' . $condition;
         }
 

diff --git a/src/Converter/Generator/NumberBetween.php b/src/Converter/Generator/NumberBetween.php
@@ -35,7 +35,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): int
     {
         return mt_rand($this->min, $this->max);
     }

diff --git a/src/Converter/Generator/RandomDate.php b/src/Converter/Generator/RandomDate.php
@@ -43,7 +43,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $this->randomizeDate();
 

diff --git a/src/Converter/Generator/RandomEmail.php b/src/Converter/Generator/RandomEmail.php
@@ -35,7 +35,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $domainIndex = mt_rand(0, $this->domainsCount - 1);
 

diff --git a/src/Converter/Generator/RandomText.php b/src/Converter/Generator/RandomText.php
@@ -36,7 +36,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $result = '';
         $length = mt_rand($this->minLength, $this->maxLength);

diff --git a/src/Converter/Randomizer/RandomizeEmail.php b/src/Converter/Randomizer/RandomizeEmail.php
@@ -35,7 +35,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
         if ($value === '') {

diff --git a/src/Converter/Randomizer/RandomizeNumber.php b/src/Converter/Randomizer/RandomizeNumber.php
@@ -13,18 +13,18 @@ class RandomizeNumber implements ConverterInterface
 
     public function __construct()
     {
-        $this->replaceCallback = fn () => mt_rand(0, 9);
+        $this->replaceCallback = fn () => (string) mt_rand(0, 9);
     }
 
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
 
         return $value !== ''
-            ? preg_replace_callback('/[0-9]/', $this->replaceCallback, $value)
+            ? (string) preg_replace_callback('/[0-9]/', $this->replaceCallback, $value)
             : $value;
     }
 }
diff --git a/src/Converter/Randomizer/RandomizeText.php b/src/Converter/Randomizer/RandomizeText.php
@@ -33,7 +33,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
         if ($value === '') {

diff --git a/src/Converter/Transformer/AppendText.php b/src/Converter/Transformer/AppendText.php
@@ -28,7 +28,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
 

diff --git a/src/Converter/Transformer/Hash.php b/src/Converter/Transformer/Hash.php
@@ -35,7 +35,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
 

diff --git a/src/Converter/Transformer/PrependText.php b/src/Converter/Transformer/PrependText.php
@@ -28,7 +28,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
 

diff --git a/src/Converter/Transformer/RegexReplace.php b/src/Converter/Transformer/RegexReplace.php
@@ -35,7 +35,7 @@ public function __construct(array $parameters)
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
 

diff --git a/src/Converter/Transformer/Replace.php b/src/Converter/Transformer/Replace.php
@@ -31,12 +31,12 @@ public function __construct(array $parameters)
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
 
         return $value !== ''
-            ? str_replace($this->search, $this->replacement, (string) $value)
+            ? str_replace($this->search, $this->replacement, $value)
             : $value;
     }
 }
diff --git a/src/Converter/Transformer/ToLower.php b/src/Converter/Transformer/ToLower.php
@@ -19,7 +19,7 @@ public function __construct()
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
 

diff --git a/src/Converter/Transformer/ToUpper.php b/src/Converter/Transformer/ToUpper.php
@@ -19,7 +19,7 @@ public function __construct()
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         $value = (string) $value;
 

diff --git a/src/Database/TableDependencyResolver.php b/src/Database/TableDependencyResolver.php
@@ -120,12 +120,6 @@ private function buildDependencyTree(): void
      */
     private function isForeignKeyIgnored(ForeignKey $foreignKey): bool
     {
-        foreach ($this->config->getIgnoredForeignKeys() as $constraintName) {
-            if ($foreignKey->getConstraintName() === $constraintName) {
-                return true;
-            }
-        }
-
-        return false;
+        return in_array($foreignKey->getConstraintName(), $this->config->getIgnoredForeignKeys(), true);
     }
 }
diff --git a/tests/framework/Mock/Converter/ConverterMock.php b/tests/framework/Mock/Converter/ConverterMock.php
@@ -20,7 +20,7 @@ public function __construct(array $parameters = [])
     /**
      * @inheritdoc
      */
-    public function convert(mixed $value, array $context = []): mixed
+    public function convert(mixed $value, array $context = []): string
     {
         return $this->prefix . $value;
     }

diff --git a/tests/functional/TestCase.php b/tests/functional/TestCase.php
@@ -87,7 +87,7 @@ protected static function getDatabase(): Database
             // Create the tables
             $connection = self::$database->getConnection();
             $statement = $connection->prepare(self::getDatabaseDump());
-            $statement->execute();
+            $statement->executeQuery();
         }
 
         return self::$database;

diff --git a/tests/unit/Converter/Anonymizer/AnonymizeEmailTest.php b/tests/unit/Converter/Anonymizer/AnonymizeEmailTest.php
@@ -37,7 +37,7 @@ public function testConverter(): void
     }
 
     /**
-     * Test the converter with an UTF-8 encoded value.
+     * Test the converter with a UTF-8 encoded value.
      */
     public function testEncoding(): void
     {

diff --git a/tests/unit/Converter/Anonymizer/AnonymizeNumberTest.php b/tests/unit/Converter/Anonymizer/AnonymizeNumberTest.php
@@ -37,7 +37,7 @@ public function testConverter(): void
     }
 
     /**
-     * Test the converter with an UTF-8 encoded value.
+     * Test the converter with a UTF-8 encoded value.
      */
     public function testEncoding(): void
     {

diff --git a/tests/unit/Converter/Anonymizer/AnonymizeTextTest.php b/tests/unit/Converter/Anonymizer/AnonymizeTextTest.php
@@ -36,7 +36,7 @@ public function testConverter(): void
     }
 
     /**
-     * Test the converter with an UTF-8 encoded value.
+     * Test the converter with a UTF-8 encoded value.
      */
     public function testEncoding(): void
     {

diff --git a/tests/unit/Converter/Parameters/ParameterProcessorTest.php b/tests/unit/Converter/Parameters/ParameterProcessorTest.php
@@ -17,7 +17,7 @@ public function testProcessor(): void
     {
         $processor = new ParameterProcessor();
         $processor->addParameter('string', Parameter::TYPE_STRING, true, 'default');
-        $processor->addParameter('array', Parameter::TYPE_ARRAY, false);
+        $processor->addParameter('array', Parameter::TYPE_ARRAY);
         $processor->addParameter('object', stdClass::class, true);
 
         $values = [
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ public function testConverter(): void @@
         }
         /**
-         * Test the converter with an UTF-8 encoded value.
+         * Test the converter with a UTF-8 encoded value.
          */
         public function testEncoding(): void
         {
@@ Expand Down @@