Skip to content

Commit 17577b0

Browse files
committed
fix issues with PHP7 due to use of String annotation class
1 parent 6873b6c commit 17577b0

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ matrix:
3434
env: SYMFONY_VERSION=2.8.*
3535
- php: 5.6
3636
env: SYMFONY_VERSION=3.0.*@dev
37-
- php: nightly
3837

3938
before_install:
4039
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi

Tests/Resources/Document/Content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Content
3434
private $name;
3535

3636
/**
37-
* @PHPCRODM\String
37+
* @PHPCRODM\Field(type="string")
3838
*/
3939
private $title;
4040

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"require-dev": {
2222
"symfony-cmf/core-bundle": "~1.1",
23-
"symfony-cmf/testing": "~1.2,>=1.2.6",
23+
"symfony-cmf/testing": "dev-phpcr_odm_1_3 as 1.3.0",
2424
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2525
"matthiasnoback/symfony-config-test": "0.*",
2626
"phpunit/php-code-coverage": "@stable",

0 commit comments

Comments
 (0)