Replace unused Entity private method

codeigniter4 · Aug 26, 2021 · 4056a40 · 4056a40
1 parent 4d0110f
commit 4056a40
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 26 deletions.
diff --git a/rector.php b/rector.php
@@ -78,7 +78,6 @@
 
         // private method called via getPrivateMethodInvoker
         RemoveUnusedPrivateMethodRector::class => [
-            __DIR__ . '/system/Entity/Entity.php',
             __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
         ],
 

diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
@@ -389,20 +389,6 @@ protected function castAs($value, string $attribute, string $method = 'get')
         return $handlers[$type]::$method($value, $params);
     }
 
-    /**
-     * Cast as JSON
-     *
-     * @param mixed $value
-     *
-     * @throws CastException
-     *
-     * @return mixed
-     */
-    private function castAsJson($value, bool $asArray = false)
-    {
-        return JsonCast::get($value, $asArray ? ['array'] : []);
-    }
-
     /**
      * Support for json_encode()
      *

diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Entity;
 
+use Closure;
 use CodeIgniter\Entity\Exceptions\CastException;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\I18n\Time;
@@ -589,34 +590,43 @@ public function testCastAsJSONErrorUTF8()
 
     public function testCastAsJSONSyntaxError()
     {
-        $entity = new Entity();
+        $method = Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
 
-        $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class);
 
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Syntax error, malformed JSON');
 
-        $method('{ this is bad string', true);
+        $method('{ this is bad string');
     }
 
     public function testCastAsJSONAnotherErrorDepth()
     {
-        $entity = new Entity();
+        $method = Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
 
-        $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class);
 
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Maximum stack depth exceeded');
 
         $string = '{' . str_repeat('"test":{', 513) . '"test":"value"' . str_repeat('}', 513) . '}';
-
-        $method($string, true);
+        $method($string);
     }
 
     public function testCastAsJSONControlCharCheck()
     {
-        $entity = new Entity();
-        $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
+        $method = Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class);
 
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Unexpected control character found');
@@ -628,8 +638,12 @@ public function testCastAsJSONControlCharCheck()
 
     public function testCastAsJSONStateMismatch()
     {
-        $entity = new Entity();
-        $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
+        $method = Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class);
 
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Underflow or the modes mismatch');