From cffb0f7164be6cdb900bc9cc48240f7f4305c031 Mon Sep 17 00:00:00 2001 From: Dominik Zogg Date: Tue, 24 Jun 2014 09:08:57 +0200 Subject: [PATCH 1/2] migrate to stable --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0654754..c798790 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": ">=5.3.3", - "pimple/pimple": "~2.1@dev", + "pimple/pimple": "~2.1", "doctrine/orm": "~2.3" }, "require-dev": { From 33441efb6017e0b543604551ded79a54aab09934 Mon Sep 17 00:00:00 2001 From: Dominik Zogg Date: Tue, 24 Jun 2014 09:10:27 +0200 Subject: [PATCH 2/2] remove silex test, cause it doesnt make any diffrent anymore --- composer.json | 3 - .../DoctrineormServiceProviderTest.php | 76 ------------------- 2 files changed, 79 deletions(-) delete mode 100644 tests/Dflydev/Tests/Silex/Provider/DoctrineOrm/DoctrineormServiceProviderTest.php diff --git a/composer.json b/composer.json index c798790..75d36c6 100644 --- a/composer.json +++ b/composer.json @@ -21,9 +21,6 @@ "pimple/pimple": "~2.1", "doctrine/orm": "~2.3" }, - "require-dev": { - "silex/silex": "dev-master@dev" - }, "autoload": { "psr-4": { "Dflydev\\Provider\\DoctrineOrm\\": "src/Dflydev/Provider/DoctrineOrm" diff --git a/tests/Dflydev/Tests/Silex/Provider/DoctrineOrm/DoctrineormServiceProviderTest.php b/tests/Dflydev/Tests/Silex/Provider/DoctrineOrm/DoctrineormServiceProviderTest.php deleted file mode 100644 index ea03bf0..0000000 --- a/tests/Dflydev/Tests/Silex/Provider/DoctrineOrm/DoctrineormServiceProviderTest.php +++ /dev/null @@ -1,76 +0,0 @@ - - */ -class DoctrineormServiceProviderTest extends \PHPUnit_Framework_TestCase -{ - protected function createMockDefaultAppAndDeps() - { - $app = new Application; - - $eventManager = $this->getMock('Doctrine\Common\EventManager'); - $connection = $this - ->getMockBuilder('Doctrine\DBAL\Connection') - ->disableOriginalConstructor() - ->getMock(); - - $connection - ->expects($this->any()) - ->method('getEventManager') - ->will($this->returnValue($eventManager)); - - $app['dbs'] = new Container(array( - 'default' => $connection, - )); - - $app['dbs.event_manager'] = new Container(array( - 'default' => $eventManager, - )); - - return array($app, $connection, $eventManager);; - } - - /** - * @return Container - */ - protected function createMockDefaultApp() - { - list ($app, $connection, $eventManager) = $this->createMockDefaultAppAndDeps(); - - return $app; - } - - /** - * Test registration - */ - public function testRegister() - { - $app = $this->createMockDefaultApp(); - - $app->register(new DoctrineOrmServiceProvider); - - $this->assertEquals($app['orm.em'], $app['orm.ems']['default']); - $this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $app['orm.em.config']->getQueryCacheImpl()); - $this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $app['orm.em.config']->getResultCacheImpl()); - $this->assertInstanceOf('Doctrine\Common\Cache\ArrayCache', $app['orm.em.config']->getMetadataCacheImpl()); - $this->assertInstanceOf('Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain', $app['orm.em.config']->getMetadataDriverImpl()); - } -}