Merge pull request #269 from symfony-cmf/fix-build

use phpunit 6

Author: dbu

.travis.yml

@@ -30,8 +30,7 @@ env:
   global:
     - SYMFONY_DEPRECATIONS_HELPER="/.*each.*/"
     - SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
-    - KERNEL_CLASS=Symfony\Cmf\Bundle\CoreBundle\Tests\Fixtures\App\Kernel
-    - SYMFONY_PHPUNIT_VERSION=5.7
+    - SYMFONY_PHPUNIT_VERSION=6
     - TEST_INSTALLATION=false
 
 matrix:

composer.json

@@ -20,10 +20,10 @@
     },
     "require-dev": {
         "symfony/security-bundle": "^2.8 || ^3.3 || ^4.0",
-        "symfony/phpunit-bridge": "^3.4.19 || ^4.0",
+        "symfony/phpunit-bridge": "^4.2.2",
         "mockery/mockery": "^0.9.4",
         "symfony-cmf/routing-bundle": "^2.1.0",
-        "symfony-cmf/testing": "^2.1.8",
+        "symfony-cmf/testing": "^2.1.11",
         "doctrine/dbal": "2.5.*",
         "doctrine/phpcr-odm": "^1.4|^2.0 ",
         "symfony/browser-kit": "^2.8 || ^3.3 || ^4.0",

phpunit.xml.dist

@@ -27,7 +27,7 @@
     </filter>
 
     <php>
-        <server name="KERNEL_DIR" value="tests/Resources/app" />
+        <server name="KERNEL_CLASS" value="\Symfony\Cmf\Bundle\CoreBundle\Tests\Fixtures\App\Kernel" />
     </php>
 
 </phpunit>

tests/Functional/DependencyInjection/CmfCoreExtensionTest.php

@@ -11,11 +11,12 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Functional\DependencyInjection;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\CmfCoreExtension;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\AlwaysPublishedWorkflowChecker;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-class CmfCoreExtensionTest extends \PHPUnit_Framework_TestCase
+class CmfCoreExtensionTest extends TestCase
 {
     /**
      * @var ContainerBuilder

tests/Functional/Templating/Helper/CmfHierarchyTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Functional\Templating\Helper;
 
 use Doctrine\ODM\PHPCR\Document\Generic;
+use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\Cmf;
 use Symfony\Cmf\Bundle\CoreBundle\Tests\Fixtures\App\DataFixture\LoadHierarchyRouteData;
 use Symfony\Cmf\Bundle\CoreBundle\Tests\Fixtures\App\Document\RouteAware;
@@ -21,7 +22,7 @@
 class CmfHierarchyTest extends BaseTestCase
 {
     /**
-     * @var AuthorizationCheckerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AuthorizationCheckerInterface|MockObject
      */
     private $publishWorkflowChecker;
 

tests/Unit/DependencyInjection/CmfCoreExtensionTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Unit\DependencyInjection;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Cmf\Bundle\CoreBundle\DependencyInjection\CmfCoreExtension;
 use Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle;
@@ -20,7 +21,7 @@
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 use Symfony\Component\Routing\Router;
 
-class CmfCoreExtensionTest extends \PHPUnit_Framework_TestCase
+class CmfCoreExtensionTest extends TestCase
 {
     /**
      * @var CmfCoreExtension

tests/Unit/PublishWorkflow/PublishWorkflowCheckerTest.php

@@ -11,14 +11,15 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Unit\PublishWorkflow;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableReadInterface;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
-class PublishWorkflowCheckerTest extends \PHPUnit_Framework_TestCase
+class PublishWorkflowCheckerTest extends TestCase
 {
     private $publishWorkflowChecker;
 

tests/Unit/PublishWorkflow/Voter/PublishTimePeriodVoterTest.php

@@ -11,14 +11,15 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Unit\PublishWorkflow\Voter;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishTimePeriodReadInterface;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\Voter\PublishTimePeriodVoter;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
-class PublishTimePeriodVoterTest extends \PHPUnit_Framework_TestCase
+class PublishTimePeriodVoterTest extends TestCase
 {
     /**
      * @var PublishTimePeriodVoter

tests/Unit/PublishWorkflow/Voter/PublishableVoterTest.php

@@ -11,14 +11,15 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Unit\PublishWorkflow\Voter;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishableReadInterface;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\Voter\PublishableVoter;
 use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
 
-class PublishableVoterTest extends \PHPUnit_Framework_TestCase
+class PublishableVoterTest extends TestCase
 {
     /**
      * @var PublishableVoter

tests/Unit/Templating/Helper/CmfTest.php

@@ -14,13 +14,15 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ODM\PHPCR\DocumentManager;
 use Doctrine\ODM\PHPCR\UnitOfWork;
+use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Bundle\CoreBundle\PublishWorkflow\PublishWorkflowChecker;
 use Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\Cmf;
 use Symfony\Cmf\Component\Routing\RouteReferrersReadInterface;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 
-class CmfTest extends \PHPUnit_Framework_TestCase
+class CmfTest extends TestCase
 {
     private $pwc;
 
@@ -220,9 +222,6 @@ public function testFindManyLimitOffset()
         $this->assertEquals([$documentB], $this->helper->findMany(['/foo', 'bar'], 1, 1, null));
     }
 
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     */
     public function testFindManyNoWorkflow()
     {
         $extension = new Cmf(null);
@@ -236,6 +235,7 @@ public function testFindManyNoWorkflow()
             ->will($this->returnValue($documentA))
         ;
 
+        $this->expectException(InvalidConfigurationException::class);
         $extension->findMany(['/foo', '/bar'], false, false);
     }
 
@@ -255,14 +255,12 @@ public function testIsPublished()
         $this->assertTrue($this->helper->isPublished($document));
     }
 
-    /**
-     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     */
     public function testIsPublishedNoWorkflow()
     {
         $extension = new Cmf(null);
         $extension->setDoctrineRegistry($this->managerRegistry, 'foo');
 
+        $this->expectException(InvalidConfigurationException::class);
         $extension->isPublished(new \stdClass());
     }