Merge remote-tracking branch 'origin/2.1'

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:

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.1.1
+-----
+
+* Fixed another template reference to work with Symfony 4.
+
 2.1.0
 -----
 

README.md

@@ -8,9 +8,9 @@
 [![Monthly Downloads](https://poser.pugx.org/symfony-cmf/core-bundle/d/monthly)](https://packagist.org/packages/symfony-cmf/core-bundle)
 [![Daily Downloads](https://poser.pugx.org/symfony-cmf/core-bundle/d/daily)](https://packagist.org/packages/symfony-cmf/core-bundle)
 
-Version/Branch | Travis | Coveralls |
+Branch | Travis | Coveralls |
 ------ | ------ | --------- |
-2.1.0   | [![Build Status][travis_stable_badge]][travis_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     |
+2.1   | [![Build Status][travis_stable_badge]][travis_link]     | [![Coverage Status][coveralls_stable_badge]][coveralls_stable_link]     |
 master | [![Build Status][travis_unstable_badge]][travis_link] | [![Coverage Status][coveralls_unstable_badge]][coveralls_unstable_link] |
 
 This package is part of the [Symfony Content Management Framework (CMF)](http://cmf.symfony.com/) and licensed

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>

src/DependencyInjection/CmfCoreExtension.php

@@ -295,7 +295,7 @@ public function setupFormTypes(ContainerBuilder $container, LoaderInterface $loa
             // if there is twig, register our form type with twig
             if ($container->hasParameter('twig.form.resources')) {
                 $resources = $container->getParameter('twig.form.resources');
-                $container->setParameter('twig.form.resources', array_merge($resources, ['CmfCoreBundle:Form:checkbox_url_label_form_type.html.twig']));
+                $container->setParameter('twig.form.resources', array_merge($resources, ['@CmfCore/Form/checkbox_url_label_form_type.html.twig']));
             }
         }
     }

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/Templating/Helper/CmfTest.php

@@ -18,6 +18,7 @@
 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;
 
@@ -221,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);
@@ -237,6 +235,7 @@ public function testFindManyNoWorkflow()
             ->will($this->returnValue($documentA))
         ;
 
+        $this->expectException(InvalidConfigurationException::class);
         $extension->findMany(['/foo', '/bar'], false, false);
     }
 
@@ -256,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());
     }
 

tests/Unit/Twig/Extension/CmfExtensionTest.php

@@ -11,14 +11,15 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Unit\Twig\Extension;
 
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\Cmf;
 use Symfony\Cmf\Bundle\CoreBundle\Twig\Extension\CmfExtension;
 
 class CmfExtensionTest extends TestCase
 {
     /**
-     * @var Cmf|\PHPUnit_Framework_MockObject_MockObject
+     * @var Cmf|MockObject
      */
     private $cmfHelper;