Update bundle to current cmf

Author: Brian

.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

Controller/PostController.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()

DependencyInjection/Configuration.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/BlogRepository.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;
     }
 }

Repository/PostRepository.php

@@ -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/config/cmf_routing_auto.xml

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