geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 17:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4-development' into v4-optional-character-fix

Browse Source
This commit is contained in:
Simon Sessingø
2018-08-24 17:23:33 +02:00
committed by GitHub
parent a7cbacbde7 2d042391aa
commit 5c2a973214
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/php.xml
Generated
+1
View File
@@ -41,6 +41,7 @@
<path value="$PROJECT_DIR$/vendor/nikic/php-parser" /> <path value="$PROJECT_DIR$/vendor/nikic/php-parser" />
<path value="$PROJECT_DIR$/vendor/psr/container" /> <path value="$PROJECT_DIR$/vendor/psr/container" />
<path value="$PROJECT_DIR$/vendor/php-di/php-di" /> <path value="$PROJECT_DIR$/vendor/php-di/php-di" />
<path value="$PROJECT_DIR$/vendor/symfony/yaml" />
</include_path> </include_path>
</component> </component>
<component name="PhpProjectSharedConfiguration" php_language_level="7.1" /> <component name="PhpProjectSharedConfiguration" php_language_level="7.1" />
.idea/simple-php-router.iml
Generated
+1
View File
@@ -40,6 +40,7 @@
<excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" /> <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/version" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php56" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" /> <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-util" />
<excludeFolder url="file://$MODULE_DIR$/vendor/symfony/yaml" />
<excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" /> <excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" /> <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
</content> </content>
src/Pecee/Http/Input/InputHandler.php
+6 -10
View File
@@ -298,17 +298,13 @@ class InputHandler
// Append POST data // Append POST data
$output += $_POST; $output += $_POST;
$contents = file_get_contents('php://input');
if (\in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) { // Append any PHP-input json
if (strpos(trim($contents), '{') === 0) {
$contents = file_get_contents('php://input'); $post = json_decode($contents, true);
if ($post !== false) {
// Append any PHP-input json $output += $post;
if (strpos(trim($contents), '{') === 0) {
$post = json_decode($contents, true);
if ($post !== false) {
$output += $post;
}
} }
} }
} }