Fixing batch casting

cakephp · Mar 5, 2018 · ca23d3f · ca23d3f
1 parent 1c04732
commit ca23d3f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/src/Database/FieldTypeConverter.php b/src/Database/FieldTypeConverter.php
@@ -82,8 +82,8 @@ public function __construct(TypeMap $typeMap, Driver $driver)
             // the interface. Users can implement the TypeInterface instead to have
             // access to this feature.
             $batchingType = $type instanceof BatchCastingInterface &&
-                $type instanceof Type &&
-                strpos(get_class($type), 'Cake\Database\Type') === false;
+                !($type instanceof Type &&
+                strpos(get_class($type), 'Cake\Database\Type') === false);
 
             if ($batchingType) {
                 $batchingMap[$k] = $type;

diff --git a/src/Database/Type/DecimalType.php b/src/Database/Type/DecimalType.php
@@ -107,10 +107,7 @@ public function toPHP($value, Driver $driver)
             return $value;
         }
 
-        // Using coercion is faster than casting
-        // @codingStandardsIgnoreStart
-        return (float)+$value;
-        // @codingStandardsIgnoreEnd
+        return (float)$value;
     }
 
     /**
@@ -125,10 +122,7 @@ public function manyToPHP(array $values, array $fields, Driver $driver)
                 continue;
             }
 
-            // Using coercion is faster than casting
-            // @codingStandardsIgnoreStart
-            $values[$field] = (float)+$values[$field];
-            // @codingStandardsIgnoreEnd
+            $values[$field] = (float)$values[$field];
         }
 
         return $values;

diff --git a/src/Database/Type/IntegerType.php b/src/Database/Type/IntegerType.php
@@ -87,10 +87,7 @@ public function toPHP($value, Driver $driver)
             return $value;
         }
 
-        // Using coercion is faster than casting
-        // @codingStandardsIgnoreStart
-        return (int)+$value;
-        // @codingStandardsIgnoreEnd
+        return (int)$value;
     }
 
     /**
@@ -104,10 +101,7 @@ public function manyToPHP(array $values, array $fields, Driver $driver)
             if (!isset($values[$field])) {
                 continue;
             }
-            // Using coercion is faster than casting
-            // @codingStandardsIgnoreStart
-            $values[$field] = (int)+$values[$field];
-            // @codingStandardsIgnoreEnd
+            $values[$field] = (int)$values[$field];
         }
 
         return $values;