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

Commit 7127c23

Browse files
committed
Merge pull request #20 from symfony-cmf/php_7
Added PHP 7 support
2 parents 498dd2b + d25ab46 commit 7127c23

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ matrix:
2828
- php: 5.6
2929
env: SYMFONY_VERSION=3.0.*
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/TestBundle/Document/Article.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ class Article
1515
public $id;
1616

1717
/**
18-
* @PHPCR\String()
18+
* @PHPCR\Field(type="string")
1919
*/
2020
public $title;
2121

2222
/**
23-
* @PHPCR\String()
23+
* @PHPCR\Field(type="string")
2424
*/
2525
public $body;
2626
}

Tests/Unit/Enhancer/SonataAdminEnhancerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function setUp()
2727
$this->visitor = $this->prophesize('JMS\Serializer\GenericSerializationVisitor');
2828
$this->generator = $this->prophesize('Symfony\Component\Routing\Generator\UrlGeneratorInterface');
2929
$this->payload = new \stdClass();
30-
$this->resource = $this->prophesize('Puli\Repository\Api\Resource\Resource');
30+
$this->resource = $this->prophesize('Symfony\Cmf\Component\Resource\Repository\Resource\CmfResource');
3131
$this->route1 = $this->prophesize('Symfony\Component\Routing\Route');
3232
$this->route2 = $this->prophesize('Symfony\Component\Routing\Route');
3333
$this->routeCollection = $this->prophesize('Sonata\AdminBundle\Route\RouteCollection');

composer.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,22 @@
1010
}
1111
],
1212
"minimum-stability": "dev",
13+
"prefer-stable": true,
1314
"require": {
1415
"php": ">=5.3.9",
1516
"symfony-cmf/resource-bundle": "~1.0",
1617
"jms/serializer-bundle": "~1.0"
1718
},
1819
"require-dev": {
19-
"symfony-cmf/testing": "~1.1",
20-
"phpspec/prophecy-phpunit": "~1.0.0",
21-
"behat/behat": "~3.0.0",
22-
"behat/web-api-extension" : "~1.0",
23-
"behat/symfony2-extension": "~2.0@dev",
24-
"matthiasnoback/symfony-dependency-injection-test": "0.*",
25-
"matthiasnoback/symfony-config-test": "0.*",
26-
"sonata-project/doctrine-phpcr-admin-bundle": "~1.2"
20+
"symfony-cmf/testing": "^1.3",
21+
"phpspec/prophecy-phpunit": "^1.0",
22+
"doctrine/phpcr-odm": "^1.3",
23+
"behat/behat": "^3.0",
24+
"behat/web-api-extension" : "^1.0",
25+
"behat/symfony2-extension": "^2.0@dev",
26+
"matthiasnoback/symfony-dependency-injection-test": "~0.1",
27+
"matthiasnoback/symfony-config-test": "~0.1",
28+
"sonata-project/doctrine-phpcr-admin-bundle": "^1.2"
2729
},
2830
"suggest": {
2931
"doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents",

0 commit comments

Comments
 (0)