Merge pull request #214 from symfony-cmf/2.0

[WIP] Refactoring to support 2.0

Author: lsmith77

.travis.yml

@@ -20,22 +20,25 @@ matrix:
   include:
     - php: 5.6
       env: SYMFONY_VERSION=2.3.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.5.*
     - php: 5.6
       env: SYMFONY_VERSION=2.7.*
     - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
+      env: SYMFONY_VERSION=2.8.*
+    - php: 5.6
+      env: SYMFONY_VERSION="3.0.x-dev as 2.8.x-dev"
   allow_failures:
     - php: 5.6
       env: SYMFONY_VERSION=2.7.*
     - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
+      env: SYMFONY_VERSION=2.8.*
+    - php: 5.6
+      env: SYMFONY_VERSION="3.0.x-dev as 2.8.x-dev"
 
-before_script:
+before_install:
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
   - composer self-update
-  - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist
-  - vendor/symfony-cmf/testing/bin/travis/phpcr_odm_doctrine_dbal.sh
+
+install: composer require symfony/symfony:${SYMFONY_VERSION} --prefer-dist
 
 script: phpunit --coverage-text
 

Admin/AbstractMenuNodeAdmin.php

@@ -15,20 +15,13 @@
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Show\ShowMapper;
 use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
-use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNode;
 use Symfony\Cmf\Bundle\MenuBundle\Model\MenuNodeBase;
-use Symfony\Cmf\Bundle\MenuBundle\ContentAwareFactory;
 
 /**
  * Common base admin for Menu and MenuNode
  */
 abstract class AbstractMenuNodeAdmin extends Admin
 {
-    /**
-     * @var ContentAwareFactory
-     */
-    protected $contentAwareFactory;
-
     /**
      * @var string
      */
@@ -73,9 +66,10 @@ protected function configureFormFields(FormMapper $formMapper)
             $formMapper
                 ->with('form.group_general')
                     ->add('linkType', 'choice_field_mask', array(
-                        'choices' => array_combine(
-                            $this->contentAwareFactory->getLinkTypes(),
-                            $this->contentAwareFactory->getLinkTypes()
+                        'choices' => array(
+                            'route' => 'route',
+                            'uri' => 'uri',
+                            'content' => 'content',
                         ),
                         'map' => array(
                             'route' => array('route'),
@@ -115,16 +109,6 @@ public function getExportFormats()
         return array();
     }
 
-    public function getContentAwareFactory()
-    {
-        return $this->contentAwareFactory;
-    }
-
-    public function setContentAwareFactory(ContentAwareFactory $contentAwareFactory)
-    {
-        $this->contentAwareFactory = $contentAwareFactory;
-    }
-
     public function setContentRoot($contentRoot)
     {
         $this->contentRoot = $contentRoot;

CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+2.0.0-alpha1
+------------
+
+* **2014-11-03**: [BC BREAK] The CreateMenuItemFromNodeEvent class no longer has a getFactory method, inject the factory as a service instead
+* **2014-11-01**: [BC BREAK] The voters now need to use the voter mechanism of KnpMenu.
+* **2014-10-31**: [BC BREAK] The cmf_menu.factory service has been removed, knp_menu.factory should be used instead
+* **2014-10-30**: [BC BREAK] PhpcrMenuProvider now requires the NodeLoader as first argument instead of a FactoryInterface
+
 1.2.0-RC1
 ---------
 

CmfMenuBundle.php

@@ -13,16 +13,17 @@
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-use Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler\AddVotersPass;
+use Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler\DecorateMenuFactoryPass;
 use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
 
 class CmfMenuBundle extends Bundle
 {
     public function build(ContainerBuilder $container)
     {
         parent::build($container);
-        $container->addCompilerPass(new AddVotersPass());
+
+        $container->addCompilerPass(new DecorateMenuFactoryPass());
+
         if (class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')) {
             $container->addCompilerPass(
                 DoctrinePhpcrMappingsPass::createXmlMappingDriver(