code cleanup

Author: vearutop

src/JsonPointer.php

@@ -28,20 +28,30 @@ public static function splitPath($path)
     {
         $pathItems = explode('/', $path);
         $first = array_shift($pathItems);
-        $result = array();
         if ($first === '#') {
-            foreach ($pathItems as $key) {
-                $key = str_replace(array('~1', '~0'), array('/', '~'), urldecode($key));
-                $result[] = $key;
-            }
+            return self::splitPathURIFragment($pathItems);
         } else {
             if ($first !== '') {
                 throw new Exception('Path must start with "/": ' . $path);
             }
-            foreach ($pathItems as $key) {
-                $key = str_replace(array('~1', '~0'), array('/', '~'), $key);
-                $result[] = $key;
-            }
+            return self::splitPathJsonString($pathItems);
+        }
+    }
+
+    private static function splitPathURIFragment(array $pathItems) {
+        $result = array();
+        foreach ($pathItems as $key) {
+            $key = str_replace(array('~1', '~0'), array('/', '~'), urldecode($key));
+            $result[] = $key;
+        }
+        return $result;
+    }
+
+    private static function splitPathJsonString(array $pathItems) {
+        $result = array();
+        foreach ($pathItems as $key) {
+            $key = str_replace(array('~1', '~0'), array('/', '~'), $key);
+            $result[] = $key;
         }
         return $result;
     }

tests/src/JsonPatchTest.php

@@ -72,14 +72,6 @@ public function testNull()
 
     }
 
-
-    public function testInvalidPatch()
-    {
-        $this->setExpectedException(get_class(new \TypeError()),
-            'Argument 1 passed to Swaggest\JsonDiff\JsonPatch::import() must be of the type array, integer given');
-        JsonPatch::import(123);
-    }
-
     public function testMissingOp()
     {
         $this->setExpectedException(get_class(new Exception()), 'Missing "op" in operation data');