From 6076c30688d4a4ffc55d00d20b2f4a07e5d6f241 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 29 Nov 2019 08:09:36 +0100 Subject: [PATCH 1/6] Remove support for Symfony 5 --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index eff8cf4..720fe3b 100644 --- a/composer.json +++ b/composer.json @@ -33,18 +33,18 @@ ], "require": { "php": "^7.1", - "symfony/doctrine-bridge": "^3.4|^4.0|^5.0", + "symfony/doctrine-bridge": "^3.4|^4.0", "doctrine/inflector": "^1.0", "doctrine/cache": "^1.4.2" }, "require-dev": { "phpunit/phpunit": "^7.0", - "symfony/phpunit-bridge": "^3.4|^4.0|^5.0", - "symfony/yaml": "^3.4|^4.0|^5.0", - "symfony/validator": "^3.4|^4.0|^5.0", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/framework-bundle": "^3.4|^4.0|^5.0", + "symfony/phpunit-bridge": "^3.4|^4.0", + "symfony/yaml": "^3.4|^4.0", + "symfony/validator": "^3.4|^4.0", + "symfony/console": "^3.4|^4.0", + "symfony/finder": "^3.4|^4.0", + "symfony/framework-bundle": "^3.4|^4.0", "symfony/security-acl": "^2.8", "instaclick/coding-standard": "~1.1", "satooshi/php-coveralls": "^1.0", From bdaaa0fc27e5bd1acff19f4de221d2b68f17b849 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 29 Nov 2019 08:14:10 +0100 Subject: [PATCH 2/6] Set root node as deprecated --- DependencyInjection/Configuration.php | 1 + 1 file changed, 1 insertion(+) diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 21ed20d..34d30d7 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -110,6 +110,7 @@ public function getConfigTreeBuilder() }; $node + ->setDeprecated('DoctrineCacheBundle is deprecated and will not be available for Symfony 5. Please migrate your caches to symfony/cache and remove the doctrine_cache key from your configuration.') ->children() ->arrayNode('acl_cache') ->beforeNormalization() From 1e87cf49cfe979c91477d8c72272079dbe97cec8 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 29 Nov 2019 08:14:36 +0100 Subject: [PATCH 3/6] Test on PHP 7.4 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f5e7199..4b874bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4snapshot - nightly matrix: From 5287523856a69733102da4582972b172692abd52 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 29 Nov 2019 08:14:41 +0100 Subject: [PATCH 4/6] Prevent build from failing due to deprecations --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4b874bc..440fa6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,10 @@ php: - 7.4snapshot - nightly +env: + global: + - SYMFONY_DEPRECATIONS_HELPER=weak + matrix: allow_failures: - php: nightly From e8a9498b693798b3fa33798362b74cfb531ca7c4 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 29 Nov 2019 09:17:59 +0100 Subject: [PATCH 5/6] Remove installation instructions from readme --- README.md | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/README.md b/README.md index a3b5a3e..8443b41 100644 --- a/README.md +++ b/README.md @@ -15,27 +15,3 @@ using Symfony, we no longer recommend configuring doctrine/cache through this bundle. Instead, you should use symfony/cache for your cache needs. However, the deprecation does not extend to doctrine/cache, you'll be able to use those classes as you did so far. - -## Installation - -1. Add this bundle to your project as a composer dependency: - - ```bash - composer require doctrine/doctrine-cache-bundle - ``` - -2. Add this bundle in your application kernel: - - ```php - // app/AppKernel.php - public function registerBundles() - { - // ... - $bundles[] = new \Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(); - - return $bundles; - } - ``` - -Read the [documentation](https://www.doctrine-project.org/projects/doctrine-cache-bundle/en/stable/usage.html) to learn how to configure and -use your own cache providers. From bd2e374909e5a5cbdc379c43ea60cebe292a8422 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 29 Nov 2019 10:15:14 +0100 Subject: [PATCH 6/6] Remove nightly from build matrix --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 440fa6d..5c48aac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,16 +7,12 @@ php: - 7.2 - 7.3 - 7.4snapshot - - nightly env: global: - SYMFONY_DEPRECATIONS_HELPER=weak matrix: - allow_failures: - - php: nightly - cache: directories: - $HOME/.composer/cache