[BC] Remove deprecated code for Symfony 2.7

Author: Jérôme Poskin

Form/Extension/CollectionTypeExtension.php

@@ -3,7 +3,7 @@
 namespace Snowcap\CoreBundle\Form\Extension;
 
 use Symfony\Component\Form\AbstractTypeExtension;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
 
@@ -17,9 +17,9 @@ public function getExtendedType()
     }
 
     /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'add_label' => 'Add'

Form/Type/FileType.php

@@ -6,7 +6,7 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\PropertyAccess\PropertyAccess;
@@ -38,9 +38,9 @@ public function getParent()
     }
 
     /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setRequired(array(
@@ -77,7 +77,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 $data = $event->getData();
                 if($data['file'] instanceof CondemnedFile) {
                     $parentForm = $event->getForm()->getParent();
-                    $accessor = PropertyAccess::getPropertyAccessor();
+                    $accessor = PropertyAccess::createPropertyAccessor();
                     $imagePath = $accessor->getValue($parentForm->getData(), $filePath);
                     $data['file']->setPath($uploadDir . '/' . $imagePath);
                 }

Form/Type/SoundType.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class SoundType extends AbstractType
 {
@@ -26,9 +26,9 @@ public function getParent()
     }
 
     /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setDefaults(array(

Form/Type/VideoType.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class VideoType extends AbstractType
 {
@@ -26,9 +26,9 @@ public function getParent()
     }
 
     /**
-     * @param \Symfony\Component\OptionsResolver\OptionsResolverInterface $resolver
+     * @param OptionsResolver $resolver
      */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
             ->setOptional(array('provider'))

README.md

@@ -9,21 +9,28 @@ The Snowcap Core Bundle is a bundle used at Snowcap to help us with some repetit
 * RSS feed generation
 * SEO-related tasks (sitemaps, etc)
 
-## Prerequisites
-
-This version of the bundle requires Symfony 2.2+. If you are using Symfony
-2.1.x, please use the 2.1.x branch of the bundle.
-
 ## Installation
 
 ### Download SnowcapCoreBundle using composer
 
 Add SnowcapCoreBundle in your composer.json:
 
+### For Symfony < 2.7
+
+```js
+{
+    "require": {
+        "snowcap/core-bundle": "~1.0"
+    }
+}
+```
+
+### For Symfony >= 2.7
+
 ```js
 {
     "require": {
-        "snowcap/core-bundle": "dev-master"
+        "snowcap/core-bundle": "~2.0"
     }
 }
 ```

Twig/Node/PaginatorThemeNode.php

@@ -5,12 +5,12 @@
 class PaginatorThemeNode extends \Twig_Node
 {
     /**
-     * @param \Twig_NodeInterface $datalist
-     * @param \Twig_NodeInterface $resources
+     * @param \Twig_Node $paginator
+     * @param \Twig_Node $resources
      * @param $lineno
      * @param null $tag
      */
-    public function __construct(\Twig_NodeInterface $paginator, \Twig_NodeInterface $resources, $lineno, $tag = null)
+    public function __construct(\Twig_Node $paginator, \Twig_Node $resources, $lineno, $tag = null)
     {
         parent::__construct(array('paginator' => $paginator, 'resources' => $resources), array(), $lineno, $tag);
     }

composer.json

@@ -26,10 +26,10 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.3.3",
-        "symfony/framework-bundle": ">=2.2"
+        "symfony/framework-bundle": ">=2.7"
     },
     "require-dev": {
-        "symfony/symfony": ">=2.2",
+        "symfony/symfony": ">=2.7",
         "fzaninotto/faker": "1.1.*@dev",
         "doctrine/orm": ">=2.2.3",
         "doctrine/doctrine-bundle": "1.2.*",
@@ -41,7 +41,7 @@
     "target-dir": "Snowcap/CoreBundle",
     "extra": {
         "branch-alias": {
-            "dev-master": "2.3.x-dev"
+            "dev-master": "2.7-dev"
         }
     }
 }