Skip to content

Commit

Permalink
Revert "Update to phpunit 5.x"
Browse files Browse the repository at this point in the history
This reverts commit c205fea.
  • Loading branch information
Spea committed Dec 17, 2016
1 parent 06028ea commit 1de9a64
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"require-dev": {
"symfony/yaml": "^2.2|^3.0",
"phpunit/phpunit": "~5.4",
"phpunit/phpunit": "~4.6",
"doctrine/data-fixtures": "~1.1",
"doctrine/orm": ">=2.2,<2.7-dev",
"doctrine/mongodb-odm": "^1.0.8"
Expand Down
6 changes: 3 additions & 3 deletions tests/Sp/FixtureDumper/Tests/DumperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ class DumperTest extends \PHPUnit_Framework_TestCase

protected function setUp()
{
$this->metadata = array($this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata'), $this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata'));
$this->manager = $this->createMock('Doctrine\Common\Persistence\ObjectManager');
$this->metadata = array($this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata'), $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata'));
$this->manager = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
$this->generator = $this->getMockBuilder('Sp\FixtureDumper\Generator\AbstractGenerator')->disableOriginalConstructor()->setMethods(array('generate', 'setNavigator'))->getMockForAbstractClass();
$this->handlerRegistry = $this->createMock('Sp\FixtureDumper\Converter\Handler\HandlerRegistryInterface');
$this->handlerRegistry = $this->getMock('Sp\FixtureDumper\Converter\Handler\HandlerRegistryInterface');
$this->dumper = $this->getMockForAbstractClass('Sp\FixtureDumper\AbstractDumper', array($this->manager, $this->handlerRegistry, new Map(array('php' => $this->generator))), '', true, true, true, array('writeFixture', 'getAllMetadata'));

$this->dumper->expects($this->once())->method('getAllMetadata')->will($this->returnValue($this->metadata));
Expand Down
16 changes: 8 additions & 8 deletions tests/Sp/FixtureDumper/Tests/Generator/AbstractGeneratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ protected function getOptions()

protected function setUp()
{
$this->namingStrategy = $this->createMock('Sp\FixtureDumper\Generator\NamingStrategyInterface');
$this->manager = $this->createMock('Doctrine\Common\Persistence\ObjectManager');
$this->metadata = $this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$this->repository = $this->createMock('Doctrine\Common\Persistence\ObjectRepository');
$this->namingStrategy = $this->getMock('Sp\FixtureDumper\Generator\NamingStrategyInterface');
$this->manager = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
$this->metadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$this->repository = $this->getMock('Doctrine\Common\Persistence\ObjectRepository');
$this->generator = $this->loadGenerator();
$this->handlerRegistry = new HandlerRegistry();
$this->handlerRegistry->addSubscribingHandler(new DateHandler());
Expand All @@ -99,7 +99,7 @@ public function testGetVisitorReturnsDefault()

public function testGetVisitorReturnsSet()
{
$visitor = $this->createMock('Sp\FixtureDumper\Converter\VisitorInterface');
$visitor = $this->getMock('Sp\FixtureDumper\Converter\VisitorInterface');
$this->generator->setVisitor($visitor);

$result = $this->generator->getVisitor();
Expand Down Expand Up @@ -131,7 +131,7 @@ public function testGenerate()
$fieldNames = array('description', 'title', 'created');
$associationNames = array('author');

$classMetadata = $this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$classMetadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$classMetadata->expects($this->any())->method('getName')->will($this->returnValue('Sp\FixtureDumper\Tests\Fixture\Post'));
$classMetadata->expects($this->any())->method('getFieldNames')->will($this->returnValue($fieldNames));
$classMetadata->expects($this->any())->method('isSingleValuedAssociation')->will($this->returnValue(true));
Expand All @@ -141,7 +141,7 @@ public function testGenerate()
return array('id' => $model->getId());
}));

$authorClassMetadata = $this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$authorClassMetadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$authorClassMetadata->expects($this->any())->method('getName')->will($this->returnValue('Sp\FixtureDumper\Tests\Generator\Fixture\Author'));
$authorClassMetadata->expects($this->any())->method('getIdentifierValues')->will($this->returnCallback(function($model) {
return array('id' => $model->getId());
Expand All @@ -166,7 +166,7 @@ public function testGenerateWithoutDependencies()

$fieldNames = array('username');

$classMetadata = $this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$classMetadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$classMetadata->expects($this->any())->method('getName')->will($this->returnValue('Sp\FixtureDumper\Tests\Fixture\Author'));
$classMetadata->expects($this->any())->method('getFieldNames')->will($this->returnValue($fieldNames));
$classMetadata->expects($this->any())->method('isSingleValuedAssociation')->will($this->returnValue(true));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function testFixtureName()
$model = new Post();
$model->setId(22);

$metadata = $this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$metadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$metadata->expects($this->once())->method('getName')->will($this->returnValue('Acme\Demo\Entity\Post'));

$result = $this->namingStrategy->fixtureName($metadata);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function testModelName()
$model = new Post();
$model->setId(22);

$metadata = $this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$metadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$metadata->expects($this->once())->method('getName')->will($this->returnValue('Acme\Demo\Entity\Post'));
$metadata->expects($this->once())->method('getIdentifierValues')->with($this->equalTo($model))->will($this->returnValue(array('id' => 22)));

Expand All @@ -49,7 +49,7 @@ public function testFixtureName()
$model = new Post();
$model->setId(22);

$metadata = $this->createMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$metadata = $this->getMock('Doctrine\Common\Persistence\Mapping\ClassMetadata');
$metadata->expects($this->once())->method('getName')->will($this->returnValue('Acme\Demo\Entity\Post'));

$result = $this->namingStrategy->fixtureName($metadata);
Expand Down

0 comments on commit 1de9a64

Please sign in to comment.