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

Commit 2506539

Browse files
committed
Merge pull request #23 from symfony-cmf/phpunit-prophecy
Use built-in PHPunit prophecy support
2 parents 438a686 + 7570a63 commit 2506539

File tree

8 files changed

+9
-14
lines changed

8 files changed

+9
-14
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ matrix:
3232
- env: SYMFONY_VERSION=3.0.*
3333
fast_finish: true
3434

35-
before_install: composer self-update
35+
before_install:
36+
- composer self-update
37+
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
3638

3739
install: composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist
3840

Tests/Unit/Enhancer/SonataAdminEnhancerTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
namespace Unit\Enhancer;
1313

1414
use Symfony\Cmf\Bundle\ResourceRestBundle\Enhancer\SonataAdminEnhancer;
15-
use Prophecy\PhpUnit\ProphecyTestCase;
1615

17-
class SonataAdminEnhancerTest extends ProphecyTestCase
16+
class SonataAdminEnhancerTest extends \PHPUnit_Framework_TestCase
1817
{
1918
private $enhancer;
2019
private $pool;

Tests/Unit/Registry/EnhancerRegistryTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111

1212
namespace Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Registry;
1313

14-
use Prophecy\PhpUnit\ProphecyTestCase;
1514
use Symfony\Cmf\Bundle\ResourceRestBundle\Registry\EnhancerRegistry;
1615

17-
class EnhancerRegistryTest extends ProphecyTestCase
16+
class EnhancerRegistryTest extends \PHPUnit_Framework_TestCase
1817
{
1918
private $registry;
2019

Tests/Unit/Registry/PayloadAliasRegistryTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111

1212
namespace Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Registry;
1313

14-
use Prophecy\PhpUnit\ProphecyTestCase;
1514
use Symfony\Cmf\Bundle\ResourceRestBundle\Registry\PayloadAliasRegistry;
1615

17-
class PayloadAliasRegistryTest extends ProphecyTestCase
16+
class PayloadAliasRegistryTest extends \PHPUnit_Framework_TestCase
1817
{
1918
private $registry;
2019

Tests/Unit/Serializer/Jms/EventSubscriber/PhpcrNodeSubscriberTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111

1212
namespace Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Serializer\Jms\EventSubscriber;
1313

14-
use Prophecy\PhpUnit\ProphecyTestCase;
1514
use Symfony\Cmf\Bundle\ResourceRestBundle\Serializer\Jms\EventSubscriber\PhpcrNodeSubscriber;
1615

17-
class PhpcrNodeSubscriberTest extends ProphecyTestCase
16+
class PhpcrNodeSubscriberTest extends \PHPUnit_Framework_TestCase
1817
{
1918
private $node;
2019
private $event;

Tests/Unit/Serializer/Jms/Handler/PhpcrNodeHandlerTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111

1212
namespace Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Serializer\Handler;
1313

14-
use Prophecy\PhpUnit\ProphecyTestCase;
1514
use Symfony\Cmf\Bundle\ResourceRestBundle\Serializer\Jms\Handler\PhpcrNodeHandler;
1615

17-
class PhpcrNodeHandlerTest extends ProphecyTestCase
16+
class PhpcrNodeHandlerTest extends \PHPUnit_Framework_TestCase
1817
{
1918
private $handler;
2019
private $property1;

Tests/Unit/Serializer/Jms/Handler/ResourceHandlerTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@
1111

1212
namespace Symfony\Cmf\Bundle\ResourceRestBundle\Tests\Serializer\Handler;
1313

14-
use Prophecy\PhpUnit\ProphecyTestCase;
1514
use Symfony\Cmf\Bundle\ResourceRestBundle\Serializer\Jms\Handler\ResourceHandler;
1615
use Prophecy\Argument;
1716

18-
class ResourceHandlerTest extends ProphecyTestCase
17+
class ResourceHandlerTest extends \PHPUnit_Framework_TestCase
1918
{
2019
public function setUp()
2120
{

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
},
1919
"require-dev": {
2020
"symfony-cmf/testing": "^1.3",
21-
"phpspec/prophecy-phpunit": "1.*",
2221
"doctrine/phpcr-odm": "^1.3",
2322
"behat/behat": "^3.0",
2423
"behat/web-api-extension" : "1.*",

0 commit comments

Comments
 (0)