Update bundle to current cmf

.gitignore

@@ -1,6 +1,5 @@
 Tests/Resources/app/cache
 Tests/Resources/app/logs
-Tests/Resources/test_db.sqlite
 bin/
 composer.lock
 vendor/

.travis.yml

@@ -7,7 +7,7 @@ php:
 
 env:
   - SYMFONY_VERSION=2.5.*
-  
+
 matrix:
   allow_failures:
     - env: SYMFONY_VERSION=dev-master
@@ -18,8 +18,6 @@ matrix:
       env: SYMFONY_VERSION=2.4.*
     - php: 5.5
       env: SYMFONY_VERSION=dev-master
-
-
 
 before_script:
   - composer self-update

DependencyInjection/Configuration.php

@@ -39,18 +39,13 @@ public function getConfigTreeBuilder()
                 // admin
                 ->arrayNode('sonata_admin')
                     ->canBeEnabled()
-                    ->addDefaultsIfNotSet()
-                    ->children()
-                        ->booleanNode('enabled')->defaultTrue()->end()
-                    ->end()
                 ->end()
 
                 // menu
                 ->arrayNode('integrate_menu')
                     ->addDefaultsIfNotSet()
                     ->canBeEnabled()
                     ->children()
-                        ->booleanNode('enabled')->defaultTrue()->end()
                         ->scalarNode('content_key')->defaultNull()->end()
                     ->end()
                 ->end()
@@ -60,7 +55,6 @@ public function getConfigTreeBuilder()
                     ->addDefaultsIfNotSet()
                     ->canBeEnabled()
                     ->children()
-                        ->booleanNode('enabled')->defaultTrue()->end()
                         ->scalarNode('posts_per_page')->defaultValue(5)->end()
                     ->end()
                 ->end()

Repository/BlogRepository.php

@@ -46,20 +46,6 @@ public function setBasepath($basepath)
         $this->basepath = $basepath;
     }
 
-    /**
-     * Find blog by name
-     *
-     * @param string $name
-     * @return null|Blog
-     */
-    public function findByName($name)
-    {
-        return $this->search(array(
-            'name' => $name,
-            'limit' => 1,
-        ));
-    }
-
     /**
      * Search for blogs by an array of options
      *
@@ -116,12 +102,6 @@ protected function setDefaultOptions(OptionsResolver $resolver)
             'limit' => 'int',
         ));
 
-        $resolver->setAllowedValues(array(
-            'limit' => function($value) {
-                return $value > 0;
-            },
-        ));
-
         return $resolver;
     }
 

Repository/PostRepository.php

@@ -36,24 +36,10 @@ public function __construct($dm, ClassMetadata $class)
         $this->resolver = $this->setDefaultOptions(new OptionsResolver());
     }
 
-    /**
-     * Find post by title
-     *
-     * @param string $title
-     * @return Post|null
-     */
-    public function findByTitle($title)
-    {
-        return $this->search(array(
-            'title' => $title,
-            'limit' => 1,
-        ));
-    }
-
     /**
      * Search for posts by an array of options:
      *   - blogId: string (required)
-     *   - isPublishable: boolean (optional, default true)
+     *   - isPublishable: boolean (optional, default true) // TODO: https://github.com/symfony-cmf/CoreBundle/issues/126
      *   - title: string (optional)
      *   - limit: integer (optional)
      *   - orderBy: array of arrays('field' => $field, 'order' => 'ASC or DESC') (optional)
@@ -146,30 +132,6 @@ protected function setDefaultOptions(OptionsResolver $resolver)
             'orderBy' => 'array',
         ));
 
-        $resolver->setAllowedValues(array(
-            'limit' => function($value) {
-                return $value > 0;
-            },
-            'orderBy' => function(array $orderBys) {
-                $validOrderBys = array();
-                foreach ($orderBys as $orderBy) {
-
-                    if ($orderByValid = isset($orderBy['order'])) {
-                        if(!in_array(strtolower($orderBy['order']), array('asc', 'desc'), true)) {
-                            throw new \InvalidArgumentException(sprintf(
-                                'Unrecognized orderBy order value "%s". order must be one of ASC or DESC.',
-                                $orderBy['order']
-                            ));
-                        }
-                    }
-
-                    $validOrderBys[] = isset($orderBy['field']) && $orderByValid;
-                }
-
-                return count(array_filter($validOrderBys)) == count($orderBys);
-            },
-        ));
-
         return $resolver;
     }
 }

Resources/config/cmf_routing_auto.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<auto-mapping xmlns="http://cmf.symfony.com/schema/routing_auto">
+
+    <mapping class="Symfony\Cmf\Bundle\BlogBundle\Doctrine\Phpcr\Blog" uri-schema="/blogs/{blog}">
+
+        <token-provider token="blog" name="content_method">
+            <option name="method">getName</option>
+        </token-provider>
+
+    </mapping>
+
+    <mapping class="Symfony\Cmf\Bundle\BlogBundle\Doctrine\Phpcr\Post" uri-schema="/blogs/{blog}/{date}/{title}">
+
+        <token-provider token="blog" name="content_method">
+            <option name="method">getBlog</option>
+        </token-provider>
+
+        <token-provider token="date" name="content_datetime">
+            <option name="method">getDate</option>
+        </token-provider>
+
+        <token-provider token="title" name="content_method">
+            <option name="method">getTitle</option>
+        </token-provider>
+
+    </mapping>
+
+</auto-mapping>

Resources/views/Blog/detail.html.twig

@@ -1,5 +1,3 @@
-{# CmfBlogBundle:Blog:detail.html.twig #}
-
 {% extends "CmfBlogBundle::layout.html.twig" %}
 
 {% block content %}

Resources/views/Blog/detailPaginated.html.twig

@@ -1,5 +1,3 @@
-{# CmfBlogBundle:Blog:detailPaginated.html.twig #}
-
 {% extends "CmfBlogBundle:Blog:detail.html.twig" %}
 
 {% block content %}

Resources/views/Blog/list.html.twig

@@ -1,5 +1,3 @@
-{# CmfBlogBundle:Blog:list.html.twig #}
-
 {% extends "CmfBlogBundle::layout.html.twig" %}
 
 {% block content %}

Resources/views/Post/detail.html.twig

@@ -1,7 +1,7 @@
-{# CmfBlogBundle:Post:detail.html.twig #}
-
 {% extends "CmfBlogBundle::layout.html.twig" %}
 
+{% set post = cmfMainContent %}
+
 {% block content %}
     <div class="post">
 

Tests/Functional/Admin/BlogAdminTest.php

@@ -54,7 +54,7 @@ public function testEdit()
         $crawler = $this->client->submit($form);
 
         $this->assertCount(1, $crawler->filter("html:contains('has been successfully updated')"),
-            'Expected a success flash message, but none as found.'
+            'Expected a success flash message, but none was found.'
         );
 
         $dm = $this->db('PHPCR')->getOm();

Tests/Functional/Admin/PostAdminTest.php

@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2014 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
 namespace Symfony\Cmf\Bundle\BlogBundle\Tests\Functional\Admin;
 
 use Symfony\Cmf\Bundle\BlogBundle\Tests\Functional\BaseTestCase;

Tests/Functional/BaseTestCase.php

@@ -44,13 +44,8 @@ public function setUp()
 
         $this->router = $this->get('router');
 
-//        $this->db('PHPCR')->loadFixtures(array(
-//            'Symfony\Cmf\Bundle\BlogBundle\Tests\Resources\DataFixtures\PHPCR\LoadBlogData',
-//        ));
-
-        $this->runConsole('doctrine:phpcr:fixtures:load', array(
-            '--fixtures' => __DIR__.'/../Resources/DataFixtures/PHPCR',
-            '--no-interaction' => true,
+        $this->db('PHPCR')->loadFixtures(array(
+            'Symfony\Cmf\Bundle\BlogBundle\Tests\Resources\DataFixtures\PHPCR\LoadBlogData',
         ));
     }
 

Tests/Functional/BlogControllerTest.php

@@ -1,5 +1,15 @@
 <?php
 
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2014 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
 namespace Symfony\Cmf\Bundle\BlogBundle\Tests\Functional;
 
 class BlogControllerTest extends BaseTestCase
@@ -10,4 +20,15 @@ public function testListAction()
 
         $this->assertCount(3, $crawler->filter('h2'));
     }
+
+    /**
+     * Pagination disabled
+     */
+    public function testDetailAction()
+    {
+        $crawler = $this->request('GET', '/blogs/blog-three');
+
+        $this->assertCount(1, $crawler->filter('h2'));
+        $this->assertCount(12, $crawler->filter('h3'));
+    }
 }

Tests/Functional/PostControllerTest.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2014 Symfony CMF
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
+namespace Symfony\Cmf\Bundle\BlogBundle\Tests\Functional;
+
+class PostControllerTest extends BaseTestCase
+{
+    public function testDetailAction()
+    {
+        $crawler = $this->request('GET', '/blogs/blog-one/2014-01-01/first-post');
+
+        $this->assertCount(2, $crawler->filter('h1'));
+        $this->assertCount(1, $crawler->filter("html:contains('First Post')"),
+            'Expected to find the Post\'s title, but it was not.'
+        );
+    }
+}