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

Commit 5af0bd2

Browse files
committed
Merge pull request #164 from symfony-cmf/php_7
Support PHP 7
2 parents e977f7f + 6a3249d commit 5af0bd2

File tree

7 files changed

+21
-22
lines changed

7 files changed

+21
-22
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@ env:
1919

2020
matrix:
2121
include:
22+
- php: 5.3
23+
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
2224
- php: 5.6
2325
env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
2426
- php: 5.6
2527
env: SYMFONY_VERSION=2.8.*
2628
- php: 5.6
2729
env: SYMFONY_VERSION=3.0.*
28-
- php: 5.3
29-
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
3030
allow_failures:
31-
- php: 7.0
3231
- env: SYMFONY_VERSION=2.8.*
3332
- env: SYMFONY_VERSION=3.0.*
3433
fast_finish: true

Tests/Resources/Document/AbstractContent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class AbstractContent
3333
public $routes;
3434

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

Tests/Resources/Document/Article.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Article
3333
public $routes;
3434

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

@@ -43,7 +43,7 @@ class Article
4343
public $locale;
4444

4545
/**
46-
* @PHPCR\Date(nullable=true)
46+
* @PHPCR\Field(type="date", nullable=true)
4747
*/
4848
public $date;
4949

Tests/Resources/Document/Blog.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Blog
3535
public $routes;
3636

3737
/**
38-
* @PHPCR\String()
38+
* @PHPCR\Field(type="string")
3939
*/
4040
public $title;
4141

Tests/Resources/Document/Post.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ class Post
4545
public $name;
4646

4747
/**
48-
* @PHPCR\String()
48+
* @PHPCR\Field(type="string")
4949
*/
5050
public $title;
5151

5252
/**
53-
* @PHPCR\String(nullable=true)
53+
* @PHPCR\Field(type="string", nullable=true)
5454
*/
5555
public $body;
5656

5757
/**
58-
* @PHPCR\Date(nullable=true)
58+
* @PHPCR\Field(type="date", nullable=true)
5959
*/
6060
public $date;
6161

Tests/Resources/Document/SeoArticle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ class SeoArticle
3333
public $routes;
3434

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

4040
/**
41-
* @PHPCR\Date(nullable=true)
41+
* @PHPCR\Field(type="date", nullable=true)
4242
*/
4343
public $date;
4444

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@
1313
"prefer-stable": true,
1414
"require": {
1515
"php": ">=5.3.9",
16-
"symfony-cmf/routing-auto": "~1.1",
17-
"symfony-cmf/routing-bundle": "~1.2,>=1.2.0",
18-
"symfony-cmf/core-bundle": "~1.2",
16+
"symfony-cmf/routing-auto": "^1.1",
17+
"symfony-cmf/routing-bundle": "^1.2.0",
18+
"symfony-cmf/core-bundle": "^1.2",
1919
"aferrandini/urlizer": "1.0.*",
20-
"symfony/config": "~2.2",
20+
"symfony/config": "^2.2",
2121
"jms/metadata": "1.5.*"
2222
},
2323
"require-dev": {
24-
"symfony-cmf/testing": "~1.3",
25-
"symfony/yaml": "~2.1",
24+
"symfony-cmf/testing": "^1.3",
25+
"symfony/yaml": "^2.1",
2626
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2727
"matthiasnoback/symfony-config-test": "0.*",
28-
"doctrine/phpcr-odm": "~1.2",
29-
"phpunit/phpunit": "~4.5",
30-
"symfony/phpunit-bridge": "2.7.x@beta"
28+
"doctrine/phpcr-odm": "^1.3",
29+
"phpunit/phpunit": "^4.5",
30+
"symfony/phpunit-bridge": "^2.7"
3131
},
3232
"suggest": {
3333
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",
3434
"doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents",
35-
"symfony/yaml": "To be able to load Yaml configuration files"
35+
"symfony/yaml": "To be able to load Yaml configuration files (^2.1)"
3636
},
3737
"autoload": {
3838
"psr-4": {

0 commit comments

Comments
 (0)