From 4b611015d58c921439b53db6edee797aa6cb004f Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 23 Jul 2020 14:17:19 +0200 Subject: [PATCH 1/3] [DoctrineBridge] Bump doctrine/data-fixtures. --- composer.json | 2 +- src/Symfony/Bridge/Doctrine/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9ad5e39ad2ca5..5bc6183823adb 100644 --- a/composer.json +++ b/composer.json @@ -90,7 +90,7 @@ "cache/integration-tests": "dev-master", "doctrine/annotations": "~1.0", "doctrine/cache": "~1.6", - "doctrine/data-fixtures": "1.0.*", + "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "~2.4", "doctrine/orm": "~2.4,>=2.4.5", "doctrine/doctrine-bundle": "~1.4", diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 1aa2315c609cb..d33ea16ea6920 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -34,7 +34,7 @@ "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/validator": "^3.2.5|~4.0", "symfony/translation": "~2.8|~3.0|~4.0", - "doctrine/data-fixtures": "1.0.*", + "doctrine/data-fixtures": "^1.1", "doctrine/dbal": "~2.4", "doctrine/orm": "^2.4.5" }, From f524c8516183bba400daed42c52023af8a693ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Thu, 23 Jul 2020 14:42:41 +0200 Subject: [PATCH 2/3] Fix Redis tests --- .../Cache/Tests/Adapter/AbstractRedisAdapterTest.php | 7 ++++--- .../Cache/Tests/Simple/AbstractRedisCacheTest.php | 7 ++++--- .../Component/Lock/Tests/Store/RedisArrayStoreTest.php | 7 ++++--- src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php index d1fa9535cf5ca..0e8ed00128587 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php @@ -33,9 +33,10 @@ public static function setUpBeforeClass() if (!\extension_loaded('redis')) { self::markTestSkipped('Extension redis required.'); } - if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) { - $e = error_get_last(); - self::markTestSkipped($e['message']); + try { + (new \Redis())->connect(getenv('REDIS_HOST')); + } catch (\Exception $e) { + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php index e6d10284e50c0..7a6cabe8c760a 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php @@ -33,9 +33,10 @@ public static function setUpBeforeClass() if (!\extension_loaded('redis')) { self::markTestSkipped('Extension redis required.'); } - if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) { - $e = error_get_last(); - self::markTestSkipped($e['message']); + try { + (new \Redis())->connect(getenv('REDIS_HOST')); + } catch (\Exception $e) { + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php index 6f50dcefa61e2..a15c02f7d5be9 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php @@ -23,9 +23,10 @@ public static function setUpBeforeClass() if (!class_exists('RedisArray')) { self::markTestSkipped('The RedisArray class is required.'); } - if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) { - $e = error_get_last(); - self::markTestSkipped($e['message']); + try { + (new \Redis())->connect(getenv('REDIS_HOST')); + } catch (\Exception $e) { + self::markTestSkipped($e->getMessage()); } } diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php index fd35ab4f2f661..a7a3cbfb47961 100644 --- a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php @@ -20,9 +20,10 @@ class RedisStoreTest extends AbstractRedisStoreTest { public static function setUpBeforeClass() { - if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) { - $e = error_get_last(); - self::markTestSkipped($e['message']); + try { + (new \Redis())->connect(getenv('REDIS_HOST')); + } catch (\Exception $e) { + self::markTestSkipped($e->getMessage()); } } From cd22fe6c9284b20562615ff3fd19c9396425003c Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 23 Jul 2020 14:17:19 +0200 Subject: [PATCH 3/3] Allow doctrine/persistence 2 --- composer.json | 2 +- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Component/Messenger/composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index dd79bf3cde60d..2af8cf7bd309d 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "php": ">=7.1.3", "ext-xml": "*", "doctrine/event-manager": "~1.0", - "doctrine/persistence": "^1.3", + "doctrine/persistence": "^1.3|^2", "twig/twig": "^1.41|^2.10|^3.0", "psr/cache": "~1.0", "psr/container": "^1.0", diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 1ff362e8da26b..4194aa20375f8 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=7.1.3", "doctrine/event-manager": "~1.0", - "doctrine/persistence": "^1.3", + "doctrine/persistence": "^1.3|^2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^1.1|^2" diff --git a/src/Symfony/Component/Messenger/composer.json b/src/Symfony/Component/Messenger/composer.json index 3537c7d3179d8..877049a95de69 100644 --- a/src/Symfony/Component/Messenger/composer.json +++ b/src/Symfony/Component/Messenger/composer.json @@ -22,7 +22,7 @@ }, "require-dev": { "doctrine/dbal": "^2.6|^3.0", - "doctrine/persistence": "^1.3", + "doctrine/persistence": "^1.3|^2", "psr/cache": "~1.0", "symfony/console": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4.19|^4.1.8|^5.0",