change template path to new pattern (#292)

* adjust template paths to use the new pattern for symfony 4 * fix testing configuration
symfony-cmf · Nov 13, 2018 · e3863bf · e3863bf
1 parent 1bafb5c
commit e3863bf
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2.1.1
+-----
+
+* **2018-11-13**: [BUGFIX] Older template path `CmfBlockBundl:Block:some-template.html.twig` is replaced to `@CmfBlock/Block/some-template.html.twig` to be recognized by newer Symfony versions
+
+2.1.0
+-----
+
 * **2017-11-16**: Removed php 5.6 and 7.0 support, removed Symfony 3.0.* and 3.1.* support
 
 2.0.0

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,8 +5,13 @@
     bootstrap="vendor/symfony-cmf/testing/bootstrap/bootstrap.php"
 >
     <testsuites>
-        <testsuite name="Symfony CmfBlockBundle Test Suite">
-            <directory>./tests/</directory>
+        <testsuite name="unit tests">
+            <directory>./tests/Unit</directory>
+        </testsuite>
+
+        <testsuite name="functional tests with phpcr">
+            <directory>./tests/WebTest</directory>
+            <directory>./tests/Functional</directory>
         </testsuite>
     </testsuites>
 

diff --git a/src/Block/ContainerBlockService.php b/src/Block/ContainerBlockService.php
@@ -30,7 +30,7 @@ class ContainerBlockService extends AbstractBlockService implements BlockService
     /**
      * @var string
      */
-    protected $template = 'CmfBlockBundle:Block:block_container.html.twig';
+    protected $template = '@CmfBlock/Block/block_container.html.twig';
 
     /**
      * @param string                 $name

diff --git a/src/Block/MenuBlockService.php b/src/Block/MenuBlockService.php
@@ -25,7 +25,7 @@
  */
 class MenuBlockService extends AbstractBlockService implements BlockServiceInterface
 {
-    protected $template = 'CmfBlockBundle:Block:block_menu.html.twig';
+    protected $template = '@CmfBlock/Block/block_menu.html.twig';
 
     public function __construct($name, $templating, $template = null)
     {

diff --git a/src/Block/SimpleBlockService.php b/src/Block/SimpleBlockService.php
@@ -20,7 +20,7 @@
 
 class SimpleBlockService extends AbstractBlockService implements BlockServiceInterface
 {
-    protected $template = 'CmfBlockBundle:Block:block_simple.html.twig';
+    protected $template = '@CmfBlock/Block/block_simple.html.twig';
 
     public function __construct($name, $templating, $template = null)
     {

diff --git a/src/Block/StringBlockService.php b/src/Block/StringBlockService.php
@@ -20,7 +20,7 @@
 
 class StringBlockService extends AbstractBlockService implements BlockServiceInterface
 {
-    protected $template = 'CmfBlockBundle:Block:block_string.html.twig';
+    protected $template = '@CmfBlock/Block/block_string.html.twig';
 
     public function __construct($name, $templating, $template = null)
     {

diff --git a/src/DependencyInjection/CmfBlockExtension.php b/src/DependencyInjection/CmfBlockExtension.php
@@ -31,7 +31,7 @@ public function prepend(ContainerBuilder $container)
         if (isset($bundles['SonataBlockBundle'])) {
             $config = [
                 'templates' => [
-                    'block_base' => 'CmfBlockBundle:Block:block_base.html.twig',
+                    'block_base' => '@CmfBlock/Block/block_base.html.twig',
                 ],
                 'blocks_by_class' => [
                     0 => [
@@ -40,7 +40,7 @@ public function prepend(ContainerBuilder $container)
                             'title' => 'Insert the rss title',
                             'url' => false,
                             'maxItems' => 10,
-                            'template' => 'CmfBlockBundle:Block:block_rss.html.twig',
+                            'template' => '@CmfBlock/Block/block_rss.html.twig',
                             'itemClass' => 'Symfony\\Cmf\\Bundle\\BlockBundle\\Model\\FeedItem',
                         ],
                     ],
@@ -93,9 +93,9 @@ private function loadPhpcr(array $config, XmlFileLoader $loader, ContainerBuilde
         $bundles = $container->getParameter('kernel.bundles');
         if (isset($bundles['CmfCreateBundle'])) {
             $blockLoader = $container->getDefinition('cmf.block.simple');
-            $blockLoader->addMethodCall('setTemplate', ['CmfBlockBundle:Block:block_simple_createphp.html.twig']);
+            $blockLoader->addMethodCall('setTemplate', ['@CmfBlock/Block/block_simple_createphp.html.twig']);
             $blockLoader = $container->getDefinition('cmf.block.string');
-            $blockLoader->addMethodCall('setTemplate', ['CmfBlockBundle:Block:block_string_createphp.html.twig']);
+            $blockLoader->addMethodCall('setTemplate', ['@CmfBlock/Block/block_string_createphp.html.twig']);
         }
 
         if (isset($bundles['CmfMenuBundle'])) {

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -47,7 +47,7 @@
             <argument>cmf.block.slideshow</argument>
             <argument type="service" id="sonata.templating" />
             <argument type="service" id="sonata.block.renderer" />
-            <argument>CmfBlockBundle:Block:block_slideshow.html.twig</argument>
+            <argument>@CmfBlock/Block/block_slideshow.html.twig</argument>
         </service>
 
         <service id="cmf.block.rss_controller" class="Symfony\Cmf\Bundle\BlockBundle\Controller\RssController" >

diff --git a/tests/Fixtures/App/config/admin-test.xml b/tests/Fixtures/App/config/admin-test.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="cmf_block_test.test_controller" class="Symfony\Cmf\Bundle\BlockBundle\Tests\Fixtures\App\Controller\TestController" />
+        <service id="cmf_block_test.test_controller" class="Symfony\Cmf\Bundle\BlockBundle\Tests\Fixtures\App\Controller\TestController" public="true"/>
     </services>
 
 </container>
diff --git a/tests/Functional/Block/ContainerBlockServiceTest.php b/tests/Functional/Block/ContainerBlockServiceTest.php
@@ -39,7 +39,7 @@ public function testExecutionOfDisabledBlock()
 
     public function testExecutionOfEnabledBlock()
     {
-        $template = 'CmfBlockBundle:Block:block_container.html.twig';
+        $template = '@CmfBlock/Block/block_container.html.twig';
 
         $simpleBlock1 = new SimpleBlock();
         $simpleBlock1->setId(1);
@@ -86,7 +86,7 @@ public function testExecutionOfEnabledBlock()
 
     public function testExecutionOfBlockWithNoChildren()
     {
-        $template = 'CmfBlockBundle:Block:block_container.html.twig';
+        $template = '@CmfBlock/Block/block_container.html.twig';
 
         $childrenCollectionMock = $this->createMock(ChildrenCollection::class);
 

diff --git a/tests/Functional/Block/MenuBlockServiceTest.php b/tests/Functional/Block/MenuBlockServiceTest.php
@@ -40,7 +40,7 @@ public function testExecutionOfDisabledBlock()
 
     public function testExecutionOfEnabledBlock()
     {
-        $template = 'CmfBlockBundle:Block:block_menu.html.twig';
+        $template = '@CmfBlock/Block/block_menu.html.twig';
         $menuNode = new MenuNode();
 
         $menuBlock = new MenuBlock();

diff --git a/tests/Functional/Block/SimpleBlockServiceTest.php b/tests/Functional/Block/SimpleBlockServiceTest.php
@@ -20,7 +20,7 @@ class SimpleBlockServiceTest extends \PHPUnit_Framework_TestCase
 {
     public function testExecutionOfEnabledBlock()
     {
-        $template = 'CmfBlockBundle:Block:block_simple.html.twig';
+        $template = '@CmfBlock/Block/block_simple.html.twig';
         $simpleBlock = new SimpleBlock();
         $simpleBlock->setEnabled(true);
         $blockContext = new BlockContext($simpleBlock, ['template' => $template]);

diff --git a/tests/Functional/Block/StringBlockServiceTest.php b/tests/Functional/Block/StringBlockServiceTest.php
@@ -20,7 +20,7 @@ class StringBlockServiceTest extends \PHPUnit_Framework_TestCase
 {
     public function testExecutionOfEnabledBlock()
     {
-        $template = 'CmfBlockBundle:Block:block_string.html.twig';
+        $template = '@CmfBlock/Block/block_string.html.twig';
         $stringBlock = new StringBlock();
         $stringBlock->setEnabled(true);
         $blockContext = new BlockContext($stringBlock, ['template' => $template]);

diff --git a/tests/Unit/DependencyInjection/XmlSchemaTest.php b/tests/Unit/DependencyInjection/XmlSchemaTest.php
@@ -18,7 +18,7 @@ class XmlSchemaTest extends XmlSchemaTestCase
     public function testSchema()
     {
         $xmlFiles = array_map(function ($file) {
-            return __DIR__.'/../..//Fixtures/App/config/'.$file;
+            return __DIR__.'/../..//Fixtures/fixtures/config/'.$file;
         }, [
             'config1.xml',
             'config2.xml',

diff --git a/tests/WebTest/Render/ReferenceBlockRenderTest.php b/tests/WebTest/Render/ReferenceBlockRenderTest.php
@@ -34,6 +34,7 @@ public function testRenderReferenceTwig()
         $crawler = $this->client->request('GET', '/render-reference-test');
 
         $res = $this->client->getResponse();
+
         $this->assertEquals(200, $res->getStatusCode());
 
         $this->assertCount(1, $crawler->filter('html:contains("Dummy action")'));