Merge pull request #79 from symfony-cmf/revert-staticcontenttype

Stop using the deleted StaticContentType

Author: wouterj

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
   - hhvm
 
@@ -17,13 +15,13 @@ env:
   matrix: SYMFONY_VERSION=3.1.*
   global:
     - SYMFONY_DEPRECATIONS_HELPER=2080
-    - SYMFONY_PHPUNIT_DIR=".phpunit" SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
+    - SYMFONY_PHPUNIT_DIR=".phpunit" SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
 
 matrix:
   include:
     #- php: 7.0
     #  env: DEPS=dev SYMFONY_VERSION=3.3.*
-    - php: 5.5
+    - php: 5.6
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.1
       env: SYMFONY_VERSION=3.0.*
@@ -44,4 +42,3 @@ script: vendor/bin/simple-phpunit
 
 notifications:
   irc: "irc.freenode.org#symfony-cmf"
-  email: "[email protected]"

composer.json

@@ -12,22 +12,23 @@
         }
     ],
     "require": {
-        "php": "^5.5.6|^7.0",
+        "php": "^5.6|^7.0",
         "symfony/framework-bundle": "^2.8|^3.0",
         "sonata-project/doctrine-phpcr-admin-bundle": "^2.0",
         "sonata-project/admin-bundle": "^3.6.0",
         "symfony-cmf/tree-browser-bundle": "^2.0"
     },
     "require-dev": {
         "symfony-cmf/testing": "^2.0",
-        "symfony-cmf/core-bundle": "^2.0",
+        "symfony-cmf/core-bundle": "^2.0.0-RC2",
         "symfony-cmf/routing-bundle": "^2.0",
         "symfony-cmf/seo-bundle": "^2.0",
         "symfony-cmf/menu-bundle": "^2.0",
         "symfony-cmf/block-bundle": "^2.0",
         "symfony-cmf/content-bundle": "^2.0",
         "doctrine/orm": "^2.4",
         "doctrine/phpcr-odm": "^2.0",
+        "doctrine/doctrine-bundle": "^1.3",
         "symfony/phpunit-bridge": "^3.2",
         "matthiasnoback/symfony-dependency-injection-test": "~0.6",
         "matthiasnoback/symfony-config-test": "^1.3.1",

src/Admin/Content/StaticContentAdmin.php

@@ -14,11 +14,13 @@
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
-use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
-use Symfony\Cmf\Bundle\ContentBundle\Doctrine\Phpcr\Form\Type\StaticContentType;
 use Symfony\Cmf\Bundle\ContentBundle\Model\StaticContentBase;
+use Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\AbstractAdmin;
+use Symfony\Cmf\Bundle\TreeBrowserBundle\Form\Type\TreeSelectType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 
-class StaticContentAdmin extends Admin
+class StaticContentAdmin extends AbstractAdmin
 {
     protected $translationDomain = 'CmfSonataPhpcrAdminIntegrationBundle';
 
@@ -37,25 +39,31 @@ protected function configureListFields(ListMapper $listMapper)
 
     protected function configureFormFields(FormMapper $formMapper)
     {
-        $builder = $formMapper->getFormBuilder()->getFormFactory()->createBuilder(StaticContentType::class, null, [
-            'readonly_parent_document' => (bool) $this->id($this->getSubject()),
-            'label_format' => 'form.label_%name%',
-            'translation_domain' => 'CmfSonataPhpcrAdminIntegrationBundle',
-        ]);
-
+        $editView = (bool) $this->id($this->getSubject());
         $formMapper
             ->tab('form.tab_general')
                 ->with('form.group_content', ['class' => 'col-md-9'])
-                    ->add($builder->get('title'))
-                    ->add($builder->get('body'))
+                    ->add('title', TextType::class)
+                    ->add('body', TextareaType::class)
                 ->end()
 
                 ->with('form.group_location', ['class' => 'col-md-3'])
-                    ->add($builder->get('parentDocument'))
-                    ->add($builder->get('name'))
+                    ->ifTrue($editView)
+                        ->add('parentDocument', TextType::class, ['disabled' => true])
+                    ->ifEnd()
+                    ->ifFalse($editView)
+                        ->add('parentDocument', TreeSelectType::class, [
+                            'widget' => 'browser',
+                            'root_node' => $this->getRootPath(),
+                        ])
+                    ->ifend()
+
+                    ->add('name', TextType::class)
                 ->end()
             ->end()
         ;
+
+        $this->addTransformerToField($formMapper->getFormBuilder(), 'parentDocument');
     }
 
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)

src/Resources/config/content.xml

@@ -6,7 +6,8 @@
     <services>
         <service
                 id="cmf_sonata_phpcr_admin_integration.content.admin"
-                class="Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Content\StaticContentAdmin">
+                class="Symfony\Cmf\Bundle\SonataPhpcrAdminIntegrationBundle\Admin\Content\StaticContentAdmin"
+                parent="cmf_sonata_phpcr_admin_integration.abstract_admin">
             <tag
                     name="sonata.admin"
                     manager_type="doctrine_phpcr"

tests/Unit/Admin/Core/Extension/ChildExtensionTest.php

@@ -19,22 +19,19 @@ public function testAlterNewInstance()
     {
         $parent = new \StdClass();
 
-        $modelManager = $this->getMock('Sonata\AdminBundle\Model\ModelManagerInterface');
+        $modelManager = $this->createMock('Sonata\AdminBundle\Model\ModelManagerInterface');
         $modelManager->expects($this->any())
             ->method('find')
             ->will($this->returnValue($parent))
         ;
 
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
-            ->disableOriginalConstructor()
-            ->getMock()
-        ;
+        $request = $this->createMock('Symfony\Component\HttpFoundation\Request');
         $request->expects($this->any())
             ->method('get')
             ->will($this->returnValue('parent-id'))
         ;
 
-        $admin = $this->getMock('Sonata\AdminBundle\Admin\AdminInterface');
+        $admin = $this->createMock('Sonata\AdminBundle\Admin\AdminInterface');
         $admin->expects($this->any())
             ->method('getModelManager')
             ->will($this->returnValue($modelManager))
@@ -48,7 +45,7 @@ public function testAlterNewInstance()
             ->will($this->returnValue($request))
         ;
 
-        $child = $this->getMock('Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface');
+        $child = $this->createMock('Symfony\Cmf\Bundle\CoreBundle\Model\ChildInterface');
         $child->expects($this->once())
             ->method('setParentObject')
             ->with($this->equalTo($parent));