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

Commit 76c2243

Browse files
committed
Merge pull request #162 from symfony-cmf/fix-tests
Fix tests
2 parents f5cabd8 + 0960431 commit 76c2243

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ matrix:
2828
- php: 5.3
2929
env: SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
3030
allow_failures:
31-
- php: nightly
31+
- php: 7.0
3232
- env: SYMFONY_VERSION=2.8.*
3333
- env: SYMFONY_VERSION=3.0.*
3434
fast_finish: true

Tests/Resources/Document/Post.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Post
4040
public $blog;
4141

4242
/**
43-
* @PHPCR\NodeName()
43+
* @PHPCR\Nodename()
4444
*/
4545
public $name;
4646

Tests/Resources/app/config/routing_auto.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Post:
88
conflict_resolver: [auto_increment, { }]
99
token_providers:
1010
blog_title: [content_method, { method: getBlogTitle } ]
11-
post_date: [content_datetime, { method: getDate, date_format: Y/m/d, slugify: false } ]
11+
post_date: [content_datetime, { method: getDate, date_format: Y/m/d } ]
1212
post_title: [content_method, { method: getTitle } ]
1313

1414
Symfony\Cmf\Bundle\RoutingAutoBundle\Tests\Resources\Document\Article:

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
}
1111
],
1212
"minimum-stability": "dev",
13+
"prefer-stable": true,
1314
"require": {
1415
"php": ">=5.3.9",
1516
"symfony-cmf/routing-auto": "~1.1",
@@ -20,7 +21,7 @@
2021
"jms/metadata": "1.5.*"
2122
},
2223
"require-dev": {
23-
"symfony-cmf/testing": "~1.2,>=1.2.7",
24+
"symfony-cmf/testing": "~1.3",
2425
"symfony/yaml": "~2.1",
2526
"matthiasnoback/symfony-dependency-injection-test": "~0.6",
2627
"matthiasnoback/symfony-config-test": "0.*",

0 commit comments

Comments
 (0)