swaggest / json-diff

src/JsonPatch.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
         foreach ($data as $operation) {
             /** @var OpPath|OpPathValue|OpPathFrom $operation */
             if (is_array($operation)) {
-                $operation = (object)$operation;
+                $operation = (object) $operation;
             }
 
             if (!isset($operation->op)) {
@@ -67,11 +67,11 @@ 
                     $op = new Test();
                     break;
                 default:
-                    throw new Exception('Unknown "op": ' . $operation->op);
+                    throw new Exception('Unknown "op": '.$operation->op);
             }
             $op->path = $operation->path;
             if ($op instanceof OpPathValue) {
-                if (!array_key_exists('value', (array)$operation)) {
+                if (!array_key_exists('value', (array) $operation)) {
                     throw new Exception('Missing "value" in operation data');
                 }
                 $op->value = $operation->value;
@@ -90,7 +90,7 @@ 
     {
         $result = array();
         foreach ($patch->operations as $operation) {
-            $result[] = (object)(array)$operation;
+            $result[] = (object) (array) $operation;
         }
 
         return $result;
@@ -143,8 +143,8 @@ 
                     $diff = new JsonDiff($operation->value, $value,
                         JsonDiff::STOP_ON_DIFF);
                     if ($diff->getDiffCnt() !== 0) {
-                        throw new Exception('Test operation ' . json_encode($operation, JSON_UNESCAPED_SLASHES)
-                            . ' failed: ' . json_encode($value));
+                        throw new Exception('Test operation '.json_encode($operation, JSON_UNESCAPED_SLASHES)
+                            . ' failed: '.json_encode($value));
                     }
                     break;
             }

src/JsonDiff.php

Spacing +3 added lines, -3 removed lines

@@ -241,7 +241,7 @@ 
 
             $path = $this->path;
             $pathItems = $this->pathItems;
-            $this->path .= '/' . JsonPointer::escapeSegment($key, $this->options & self::JSON_URI_FRAGMENT_ID);
+            $this->path .= '/'.JsonPointer::escapeSegment($key, $this->options & self::JSON_URI_FRAGMENT_ID);
             $this->pathItems[] = $key;
 
             if (array_key_exists($key, $newArray)) {
@@ -269,7 +269,7 @@ 
                 return null;
             }
             $newOrdered[$key] = $value;
-            $path = $this->path . '/' . JsonPointer::escapeSegment($key, $this->options & self::JSON_URI_FRAGMENT_ID);
+            $path = $this->path.'/'.JsonPointer::escapeSegment($key, $this->options & self::JSON_URI_FRAGMENT_ID);
             $pathItems = $this->pathItems;
             $pathItems[] = $key;
             JsonPointer::add($this->added, $pathItems, $value);
@@ -279,7 +279,7 @@ 
 
         }
 
-        return is_array($new) ? $newOrdered : (object)$newOrdered;
+        return is_array($new) ? $newOrdered : (object) $newOrdered;
     }
 
     private function rearrangeArray(array $original, array $new)

src/JsonPointer.php

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
             }
         } else {
             if ($first !== '') {
-                throw new Exception('Path must start with "/": ' . $path);
+                throw new Exception('Path must start with "/": '.$path);
             }
             foreach ($pathItems as $key) {
                 $key = str_replace(array('~1', '~0'), array('/', '~'), $key);
@@ -62,7 +62,7 @@ 
             } else { // null or array
                 $intKey = filter_var($key, FILTER_VALIDATE_INT);
                 if ($ref === null && (false === $intKey || $intKey !== 0)) {
-                    $key = (string)$key;
+                    $key = (string) $key;
                     if ($recursively) {
                         $ref = new \stdClass();
                         $ref = &$ref->{$key};
@@ -99,9 +99,9 @@ 
         if (array_key_exists($key, $a)) {
             return true;
         }
-        $key = (string)$key;
+        $key = (string) $key;
         foreach ($a as $k => $v) {
-            if ((string)$k === $key) {
+            if ((string) $k === $key) {
                 return true;
             }
         }
@@ -110,9 +110,9 @@ 
 
     private static function arrayGet($key, array $a)
     {
-        $key = (string)$key;
+        $key = (string) $key;
         foreach ($a as $k => $v) {
-            if ((string)$k === $key) {
+            if ((string) $k === $key) {
                 return $v;
             }
         }
@@ -131,20 +131,20 @@ 
         $ref = $holder;
         while (null !== $key = array_shift($pathItems)) {
             if ($ref instanceof \stdClass) {
-                $vars = (array)$ref;
+                $vars = (array) $ref;
                 if (self::arrayKeyExists($key, $vars)) {
                     $ref = self::arrayGet($key, $vars);
                 } else {
-                    throw new Exception('Key not found: ' . $key);
+                    throw new Exception('Key not found: '.$key);
                 }
             } elseif (is_array($ref)) {
                 if (self::arrayKeyExists($key, $ref)) {
                     $ref = $ref[$key];
                 } else {
-                    throw new Exception('Key not found: ' . $key);
+                    throw new Exception('Key not found: '.$key);
                 }
             } else {
-                throw new Exception('Key not found: ' . $key);
+                throw new Exception('Key not found: '.$key);
             }
         }
         return $ref;
@@ -166,13 +166,13 @@ 
                 if (property_exists($ref, $key)) {
                     $ref = &$ref->$key;
                 } else {
-                    throw new Exception('Key not found: ' . $key);
+                    throw new Exception('Key not found: '.$key);
                 }
             } else {
                 if (array_key_exists($key, $ref)) {
                     $ref = &$ref[$key];
                 } else {
-                    throw new Exception('Key not found: ' . $key);
+                    throw new Exception('Key not found: '.$key);
                 }
             }
         }

Braces +3 added lines, -1 removed lines

@@ -70,7 +70,9 @@
                         throw new Exception('Non-existent path');
                     }
                 } else {
-                    if ($recursively && $ref === null) $ref = array();
+                    if ($recursively && $ref === null) {
+                        $ref = array();
+                    }
                     if ('-' === $key) {
                         $ref = &$ref[];
                     } else {