Skip to content

Commit 9ed9bfa

Browse files
committed
Merge pull request #106 from symfony-cmf/drop_2_2
drop Symfony 2.2 support
2 parents d62bbd8 + a1239a9 commit 9ed9bfa

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ php:
66
- 5.5
77

88
env:
9-
- SYMFONY_VERSION=2.2.*
109
- SYMFONY_VERSION=2.3.*
1110
- SYMFONY_VERSION=2.4.*
1211
- SYMFONY_VERSION=dev-master

CHANGELOG.md

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

4+
1.1.0-RC2
5+
---------
6+
7+
* **2014-04-11**: drop Symfony 2.2 compatibility
8+
49
1.1.0-RC1
510
---------
611

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ trades away some of that flexibility in favor of simplicity.
1717

1818
## Requirements
1919

20-
* Symfony 2.2.x
20+
* Symfony 2.3+
2121
* See also the `require` section of [composer.json](composer.json)
2222

2323

Tests/Unit/DependencyInjection/CmfSimpleCmsExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public function testLoadDefault()
3737
),
3838
));
3939

40-
$this->assertContainerBuilderHasService('cmf_simple_cms.initializer', '%cmf_simple_cms.initializer.class%');
41-
$this->assertContainerBuilderHasService('cmf_simple_cms.persistence.phpcr.migrator.page', '%cmf_simple_cms.persistence.phpcr.migrator_page.class%');
40+
$this->assertContainerBuilderHasService('cmf_simple_cms.initializer', 'Symfony\Cmf\Bundle\SimpleCmsBundle\Initializer\HomepageInitializer');
41+
$this->assertContainerBuilderHasService('cmf_simple_cms.persistence.phpcr.migrator.page', 'Symfony\Cmf\Bundle\SimpleCmsBundle\Migrator\Phpcr\Page');
4242
$this->assertContainerBuilderHasServiceDefinitionWithMethodCall('cmf_simple_cms.persistence.phpcr.menu_provider', 'setManagerName', array(
4343
'%cmf_simple_cms.persistence.phpcr.manager_name%',
4444
));
45-
$this->assertContainerBuilderHasService('cmf_simple_cms.persistence.phpcr.admin.page', '%cmf_simple_cms.persistence.phpcr.admin.page.class%');
45+
$this->assertContainerBuilderHasService('cmf_simple_cms.persistence.phpcr.admin.page', 'Symfony\Cmf\Bundle\SimpleCmsBundle\Admin\PageAdmin');
4646
}
4747

4848
public function testLoadMinimal()

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"minimum-stability": "dev",
1515
"require": {
1616
"php": ">=5.3.3",
17-
"symfony/framework-bundle": "~2.2",
17+
"symfony/framework-bundle": "~2.3",
1818
"symfony-cmf/core-bundle": ">=1.1.0,<1.2-dev",
1919
"symfony-cmf/routing-bundle": "1.2.*",
2020
"symfony-cmf/menu-bundle": ">=1.0.0,<1.2-dev",
@@ -27,7 +27,7 @@
2727
"matthiasnoback/symfony-dependency-injection-test": "0.*",
2828
"matthiasnoback/symfony-config-test": "0.*",
2929
"sonata-project/doctrine-phpcr-admin-bundle": ">=1.0.0,<1.2-dev",
30-
"symfony/monolog-bundle": "~2.2"
30+
"symfony/monolog-bundle": "~2.3"
3131
},
3232
"suggest": {
3333
"symfony-cmf/create-bundle": "1.1.*",

0 commit comments

Comments
 (0)