mirror of
https://github.com/skipperbent/simple-php-router.git
synced 2026-07-11 22:32:14 +00:00
Merge branch 'v4-development' into v4-optional-character-fix
This commit is contained in:
Generated
+1
@@ -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" />
|
||||||
|
|||||||
Generated
+1
@@ -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>
|
||||||
|
|||||||
@@ -298,9 +298,6 @@ class InputHandler
|
|||||||
|
|
||||||
// Append POST data
|
// Append POST data
|
||||||
$output += $_POST;
|
$output += $_POST;
|
||||||
|
|
||||||
if (\in_array($this->request->getMethod(), ['put', 'patch', 'delete'], false) === true) {
|
|
||||||
|
|
||||||
$contents = file_get_contents('php://input');
|
$contents = file_get_contents('php://input');
|
||||||
|
|
||||||
// Append any PHP-input json
|
// Append any PHP-input json
|
||||||
@@ -311,7 +308,6 @@ class InputHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return (\count($filter) > 0) ? array_intersect_key($output, array_flip($filter)) : $output;
|
return (\count($filter) > 0) ? array_intersect_key($output, array_flip($filter)) : $output;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user