Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 9c1f85e

Browse files
committed
Merge pull request #233 from symfony-cmf/php_7
Added support for PHP 7
2 parents 94c9460 + 6fe1c08 commit 9c1f85e

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

Tests/Resources/Document/Content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Content implements MenuNodeReferrersInterface, RouteReferrersReadInterface
3333
protected $id;
3434

3535
/**
36-
* @PHPCR\String()
36+
* @PHPCR\Field(type="string")
3737
*/
3838
protected $title;
3939

composer.json

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,29 @@
1212
}
1313
],
1414
"minimum-stability": "dev",
15-
"prefer-stable": false,
15+
"prefer-stable": true,
1616
"require": {
1717
"php": ">=5.3.9",
18-
"symfony/framework-bundle": "~2.3",
19-
"doctrine/phpcr-bundle": "~1.1",
20-
"doctrine/phpcr-odm": "~1.1",
21-
"knplabs/knp-menu-bundle": "~2.0,>=2.0.0@stable",
22-
"knplabs/knp-menu": "~2.0,>=2.0.0@stable",
23-
"symfony-cmf/core-bundle": "~1.1,>=1.1.0-RC3"
18+
"symfony/framework-bundle": "^2.3",
19+
"symfony-cmf/core-bundle": "^1.1.0-RC3",
20+
"doctrine/phpcr-bundle": "^1.1",
21+
"doctrine/phpcr-odm": "^1.1",
22+
"knplabs/knp-menu-bundle": "^2.0.0",
23+
"knplabs/knp-menu": "^2.0.0"
2424
},
2525
"require-dev": {
26-
"twig/twig": "~1.12,>=1.12.1",
27-
"symfony-cmf/routing-bundle": "~1.2,>=1.2.0-RC3",
28-
"symfony-cmf/testing": "~1.2,>=1.2.6",
29-
"sonata-project/doctrine-phpcr-admin-bundle": "~1.1",
30-
"symfony-cmf/tree-browser-bundle": ">=1.0.0-RC1",
31-
"sonata-project/block-bundle": ">=2.2.8",
32-
"sonata-project/core-bundle": ">=2.2.3",
33-
"symfony/monolog-bundle": "~2.3"
26+
"symfony/monolog-bundle": "^2.3",
27+
"symfony-cmf/routing-bundle": "^1.2.0-RC3",
28+
"symfony-cmf/testing": "^1.3",
29+
"symfony-cmf/tree-browser-bundle": "^1.0.0-RC1",
30+
"doctrine/phpcr-odm": "^1.3",
31+
"twig/twig": "^1.12.1",
32+
"sonata-project/doctrine-phpcr-admin-bundle": "^1.1",
33+
"sonata-project/block-bundle": "^2.2.8",
34+
"sonata-project/core-bundle": "^2.2.3"
3435
},
3536
"suggest": {
36-
"sonata-project/doctrine-phpcr-admin-bundle": "if you want to have editing capabilities",
37+
"sonata-project/doctrine-phpcr-admin-bundle": "if you want to have editing capabilities (^1.1)",
3738
"burgov/key-value-form-bundle": "if you want to edit the advanced options on the node with the menu options extension"
3839
},
3940
"autoload": {

0 commit comments

Comments
 (0)