Skip to content

Commit 803e40d

Browse files
committed
Remove deprecated features
1 parent 35a7174 commit 803e40d

File tree

4 files changed

+5
-134
lines changed

4 files changed

+5
-134
lines changed

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
Changelog
22
=========
33

4-
* **2016-06-21**: [BC BREAK] Dropped PHP <5.5 support.
5-
* **2016-06-21**: [BC BREAK] Dropped Symfony <2.8 support.
4+
* **2016-06-21**: [BC BREAK] Deleted the `sonata_admin` bundle set.
5+
* **2016-06-21**: [BC BREAK] Deleted the `LoadBaseData` data fixtures.
6+
* **2016-06-21**: [BC BREAK] Deleted the `Content` document.
7+
* **2016-06-21**: [BC BREAK] Dropped PHP <5.5 support.
8+
* **2016-06-21**: [BC BREAK] Dropped Symfony <2.8 support.
69

710
1.3.0
811
-----

src/DataFixtures/PHPCR/LoadBaseData.php

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/Document/Content.php

Lines changed: 0 additions & 89 deletions
This file was deleted.

src/HttpKernel/TestKernel.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ public function __construct($env, $debug)
6161
$baseSonataBundles[] = 'Sonata\jQueryBundle\SonatajQueryBundle';
6262
}
6363

64-
$this->registerBundleSet('sonata_admin', array_merge(array(
65-
'Sonata\DoctrinePHPCRAdminBundle\SonataDoctrinePHPCRAdminBundle',
66-
'Symfony\Cmf\Bundle\TreeBrowserBundle\CmfTreeBrowserBundle',
67-
), $baseSonataBundles));
68-
6964
$this->registerBundleSet('sonata_admin_orm', array_merge(array(
7065
'Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle',
7166
), $baseSonataBundles));
@@ -119,10 +114,6 @@ public function requireBundleSets(array $names)
119114
*/
120115
public function requireBundleSet($name)
121116
{
122-
if ('sonata_admin' === $name) {
123-
@trigger_error('The "sonata_admin" bundleset is deprecated since version 1.1 and will be removed in 2.0. Use the "sonata_admin_phpcr" bundleset instead.', E_USER_DEPRECATED);
124-
}
125-
126117
if (!isset($this->bundleSets[$name])) {
127118
throw new \InvalidArgumentException(sprintf(
128119
'Bundle set %s has not been registered, available bundle sets: %s',

0 commit comments

Comments
 (0)