swaggest / json-diff

src/JsonValueReplace.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
             $path = $this->path;
             $pathItems = $this->pathItems;
             $actualKey = $key;
-            $this->path .= '/' . JsonPointer::escapeSegment($actualKey);
+            $this->path .= '/'.JsonPointer::escapeSegment($actualKey);
             $this->pathItems[] = $actualKey;
 
             $result[$key] = $this->process($originalValue);
@@ -54,6 +54,6 @@ 
             $this->pathItems = $pathItems;
         }
 
-        return $data instanceof \stdClass ? (object)$result : $result;
+        return $data instanceof \stdClass ? (object) $result : $result;
     }
 }
\ No newline at end of file

src/JsonPointer.php

Spacing +18 added lines, -18 removed lines

@@ -48,7 +48,7 @@ 
     {
         $result = $isURIFragmentId ? '#' : '';
         foreach ($pathItems as $pathItem) {
-            $result .= '/' . self::escapeSegment($pathItem, $isURIFragmentId);
+            $result .= '/'.self::escapeSegment($pathItem, $isURIFragmentId);
         }
         return $result;
     }
@@ -66,7 +66,7 @@ 
             return self::splitPathURIFragment($pathItems);
         } else {
             if ($first !== '') {
-                throw new Exception('Path must start with "/": ' . $path);
+                throw new Exception('Path must start with "/": '.$path);
             }
             return self::splitPathJsonString($pathItems);
         }
@@ -113,7 +113,7 @@ 
                     $ref = &$ref->$key;
                 } else {
                     if (!isset($ref->$key) && count($pathItems)) {
-                        throw new Exception('Non-existent path item: ' . $key);
+                        throw new Exception('Non-existent path item: '.$key);
                     } else {
                         $ref = &$ref->$key;
                     }
@@ -121,12 +121,12 @@ 
             } 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 ($flags & self::RECURSIVE_KEY_CREATION) {
                         $ref = new \stdClass();
                         $ref = &$ref->{$key};
                     } else {
-                        throw new Exception('Non-existent path item: ' . $key);
+                        throw new Exception('Non-existent path item: '.$key);
                     }
                 } elseif ([] === $ref && 0 === ($flags & self::STRICT_MODE) && false === $intKey && '-' !== $key) {
                     $ref = new \stdClass();
@@ -170,9 +170,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;
             }
         }
@@ -181,9 +181,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;
             }
         }
@@ -207,26 +207,26 @@ 
                         Exception::EMPTY_PROPERTY_NAME_UNSUPPORTED);
                 }
 
-                $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);
                 }
             } elseif (is_object($ref)) {
                 if (isset($ref->$key)) {
                     $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;
@@ -260,19 +260,19 @@ 
                 if (property_exists($ref, $key)) {
                     $ref = &$ref->$key;
                 } else {
-                    throw new Exception('Key not found: ' . $key);
+                    throw new Exception('Key not found: '.$key);
                 }
             } elseif (is_object($ref)) {
                 if (isset($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);
                 }
             }
         }
@@ -294,7 +294,7 @@ 
                 }
 
                 unset($parent[$refKey]);
-                if (!$isAssociative && (int)$refKey !== count($parent)) {
+                if (!$isAssociative && (int) $refKey !== count($parent)) {
                     $parent = array_values($parent);
                 }
             }

Braces +3 added lines, -1 removed lines

@@ -132,7 +132,9 @@
                     $ref = new \stdClass();
                     $ref = &$ref->{$key};
                 } else {
-                    if ($flags & self::RECURSIVE_KEY_CREATION && $ref === null) $ref = array();
+                    if ($flags & self::RECURSIVE_KEY_CREATION && $ref === null) {
+                        $ref = array();
+                    }
                     if ('-' === $key) {
                         $ref = &$ref[count($ref)];
                     } else {

src/JsonDiff.php

Spacing +7 added lines, -7 removed lines

@@ -256,11 +256,11 @@ 
 
         if ($this->options & self::TOLERATE_ASSOCIATIVE_ARRAYS) {
             if (is_array($original) && !empty($original) && !array_key_exists(0, $original)) {
-                $original = (object)$original;
+                $original = (object) $original;
             }
 
             if (is_array($new) && !empty($new) && !array_key_exists(0, $new)) {
-                $new = (object)$new;
+                $new = (object) $new;
             }
         }
 
@@ -316,7 +316,7 @@ 
             JsonPointer::add($this->merge, $this->pathItems, $new);
         }
 
-        $isUriFragment = (bool)($this->options & self::JSON_URI_FRAGMENT_ID);
+        $isUriFragment = (bool) ($this->options & self::JSON_URI_FRAGMENT_ID);
         $diffCnt = $this->addedCnt + $this->modifiedCnt + $this->removedCnt;
         foreach ($originalKeys as $key => $originalValue) {
             if ($this->options & self::STOP_ON_DIFF) {
@@ -331,7 +331,7 @@ 
             if ($isArray && is_int($actualKey)) {
                 $actualKey -= $removedOffset;
             }
-            $this->path .= '/' . JsonPointer::escapeSegment((string)$actualKey, $isUriFragment);
+            $this->path .= '/'.JsonPointer::escapeSegment((string) $actualKey, $isUriFragment);
             $this->pathItems[] = $actualKey;
 
             if (array_key_exists($key, $newArray)) {
@@ -372,7 +372,7 @@ 
                 return null;
             }
             $newOrdered[$key] = $value;
-            $path = $this->path . '/' . JsonPointer::escapeSegment($key, $isUriFragment);
+            $path = $this->path.'/'.JsonPointer::escapeSegment($key, $isUriFragment);
             $pathItems = $this->pathItems;
             $pathItems[] = $key;
             JsonPointer::add($this->added, $pathItems, $value);
@@ -388,7 +388,7 @@ 
 
         }
 
-        return is_array($new) ? $newOrdered : (object)$newOrdered;
+        return is_array($new) ? $newOrdered : (object) $newOrdered;
     }
 
     /**
@@ -521,7 +521,7 @@ 
 
                 $newRearranged[$j] = $new[$i];
             } else {
-                $changedItems []= $new[$i];
+                $changedItems [] = $new[$i];
             }
 
         }

src/JsonHash.php

Spacing +9 added lines, -9 removed lines

@@ -21,7 +21,7 @@ 
         $xorHash = '';
 
         if (!$data instanceof \stdClass && !is_array($data)) {
-            $s = $path . (string)$data;
+            $s = $path.(string) $data;
             if (strlen($xorHash) < strlen($s)) {
                 $xorHash = str_pad($xorHash, strlen($s));
             }
@@ -32,15 +32,15 @@ 
 
         if ($this->options & JsonDiff::TOLERATE_ASSOCIATIVE_ARRAYS) {
             if (is_array($data) && !empty($data) && !array_key_exists(0, $data)) {
-                $data = (object)$data;
+                $data = (object) $data;
             }
         }
 
         if (is_array($data)) {
             if ($this->options & JsonDiff::REARRANGE_ARRAYS) {
                 foreach ($data as $key => $item) {
-                    $itemPath = $path . '/' . $key;
-                    $itemHash = $path . $this->xorHash($item, $itemPath);
+                    $itemPath = $path.'/'.$key;
+                    $itemHash = $path.$this->xorHash($item, $itemPath);
                     if (strlen($xorHash) < strlen($itemHash)) {
                         $xorHash = str_pad($xorHash, strlen($itemHash));
                     }
@@ -48,8 +48,8 @@ 
                 }
             } else {
                 foreach ($data as $key => $item) {
-                    $itemPath = $path . '/' . $key;
-                    $itemHash = md5($itemPath . $this->xorHash($item, $itemPath), true);
+                    $itemPath = $path.'/'.$key;
+                    $itemHash = md5($itemPath.$this->xorHash($item, $itemPath), true);
                     if (strlen($xorHash) < strlen($itemHash)) {
                         $xorHash = str_pad($xorHash, strlen($itemHash));
                     }
@@ -62,9 +62,9 @@ 
 
         $dataKeys = get_object_vars($data);
         foreach ($dataKeys as $key => $value) {
-            $propertyPath = $path . '/' .
-                JsonPointer::escapeSegment($key, (bool)($this->options & JsonDiff::JSON_URI_FRAGMENT_ID));
-            $propertyHash = $propertyPath . md5($key, true) . $this->xorHash($value, $propertyPath);
+            $propertyPath = $path.'/'.
+                JsonPointer::escapeSegment($key, (bool) ($this->options & JsonDiff::JSON_URI_FRAGMENT_ID));
+            $propertyHash = $propertyPath.md5($key, true).$this->xorHash($value, $propertyPath);
             if (strlen($xorHash) < strlen($propertyHash)) {
                 $xorHash = str_pad($xorHash, strlen($propertyHash));
             }

src/JsonPatch.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
         foreach ($data as $operation) {
             /** @var OpPath|OpPathValue|OpPathFrom|array $operation */
             if (is_array($operation)) {
-                $operation = (object)$operation;
+                $operation = (object) $operation;
             }
 
             if (!isset($operation->op)) {
@@ -88,7 +88,7 @@ 
                     $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) {
@@ -112,7 +112,7 @@ 
     {
         $result = array();
         foreach ($patch->operations as $operation) {
-            $result[] = (object)(array)$operation;
+            $result[] = (object) (array) $operation;
         }
 
         return $result;
@@ -170,8 +170,8 @@ 
                         $diff = new JsonDiff($operation->value, $value,
                             JsonDiff::STOP_ON_DIFF);
                         if ($diff->getDiffCnt() !== 0) {
-                            throw new PatchTestOperationFailedException('Test operation ' . json_encode($operation, JSON_UNESCAPED_SLASHES)
-                                . ' failed: ' . json_encode($value));
+                            throw new PatchTestOperationFailedException('Test operation '.json_encode($operation, JSON_UNESCAPED_SLASHES)
+                                . ' failed: '.json_encode($value));
                         }
                         break;
                 }