Merge branch '1.1'

Author: wouterj

.travis.yml

@@ -22,7 +22,7 @@ before_script:
   - composer self-update
   - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
 
-script: vendor/bin/phpunit -c phpunit.xml.dist --coverage-text
+script: phpunit --coverage-text
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"

composer.json

@@ -20,14 +20,16 @@
         "jackalope/jackalope": "~1.0",
         "jackalope/jackalope-doctrine-dbal": "~1.0"
     },
-    "require-dev": {
-        "phpunit/phpunit": "3.7.*"
-    },
     "autoload": {
         "psr-4": {
             "Symfony\\Cmf\\Component\\Testing\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Symfony\\Cmf\\Component\\Testing\\Tests\\": "tests/"
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.2-dev"

tests/Fixtures/TestTestCase.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Symfony\Cmf\Component\Testing\Tests\Fixtures;
+
+use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+class TestTestCase extends BaseTestCase
+{
+    public function setKernel(KernelInterface $kernel)
+    {
+        self::$kernel = $kernel;
+    }
+
+    protected static function createKernel(array $options = array())
+    {
+        if (null === self::$kernel) {
+            return parent::createKernel($options);
+        }
+
+        return self::$kernel;
+    }
+}

tests/Functional/BaseTestCaseTest.php

@@ -10,53 +10,42 @@
  */
 
 
-namespace Tests\Functional;
+namespace Symfony\Cmf\Component\Testing\Tests\Functional;
 
+use Symfony\Cmf\Component\Testing\Tests\Fixtures\TestTestCase;
 use Symfony\Cmf\Component\Testing\HttpKernel\TestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
 class BaseTestCaseTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        $me = $this;
-
-        $this->tc = $this->getMockBuilder(
-            'Symfony\Cmf\Component\Testing\Functional\BaseTestCase'
-        )->setMethods(array(
-            'createKernel',
-        ))->getMockForAbstractClass();
+        $this->testCase = new TestTestCase();
 
-        $this->container = $this->getMock(
-            'Symfony\Component\DependencyInjection\ContainerInterface'
-        );
-
-        $this->kernel = $this->getMock(
-            'Symfony\Component\HttpKernel\KernelInterface'
-        );
-
-        $this->client = $me->getMockBuilder(
-            'Symfony\Bundle\FrameworkBundle\Client'
-        )->disableOriginalConstructor()->getMock();
+        $this->container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
 
+        $me = $this;
         $this->container->expects($this->any())
             ->method('get')
             ->will($this->returnCallback(function ($name) use ($me) {
                 $dic = array(
-                    'test.client' => $me->client
+                    'test.client' => $me->client,
                 );
 
                 return $dic[$name];
             }));
 
+        $this->kernel = $this->getMock('Symfony\Component\HttpKernel\KernelInterface');
+
+        $this->testCase->setKernel($this->kernel);
+
         $this->kernel->expects($this->any())
             ->method('getContainer')
             ->will($this->returnValue($this->container));
 
-        $tc = $this->tc;
-        $tc::staticExpects($this->any())
-            ->method('createKernel')
-            ->will($this->returnValue($this->kernel));
+        $this->client = $this->getMockBuilder('Symfony\Bundle\FrameworkBundle\Client')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->client->expects($this->any())
             ->method('getContainer')
@@ -66,8 +55,7 @@ public function setUp()
 
     public function testGetContainer()
     {
-        $res = $this->tc->getContainer();
-        $this->assertEquals($this->container, $res);
+        $this->assertEquals($this->container, $this->testCase->getContainer());
     }
 
     public function provideTestDb()
@@ -87,12 +75,10 @@ public function provideTestDb()
     public function testDb($dbName, $expected)
     {
         if (null === $expected) {
-            $this->setExpectedException('InvalidArgumentException',
-                $dbName.'" does not exist'
-            );
+            $this->setExpectedException('InvalidArgumentException', $dbName.'" does not exist');
         }
 
-        $res = $this->tc->getDbManager($dbName);
+        $res = $this->testCase->getDbManager($dbName);
 
         $className = sprintf(
             'Symfony\Cmf\Component\Testing\Functional\DbManager\%s',

tests/HttpKernel/TestKernelTest.php

@@ -10,7 +10,7 @@
  */
 
 
-namespace Tests\HttpKernel;
+namespace Symfony\Cmf\Component\Testing\Tests\HttpKernel;
 
 use Symfony\Cmf\Component\Testing\HttpKernel\TestKernel;
 use Symfony\Component\Config\Loader\LoaderInterface;

tests/Phpunit/DatabaseTestListenerTest.php

@@ -10,7 +10,7 @@
  */
 
 
-namespace Tests\Phpunit;
+namespace Symfony\Cmf\Component\Testing\Tests\Phpunit;
 
 use Symfony\Cmf\Component\Testing\Phpunit\DatabaseTestListener;
 

tests/Unit/Constraint/SchemaAcceptsXmlTest.php

@@ -10,7 +10,7 @@
  */
 
 
-namespace Tests\Unit\Constraint;
+namespace Symfony\Cmf\Component\Testing\Tests\Unit\Constraint;
 
 use Symfony\Cmf\Component\Testing\Unit\Constraint\SchemaAcceptsXml;
 

tests/Unit/XmlSchemaTestCaseTest.php

@@ -10,7 +10,7 @@
  */
 
 
-namespace Tests\Unit;
+namespace Symfony\Cmf\Component\Testing\Tests\Unit;
 
 use Symfony\Cmf\Component\Testing\Unit\XmlSchemaTestCase;