Skip to content
This repository was archived by the owner on Oct 29, 2020. It is now read-only.

Commit 6bee2f9

Browse files
authored
Merge pull request #161 from alcaeus/deprecate-project
Mark root configuration node as deprecated
2 parents 2c0a226 + bd2e374 commit 6bee2f9

File tree

4 files changed

+13
-35
lines changed

4 files changed

+13
-35
lines changed

.travis.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ php:
66
- 7.1
77
- 7.2
88
- 7.3
9-
- nightly
9+
- 7.4snapshot
1010

11-
matrix:
12-
allow_failures:
13-
- php: nightly
11+
env:
12+
global:
13+
- SYMFONY_DEPRECATIONS_HELPER=weak
1414

15+
matrix:
1516
cache:
1617
directories:
1718
- $HOME/.composer/cache

DependencyInjection/Configuration.php

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ public function getConfigTreeBuilder()
110110
};
111111

112112
$node
113+
->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.')
113114
->children()
114115
->arrayNode('acl_cache')
115116
->beforeNormalization()

README.md

-24
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,3 @@ using Symfony, we no longer recommend configuring doctrine/cache through this
1515
bundle. Instead, you should use symfony/cache for your cache needs. However, the
1616
deprecation does not extend to doctrine/cache, you'll be able to use those
1717
classes as you did so far.
18-
19-
## Installation
20-
21-
1. Add this bundle to your project as a composer dependency:
22-
23-
```bash
24-
composer require doctrine/doctrine-cache-bundle
25-
```
26-
27-
2. Add this bundle in your application kernel:
28-
29-
```php
30-
// app/AppKernel.php
31-
public function registerBundles()
32-
{
33-
// ...
34-
$bundles[] = new \Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle();
35-
36-
return $bundles;
37-
}
38-
```
39-
40-
Read the [documentation](https://www.doctrine-project.org/projects/doctrine-cache-bundle/en/stable/usage.html) to learn how to configure and
41-
use your own cache providers.

composer.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@
3333
],
3434
"require": {
3535
"php": "^7.1",
36-
"symfony/doctrine-bridge": "^3.4|^4.0|^5.0",
36+
"symfony/doctrine-bridge": "^3.4|^4.0",
3737
"doctrine/inflector": "^1.0",
3838
"doctrine/cache": "^1.4.2"
3939
},
4040
"require-dev": {
4141
"phpunit/phpunit": "^7.0",
42-
"symfony/phpunit-bridge": "^3.4|^4.0|^5.0",
43-
"symfony/yaml": "^3.4|^4.0|^5.0",
44-
"symfony/validator": "^3.4|^4.0|^5.0",
45-
"symfony/console": "^3.4|^4.0|^5.0",
46-
"symfony/finder": "^3.4|^4.0|^5.0",
47-
"symfony/framework-bundle": "^3.4|^4.0|^5.0",
42+
"symfony/phpunit-bridge": "^3.4|^4.0",
43+
"symfony/yaml": "^3.4|^4.0",
44+
"symfony/validator": "^3.4|^4.0",
45+
"symfony/console": "^3.4|^4.0",
46+
"symfony/finder": "^3.4|^4.0",
47+
"symfony/framework-bundle": "^3.4|^4.0",
4848
"symfony/security-acl": "^2.8",
4949
"instaclick/coding-standard": "~1.1",
5050
"satooshi/php-coveralls": "^1.0",

0 commit comments

Comments
 (0)