mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace `_method` requirement by {g,s}etMethods() 

Make the call compatible with future Symfony version, and avoid
E_USER_DEPRECATED as thrown by the current 2.7.0-beta1:

The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use getMethods() instead. at
…/Symfony/Component/Routing/Route.php#554

The "_method" requirement is deprecated since version 2.2 and will be
removed in 3.0. Use the setMethods() method instead or the "methods"
option in the route definition. at
…/Symfony/Component/Routing/Route.php#662
This commit is contained in:
David Prévot 2015-04-19 12:00:58 -04:00
parent d877c1f1e1
commit 7f2f92847b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/route/route.php
View File

@ -37,7 +37,7 @@ class Route extends SymfonyRoute implements IRoute {
* @return \OC\Route\Route * @return \OC\Route\Route
*/ */
public function method($method) { public function method($method) {
$this->setRequirement('_method', strtoupper($method)); $this->setMethods($method);
return $this; return $this;
} }
@ -109,7 +109,7 @@ class Route extends SymfonyRoute implements IRoute {
* @return \OC\Route\Route * @return \OC\Route\Route
*/ */
public function requirements($requirements) { public function requirements($requirements) {
$method = $this->getRequirement('_method'); $method = $this->getMethods();
$this->setRequirements($requirements); $this->setRequirements($requirements);
if (isset($requirements['_method'])) { if (isset($requirements['_method'])) {
$method = $requirements['_method']; $method = $requirements['_method'];