[Pkg-owncloud-commits] [owncloud] 77/78: Compatibility with recent Symfony

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 681bf85498196b4f90d54d955d9e853dae6153be
Author: David Prévot <taffit at debian.org>
Date:   Sat May 30 21:35:42 2015 -0400

    Compatibility with recent Symfony
    
    Git-Dch: Ignore
---
 ...lace-_method-requirement-by-g-s-etMethods.patch | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 47 insertions(+)

diff --git a/debian/patches/0010-Replace-_method-requirement-by-g-s-etMethods.patch b/debian/patches/0010-Replace-_method-requirement-by-g-s-etMethods.patch
new file mode 100644
index 0000000..8847aea
--- /dev/null
+++ b/debian/patches/0010-Replace-_method-requirement-by-g-s-etMethods.patch
@@ -0,0 +1,46 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Sun, 19 Apr 2015 12:00:58 -0400
+Subject: Replace `_method` requirement by {g,s}etMethods()
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+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
+
+Origin: upstream, https://github.com/owncloud/core/commit/7f2f92847be98bbf3a0a5ca8567fab001bb131c1
+---
+ lib/private/route/route.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/private/route/route.php b/lib/private/route/route.php
+index 87030ad..7e8a169 100644
+--- a/lib/private/route/route.php
++++ b/lib/private/route/route.php
+@@ -19,7 +19,7 @@ class Route extends SymfonyRoute implements IRoute {
+ 	 * @return \OC\Route\Route
+ 	 */
+ 	public function method($method) {
+-		$this->setRequirement('_method', strtoupper($method));
++		$this->setMethods($method);
+ 		return $this;
+ 	}
+ 
+@@ -91,7 +91,7 @@ class Route extends SymfonyRoute implements IRoute {
+ 	 * @return \OC\Route\Route
+ 	 */
+ 	public function requirements($requirements) {
+-		$method = $this->getRequirement('_method');
++		$method = $this->getMethods();
+ 		$this->setRequirements($requirements);
+ 		if (isset($requirements['_method'])) {
+ 			$method = $requirements['_method'];
diff --git a/debian/patches/series b/debian/patches/series
index 230b514..708b59e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ path/0006-Adapt-Crypt_Blowfish-path.patch
 path/0007-Adapt-aws-sdk-path.patch
 path/0008-Adapt-google-api-php-client-path.patch
 path/0009-Adapt-Dropbox-path.patch
+0010-Replace-_method-requirement-by-g-s-etMethods.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git