diff options
Diffstat (limited to 'php-doctrine-orm-php73.patch')
| -rw-r--r-- | php-doctrine-orm-php73.patch | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/php-doctrine-orm-php73.patch b/php-doctrine-orm-php73.patch index a1543de..d0b3f2b 100644 --- a/php-doctrine-orm-php73.patch +++ b/php-doctrine-orm-php73.patch @@ -1,18 +1,17 @@ -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"? +From 07fc401d255a4cdb4a557147d1c8a3fc7a0c718d Mon Sep 17 00:00:00 2001 +From: Cyril PASCAL <cyril.pascal_github@m4x.org> +Date: Thu, 26 Jul 2018 14:32:52 +0200 +Subject: [PATCH] Make code php 7.3 lint-compatible --- 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 +index 6767e7ef31..c79afd084e 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()) +@@ -2715,7 +2715,7 @@ public function createEntity($className, array $data, &$hints = []) $class->reflFields[$field]->setValue($entity, $data[$field]); $this->originalEntityData[$oid][$field] = $data[$field]; @@ -20,8 +19,8 @@ index fcbd3ab942..93d6e956fe 100644 + break; } - $associatedId = array(); -@@ -2662,7 +2662,7 @@ public function createEntity($className, array $data, &$hints = array()) + $associatedId = []; +@@ -2744,7 +2744,7 @@ public function createEntity($className, array $data, &$hints = []) $class->reflFields[$field]->setValue($entity, null); $this->originalEntityData[$oid][$field] = null; |