Merge pull request #179 from symfony-cmf/sf-28

Fix deprecations

Author: lsmith77

Admin/Extension/PublishTimePeriodExtension.php

@@ -40,6 +40,7 @@ public function __construct($formGroup = 'form.group_publish_workflow')
      */
     public function configureFormFields(FormMapper $formMapper)
     {
+        $dateType = method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix') ? 'Symfony\Component\Form\Extension\Core\Type\DateType' : 'date';
         $dateOptions = array(
             'empty_value' => '',
             'required' => false,
@@ -48,10 +49,10 @@ public function configureFormFields(FormMapper $formMapper)
         $formMapper->with($this->formGroup, array(
             'translation_domain' => 'CmfCoreBundle',
             ))
-            ->add('publish_start_date', 'date', $dateOptions, array(
+            ->add('publish_start_date', $dateType, $dateOptions, array(
                 'help' => 'form.help_publish_start_date',
             ))
-            ->add('publish_end_date', 'date', $dateOptions, array(
+            ->add('publish_end_date', $dateType, $dateOptions, array(
                 'help' => 'form.help_publish_end_date',
             ))
             ->end();

Admin/Extension/PublishableExtension.php

@@ -43,7 +43,7 @@ public function configureFormFields(FormMapper $formMapper)
         $formMapper->with($this->formGroup, array(
             'translation_domain' => 'CmfCoreBundle',
             ))
-            ->add('publishable', 'checkbox', array(
+            ->add('publishable', method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix') ? 'Symfony\Component\Form\Extension\Core\Type\CheckboxType' : 'checkbox', array(
                 'required' => false,
             ))
             ->end();

Admin/Extension/TranslatableExtension.php

@@ -65,7 +65,7 @@ public function configureFormFields(FormMapper $formMapper)
         $formMapper
             ->with($this->formGroup)
             // do not set a translation_domain for this group or group_general will be translated by our domain.
-            ->add('locale', 'choice', array(
+            ->add('locale', method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix') ? 'Symfony\Component\Form\Extension\Core\Type\ChoiceType' : 'choice', array(
                 'choices' => array_combine($this->locales, $this->locales),
                 'empty_value' => '',
             ), array('translation_domain' => 'CmfCoreBundle'))

Form/Type/CheckboxUrlLabelFormType.php

@@ -83,6 +83,14 @@ public function configureOptions(OptionsResolver $resolver)
      * {@inheritDoc}
      */
     public function getName()
+    {
+        return $this->getBlockPrefix();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getBlockPrefix()
     {
         return 'cmf_core_checkbox_url_label';
     }
@@ -92,7 +100,7 @@ public function getName()
      */
     public function getParent()
     {
-        return 'checkbox';
+        return method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix') ? 'Symfony\Component\Form\Extension\Core\Type\CheckboxType' : 'checkbox';
     }
 
 }

Tests/Functional/Form/CheckboxUrlLabelFormTypeTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Cmf\Bundle\CoreBundle\Tests\Functional\Form;
 
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Cmf\Component\Testing\Functional\BaseTestCase;
 
 class CheckboxUrlLabelFormTypeTest extends BaseTestCase
@@ -31,7 +32,7 @@ public function testFormTwigTemplate()
                 'routes' => array(
                     '%a%' => array('parameters' => array('content_id' => '/test/content/a')),
                     '%b%' => array('parameters' => array('content_id' => '/test/content/b')),
-                    '%c%' => array('name' => 'hello', 'parameters' => array('name' => 'world'), 'referenceType' => true),
+                    '%c%' => array('name' => 'hello', 'parameters' => array('name' => 'world'), 'referenceType' => UrlGeneratorInterface::ABSOLUTE_URL),
                 )
             ))
             ->getForm()

Tests/Unit/Twig/Extension/CmfExtensionTest.php

@@ -33,7 +33,7 @@ public function setUp()
         )->disableOriginalConstructor()->getMock();
 
         $this->cmfExtension = new CmfExtension($this->cmfHelper);
-        $this->env = new \Twig_Environment();
+        $this->env = new \Twig_Environment(new \Twig_Loader_Array(array()));
         $this->env->addExtension($this->cmfExtension);
     }