summaryrefslogtreecommitdiffstats
path: root/php-doctrine-orm-php73.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-10-17 16:02:10 +0200
committerRemi Collet <remi@remirepo.net>2018-10-17 16:02:10 +0200
commit7a3ba4eb845cefedc54246244ece644b7f97822d (patch)
treeb317e4c9a59098eaaada3609546f0e6c8e4bea5b /php-doctrine-orm-php73.patch
parent0a0ea3a096cfdaccff353aea53387a39136a9cbf (diff)
update to 2.5.14
fix FTBFS from Koschei add patch for PHP 7.3 from https://github.com/doctrine/doctrine2/pull/7431 use range dependencies
Diffstat (limited to 'php-doctrine-orm-php73.patch')
-rw-r--r--php-doctrine-orm-php73.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/php-doctrine-orm-php73.patch b/php-doctrine-orm-php73.patch
new file mode 100644
index 0000000..a1543de
--- /dev/null
+++ b/php-doctrine-orm-php73.patch
@@ -0,0 +1,32 @@
+From 0ce35e5ac76db231cffa570ba4083dda7e706cfd Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 16 Oct 2018 12:24:02 +0200
+Subject: [PATCH] fix PHP 7.3 Warning: "continue" targeting switch is
+ equivalent to "break". Did you mean to use "continue 2"?
+
+---
+ lib/Doctrine/ORM/UnitOfWork.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php
+index fcbd3ab942..93d6e956fe 100644
+--- a/lib/Doctrine/ORM/UnitOfWork.php
++++ b/lib/Doctrine/ORM/UnitOfWork.php
+@@ -2633,7 +2633,7 @@ public function createEntity($className, array $data, &$hints = array())
+ $class->reflFields[$field]->setValue($entity, $data[$field]);
+ $this->originalEntityData[$oid][$field] = $data[$field];
+
+- continue;
++ break;
+ }
+
+ $associatedId = array();
+@@ -2662,7 +2662,7 @@ public function createEntity($className, array $data, &$hints = array())
+ $class->reflFields[$field]->setValue($entity, null);
+ $this->originalEntityData[$oid][$field] = null;
+
+- continue;
++ break;
+ }
+
+ if ( ! isset($hints['fetchMode'][$class->name][$field])) {