Merge pull request #15025 from niden/T14936-json-decode

T14936 json decode
phalcon · May 6, 2020 · eee67b3 · eee67b3
2 parents 00fb495 + 34e82d7
commit eee67b3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -11,6 +11,7 @@
 - Changed return type for `Phalcon\Mvc\Model\Criteria::getLimit` so that integer, NULL or array will be returned [#15004](https://github.com/phalcon/cphalcon/issues/15004)
 - Changed return type hint for `Phalcon\Mvc\Model\Manager::getCustomEventsManager` to return NULL instead of boolean FALSE if there is no special events manager [#15008](https://github.com/phalcon/cphalcon/issues/15008)
 - Changed `Phalcon\Mvc\Model\MetaData::getDI` so that now it will throw a `Phalcon\Mvc\Model\Exception` if there is no `DiInterface` instance  [#15011](https://github.com/phalcon/cphalcon/issues/15011)
+- Changed `Phalcon\Http\Request::getJsonRawBody` to use `json_decode` instead of `Phalcon\Json::decode` [#14936](https://github.com/phalcon/cphalcon/issues/14936)
 
 ## Fixed
 - Fixed `Phalcon\Mvc\Model\Query\Builder::getPhql` to add single quote between string value on a simple condition [#14874](https://github.com/phalcon/cphalcon/issues/14874)

diff --git a/phalcon/Http/Request.zep b/phalcon/Http/Request.zep
@@ -511,7 +511,7 @@ class Request extends AbstractInjectionAware implements RequestInterface
             return false;
         }
 
-        return Json::decode(rawBody, associative);
+        return json_decode(rawBody, associative);
     }
 
     /**

diff --git a/tests/_ci/generate-api-docs.php b/tests/_ci/generate-api-docs.php
@@ -146,10 +146,10 @@
                 $methodComment = trim($methodComment, "\t\n");
                 $methodComment = preg_replace('/^\/\/$/', '', $methodComment);
 
-                $elements[] = $methodComment . PHP_EOL
-                    . '```php' . PHP_EOL
+                $elements[] = '```php' . PHP_EOL
                     . $method['signature'] . PHP_EOL
-                    . '```' . PHP_EOL;
+                    . '```' . PHP_EOL
+                    . $methodComment . PHP_EOL . PHP_EOL;
             }
             $signature = implode(PHP_EOL, $elements);
             $output    .= "
-Original file line number
+Diff line change
@@ Expand Up @@
                 return false;
             }
-            return Json::decode(rawBody, associative);
+            return json_decode(rawBody, associative);
         }
         /**
@@ Expand Down @@