.styleci.yml

@@ -0,0 +1 @@
+preset: symfony

.travis.yml

@@ -4,24 +4,43 @@ php:
   - 5.3
   - 5.4
   - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+
+sudo: false
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
 
 env:
-  - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=2.4.*
-  - SYMFONY_VERSION=dev-master
+  - SYMFONY_VERSION=2.7.* SYMFONY_DEPRECATIONS_HELPER=weak
+
+matrix:
+  include:
+    - php: 5.3
+      env: SYMFONY_VERSION="^2.3.4" COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 5.6
+      env: SYMFONY_VERSION=2.3.* SYMFONY_DEPRECATIONS_HELPER=weak
+    - php: 5.6
+      env: SYMFONY_VERSION=2.8.*
+    - php: 5.6
+      env: SYMFONY_VERSION=3.0.*
+  allow_failures:
+    - env: SYMFONY_VERSION=2.8.*
+    - env: SYMFONY_VERSION=3.0.*
+  fast_finish: true
 
-before_script:
+before_install:
   - composer self-update
-  - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - composer require symfony/symfony:${SYMFONY_VERSION}
-  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
+  - if [ "${TRAVIS_PHP_VERSION}" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
+  - composer require symfony/symfony:${SYMFONY_VERSION} --no-update
+
+install: composer update $COMPOSER_FLAGS --prefer-dist
 
 script: phpunit --coverage-text
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
   email: "symfony-cmf-devs@googlegroups.com"
-
-matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master

Admin/PageAdmin.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2014 Symfony CMF
+ * (c) 2011-2015 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,7 +14,6 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
-use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
 use Symfony\Cmf\Bundle\RoutingBundle\Admin\RouteAdmin;
 use Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr\Page;
 
@@ -23,29 +22,42 @@ class PageAdmin extends RouteAdmin
     protected $translationDomain = 'CmfSimpleCmsBundle';
 
     private $sortOrder = false;
+    private $ivoryCkeditor = array();
 
     public function setSortOrder($sortOrder)
     {
-        if (! in_array($sortOrder, array(false, 'asc', 'desc'))) {
+        if (!in_array($sortOrder, array(false, 'asc', 'desc'))) {
             throw new \InvalidArgumentException($sortOrder);
         }
         $this->sortOrder = $sortOrder;
     }
 
+    public function setIvoryCkeditor($config)
+    {
+        $this->ivoryCkeditor = (array) $config;
+    }
+
     protected function configureListFields(ListMapper $listMapper)
     {
+        $textType = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix') ? 'Symfony\Component\Form\Extension\Core\Type\TextType' : 'text';
+
         $listMapper
-            ->addIdentifier('path', 'text')
-            ->addIdentifier('title', 'text')
-            ->add('label', 'text')
-            ->add('name', 'text')
+            ->addIdentifier('path', $textType)
+            ->addIdentifier('title', $textType)
+            ->add('label', $textType)
+            ->add('name', $textType)
         ;
     }
 
     protected function configureFormFields(FormMapper $formMapper)
     {
         parent::configureFormFields($formMapper);
 
+        $isSf28 = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix');
+        $ckeditorType = $isSf28 ? 'Ivory\CKEditorBundle\Form\Type\CKEditorType' : 'ckeditor';
+        $textareaType = $isSf28 ? 'Symfony\Component\Form\Extension\Core\Type\TextareaType' : 'textarea';
+        $sonataTypeImmutableArray = $isSf28 ? 'Sonata\CoreBundle\Form\Type\ImmutableArrayType' : 'sonata_type_immutable_array';
+
         $formMapper->remove('content');
 
         // remap to routeOptions
@@ -57,14 +69,18 @@ protected function configureFormFields(FormMapper $formMapper)
             ))
                 ->add('label', null, array('required' => false))
                 ->add('title')
-                ->add('body', 'textarea')
+                ->add(
+                    'body',
+                     $this->ivoryCkeditor ? $ckeditorType : $textareaType,
+                     $this->ivoryCkeditor
+                )
             ->end()
             ->with('form.group_advanced', array(
                 'translation_domain' => 'CmfRoutingBundle',
             ))
                 ->add(
                     'routeOptions',
-                    'sonata_type_immutable_array',
+                    $sonataTypeImmutableArray,
                     array('keys' => $this->configureFieldsForOptions($this->getSubject()->getRouteOptions()), 'label' => 'form.label_options'),
                     array('help' => 'form.help_options')
                 )
@@ -76,7 +92,7 @@ protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
         $datagridMapper
             ->add('title', 'doctrine_phpcr_string')
-            ->add('name',  'doctrine_phpcr_nodename')
+            ->add('name', 'doctrine_phpcr_nodename')
         ;
     }
 

CHANGELOG.md

@@ -1,6 +1,29 @@
 Changelog
 =========
 
+1.3.0
+-----
+
+1.3.0-RC1
+---------
+
+* **2015-08-31**: Added IvoryCKEditorBundle integration and added the
+  `ivory_ckeditor` settings.
+* **2015-10-31**: Calling `getCreateDate()`, `getAddLocalePattern()` or
+  `setAddLocalePattern()` now results in a deprecation notice. The methods are
+  deprecated since 1.1 and will be removed in 2.0.
+
+1.2.0-RC1
+---------
+
+* **2014-06-06**: Updated to PSR-4 autoloading
+
+1.1.1
+-----
+
+* **2014-05-26**: Page now provides a convenience method that returns the UUID
+  of the document if it has one.
+
 1.1.0
 -----
 

CmfSimpleCmsBundle.php

@@ -3,14 +3,15 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2014 Symfony CMF
+ * (c) 2011-2015 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\SimpleCmsBundle;
 
+use Symfony\Cmf\Bundle\SimpleCmsBundle\DependencyInjection\Compiler\AppendRouteBasepathPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
@@ -21,17 +22,21 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
+        $container->addCompilerPass(new AppendRouteBasepathPass());
+
         if ($container->hasExtension('jms_di_extra')) {
-            $container->getExtension('jms_di_extra')->blackListControllerFile(__DIR__ . '/Controller/PageAdminController.php');
+            $container->getExtension('jms_di_extra')->blackListControllerFile(__DIR__.'/Controller/PageAdminController.php');
         }
 
         if (class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')) {
             $container->addCompilerPass(
                 DoctrinePhpcrMappingsPass::createXmlMappingDriver(
                     array(
-                        realpath(__DIR__ . '/Resources/config/doctrine-phpcr') => 'Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr',
+                        realpath(__DIR__.'/Resources/config/doctrine-phpcr') => 'Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr',
                     ),
-                    array('cmf_simple_cms.persistence.phpcr.manager_name')
+                    array('cmf_simple_cms.persistence.phpcr.manager_name'),
+                    false,
+                    array('CmfSimpleCmsBundle' => 'Symfony\Cmf\Bundle\SimpleCmsBundle\Doctrine\Phpcr')
                 )
             );
         }

DependencyInjection/CmfSimpleCmsExtension.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Symfony CMF package.
  *
- * (c) 2011-2014 Symfony CMF
+ * (c) 2011-2015 Symfony CMF
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,7 +17,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\Config\FileLocator;
-
 use PHPCR\Util\PathHelper;
 
 class CmfSimpleCmsExtension extends Extension implements PrependExtensionInterface
@@ -44,17 +43,13 @@ public function prepend(ContainerBuilder $container)
                 'routers_by_id' => array(
                     'router.default' => 0,
                     'cmf_routing.dynamic_router' => -100,
-                )
+                ),
             ),
             'dynamic' => array(
                 'enabled' => true,
-            )
+            ),
         );
-        if (isset($config['persistence']['phpcr']['basepath'])
-            && '/cms/simple' != $config['persistence']['phpcr']['basepath']
-        ) {
-            $prependConfig['dynamic']['persistence']['phpcr']['route_basepaths'] = array($config['persistence']['phpcr']['basepath']);
-        }
+
         $container->prependExtensionConfig('cmf_routing', $prependConfig);
     }
 
@@ -70,28 +65,58 @@ public function load(array $configs, ContainerBuilder $container)
                 $this->loadPhpcrMenu($config, $loader, $container);
             }
         }
+
+        $this->loadIvoryCKEditor($config['ivory_ckeditor'], $container);
+    }
+
+    protected function loadIvoryCKEditor(array $config, ContainerBuilder $container)
+    {
+        $container->setParameter($this->getAlias().'.ivory_ckeditor.config', array());
+
+        $bundles = $container->getParameter('kernel.bundles');
+        if ('auto' === $config['enabled'] && !isset($bundles['IvoryCKEditorBundle'])) {
+            return;
+        }
+
+        if (true === $config['enabled'] && !isset($bundles['IvoryCKEditorBundle'])) {
+            $message = 'IvoryCKEditorBundle integration was explicitely enabled, but the bundle is not available';
+
+            if (class_exists('Ivory\CKEditorBundle\IvoryCKEditorBundle')) {
+                $message .= ' (did you forget to register the bundle in the AppKernel?)';
+            }
+
+            throw new \LogicException($message.'.');
+        }
+
+        if (false === $config['enabled'] || !isset($bundles['IvoryCKEditorBundle'])) {
+            return;
+        }
+
+        $container->setParameter($this->getAlias().'.ivory_ckeditor.config', array(
+            'config_name' => $config['config_name'],
+        ));
     }
 
     protected function loadPhpcr($config, XmlFileLoader $loader, ContainerBuilder $container)
     {
         $loader->load('services-phpcr.xml');
         $loader->load('migrator-phpcr.xml');
 
-        $prefix = $this->getAlias() . '.persistence.phpcr';
+        $prefix = $this->getAlias().'.persistence.phpcr';
 
-        $container->setParameter($prefix . '.basepath', $config['basepath']);
+        $container->setParameter($prefix.'.basepath', $config['basepath']);
 
-        $container->setParameter($prefix . '.menu_basepath', PathHelper::getParentPath($config['basepath']));
+        $container->setParameter($prefix.'.menu_basepath', PathHelper::getParentPath($config['basepath']));
 
         if ($config['use_sonata_admin']) {
             $this->loadSonataAdmin($config, $loader, $container);
         } elseif (isset($config['sonata_admin'])) {
             throw new InvalidConfigurationException('Do not define sonata_admin options when use_sonata_admin is set to false');
         }
 
-        $container->setParameter($prefix . '.manager_name', $config['manager_name']);
+        $container->setParameter($prefix.'.manager_name', $config['manager_name']);
 
-        $container->setParameter($prefix . '.document.class', $config['document_class']);
+        $container->setParameter($prefix.'.document.class', $config['document_class']);
     }
 
     protected function loadPhpcrMenu($config, XmlFileLoader $loader, ContainerBuilder $container)
@@ -111,7 +136,7 @@ protected function loadSonataAdmin($config, XmlFileLoader $loader, ContainerBuil
             return;
         }
 
-        $container->setParameter($this->getAlias() . '.persistence.phpcr.admin.sort',
+        $container->setParameter($this->getAlias().'.persistence.phpcr.admin.sort',
             isset($config['sonata_admin'])
             ? $config['sonata_admin']['sort']
             : false

DependencyInjection/Compiler/AppendRouteBasepathPass.php

@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Symfony CMF package.
+ *
+ * (c) 2011-2015 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\SimpleCmsBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Appends the basepath for the SimpleCms to the RoutingBundle route basepaths.
+ *
+ * @author Wouter de Jong <wouter@wouterj.nl>
+ */
+class AppendRouteBasepathPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths')
+            || !$container->hasParameter('cmf_simple_cms.persistence.phpcr.basepath')) {
+            return;
+        }
+
+        $routeBasepaths = $container->getParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths');
+        $routeBasepaths[] = $container->getParameter('cmf_simple_cms.persistence.phpcr.basepath');
+
+        $container->setParameter('cmf_routing.dynamic.persistence.phpcr.route_basepaths', array_unique($routeBasepaths));
+    }
+}