From ff8cf6947979c504c8a36fcb134b35c3f6ae2b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 18 Aug 2020 20:40:28 +0200 Subject: [PATCH 1/3] Address deprecation of Definition::setPrivate() Services are private by default since symfony/dependency-injection 4.0, which means the deprecated call can safely be dropped. --- DependencyInjection/DoctrineExtension.php | 1 - 1 file changed, 1 deletion(-) diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php index 223eaa4d3..c4c02ed73 100644 --- a/DependencyInjection/DoctrineExtension.php +++ b/DependencyInjection/DoctrineExtension.php @@ -850,7 +850,6 @@ private function createPoolCacheDefinition(ContainerBuilder $container, string $ $definition = $container->register($serviceId, DoctrineProvider::class); $definition->addArgument(new Reference($poolName)); - $definition->setPrivate(true); return $serviceId; } From 768dc148b1828bb6bb662b39daa1e38072f38192 Mon Sep 17 00:00:00 2001 From: "matthias.schobner" Date: Thu, 22 Oct 2020 11:31:46 +0200 Subject: [PATCH 2/3] Allow twig ^3.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d44a7e0c4..05673b7a1 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "symfony/validator": "^3.4.30|^4.3.3|^5.0", "symfony/web-profiler-bundle": "^3.4.30|^4.3.3|^5.0", "symfony/yaml": "^3.4.30|^4.3.3|^5.0", - "twig/twig": "^1.34|^2.12" + "twig/twig": "^1.34|^2.12|^3.0" }, "config": { "sort-packages": true From 57f2a924c084a3718c1bd71b33964911436a6cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Fri, 23 Oct 2020 11:49:40 +0200 Subject: [PATCH 3/3] Make tests compatible with symfony/http-kernel 5.2 --- .travis.yml | 8 ++++---- Tests/CacheSchemaSubscriberTest.php | 1 + Tests/ServiceRepositoryTest.php | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index da7d831e4..889f54972 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,15 +52,15 @@ jobs: - composer require --dev symfony/messenger --no-update - travis_retry composer update -n --prefer-dist - # Test against latest Symfony 5.0 dev - - php: 7.3 - env: SYMFONY_REQUIRE="5.0.*" + # Test against latest Symfony 5.2 dev + - php: 7.4 + env: SYMFONY_REQUIRE="5.2.*" install: - composer require --dev symfony/messenger --no-update - travis_retry composer update -n --prefer-dist # Test dev versions - - php: 7.3 + - php: 7.4 if: type = cron env: DEV install: diff --git a/Tests/CacheSchemaSubscriberTest.php b/Tests/CacheSchemaSubscriberTest.php index 9d7248a0d..d2f81e0f6 100644 --- a/Tests/CacheSchemaSubscriberTest.php +++ b/Tests/CacheSchemaSubscriberTest.php @@ -30,6 +30,7 @@ public function testSchemaSubscriberWiring() : void 'kernel.bundles' => [], 'kernel.cache_dir' => sys_get_temp_dir(), 'kernel.environment' => 'test', + 'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%', 'kernel.root_dir' => __DIR__ . '/../../../../', // src dir 'kernel.project_dir' => __DIR__ . '/../../../../', // src dir 'kernel.bundles_metadata' => [], diff --git a/Tests/ServiceRepositoryTest.php b/Tests/ServiceRepositoryTest.php index b7e67ccec..28db870d3 100644 --- a/Tests/ServiceRepositoryTest.php +++ b/Tests/ServiceRepositoryTest.php @@ -43,6 +43,7 @@ public function testRepositoryServiceWiring() : void 'kernel.bundles' => ['RepositoryServiceBundle' => RepositoryServiceBundle::class], 'kernel.cache_dir' => sys_get_temp_dir(), 'kernel.environment' => 'test', + 'kernel.runtime_environment' => '%%env(default:kernel.environment:APP_RUNTIME_ENV)%%', 'kernel.root_dir' => __DIR__ . '/../../../../', // src dir 'kernel.project_dir' => __DIR__ . '/../../../../', // src dir 'kernel.bundles_metadata' => [],