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/JsonPatch.php

Spacing +6 added lines, -6 removed lines

@@ -33,7 +33,7 @@ 
         foreach ($data as $operation) {
             /** @var OpPath|OpPathValue|OpPathFrom $operation */
             if (is_array($operation)) {
-                $operation = (object)$operation;
+                $operation = (object) $operation;
             }
 
             if (!isset($operation->op)) {
@@ -64,11 +64,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;
@@ -87,7 +87,7 @@ 
     {
         $result = array();
         foreach ($patch->operations as $operation) {
-            $result[] = (object)(array)$operation;
+            $result[] = (object) (array) $operation;
         }
 
         return $result;
@@ -144,8 +144,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/JsonPointer.php

Braces +3 added lines, -1 removed lines

@@ -122,7 +122,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[];
                     } else {

Spacing +17 added lines, -17 removed lines

@@ -43,7 +43,7 @@ 
     {
         $result = $isURIFragmentId ? '#' : '';
         foreach ($pathItems as $pathItem) {
-            $result .= '/' . self::escapeSegment($pathItem, $isURIFragmentId);
+            $result .= '/'.self::escapeSegment($pathItem, $isURIFragmentId);
         }
         return $result;
     }
@@ -61,7 +61,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);
         }
@@ -108,7 +108,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;
                     }
@@ -116,12 +116,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();
@@ -159,9 +159,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;
             }
         }
@@ -170,9 +170,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;
             }
         }
@@ -196,26 +196,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;
@@ -248,19 +248,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);
                 }
             }
         }

src/JsonDiff.php

Spacing +5 added lines, -5 removed lines

@@ -279,12 +279,12 @@ 
         if ($merge && is_array($new) && !is_array($original)) {
             $merge = false;
             JsonPointer::add($this->merge, $this->pathItems, $new);
-        } elseif ($merge  && $new instanceof \stdClass && !$original instanceof \stdClass) {
+        } elseif ($merge && $new instanceof \stdClass && !$original instanceof \stdClass) {
             $merge = false;
             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);
         foreach ($originalKeys as $key => $originalValue) {
             if ($this->options & self::STOP_ON_DIFF) {
                 if ($this->modifiedCnt || $this->addedCnt || $this->removedCnt) {
@@ -298,7 +298,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)) {
@@ -335,7 +335,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);
@@ -351,7 +351,7 @@ 
 
         }
 
-        return is_array($new) ? $newOrdered : (object)$newOrdered;
+        return is_array($new) ? $newOrdered : (object) $newOrdered;
     }
 
     private function rearrangeArray(array $original, array $new)