Merge pull request #30 from jmsche/master

Fixed Symfony 2.7 deprecated + renamed String to StringUtil for PHP7 compatibility

Author: Jérôme Poskin

Form/Type/FileType.php

@@ -2,18 +2,21 @@
 
 namespace Snowcap\CoreBundle\Form\Type;
 
+use Snowcap\CoreBundle\File\CondemnedFile;
+use Snowcap\CoreBundle\Form\DataTransformer\FileDataTransformer;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormEvents;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 
-use Snowcap\CoreBundle\Form\DataTransformer\FileDataTransformer;
-use Snowcap\CoreBundle\File\CondemnedFile;
-
+/**
+ * Class FileType
+ * @package Snowcap\CoreBundle\Form\Type
+ */
 class FileType extends AbstractType
 {
     /**

Form/Type/ImageType.php

@@ -4,7 +4,12 @@
 
 use Symfony\Component\Form\AbstractType;
 
-class ImageType extends AbstractType {
+/**
+ * Class ImageType
+ * @package Snowcap\CoreBundle\Form\Type
+ */
+class ImageType extends AbstractType
+{
     /**
      * Returns the name of this type.
      *
@@ -16,7 +21,6 @@ function getName()
     }
 
     /**
-     * @param array $options
      * @return null|string
      */
     public function getParent()

Form/Type/SoundType.php

@@ -3,10 +3,14 @@
 namespace Snowcap\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * Class SoundType
+ * @package Snowcap\CoreBundle\Form\Type
+ */
 class SoundType extends AbstractType
 {
     /**

Form/Type/VideoType.php

@@ -3,10 +3,14 @@
 namespace Snowcap\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * Class VideoType
+ * @package Snowcap\CoreBundle\Form\Type
+ */
 class VideoType extends AbstractType
 {
     /**
@@ -31,7 +35,7 @@ public function getParent()
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-            ->setOptional(array('provider'))
+            ->setDefined(array('provider'))
             ->setAllowedValues(array(
                 'provider' => array('youtube', 'tudou', 'vimeo', 'dailymotion')
             ));

Listener/FileSubscriber.php

@@ -4,19 +4,22 @@
 
 use Doctrine\Common\Annotations\AnnotationException;
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\ORM\Event\OnFlushEventArgs;
-use Snowcap\CoreBundle\Util\String;
-use Symfony\Component\HttpFoundation\File\File;
 use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
+use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Event\PreFlushEventArgs;
 use Doctrine\ORM\Events;
-
 use Snowcap\CoreBundle\File\CondemnedFile;
+use Snowcap\CoreBundle\Util\StringUtil;
+use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 
+/**
+ * Class FileSubscriber
+ * @package Snowcap\CoreBundle\Listener
+ */
 class FileSubscriber implements EventSubscriber
 {
     /**
@@ -62,7 +65,7 @@ public function getSubscribedEvents()
 
     /**
      * @param \Doctrine\ORM\Event\LoadClassMetadataEventArgs $eventArgs
-     * @throws \UnexpectedValueException
+     * @throws AnnotationException
      */
     public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs)
     {
@@ -346,7 +349,7 @@ private function generateFileName($fileEntity, array $fileConfig)
         if ($fileConfig['nameCallback'] !== null) {
             $accessor = PropertyAccess::createPropertyAccessor();
             $filename = $accessor->getValue($fileEntity, $fileConfig['nameCallback']);
-            $filename = String::slugify($filename);
+            $filename = StringUtil::slugify($filename);
 
             /*
              * Here we add a uniqid at the end of the filename to avoid any cache issue

Twig/Extension/TextExtension.php

@@ -2,11 +2,14 @@
 
 namespace Snowcap\CoreBundle\Twig\Extension;
 
-use Snowcap\CoreBundle\Util\String;
+use Snowcap\CoreBundle\Util\StringUtil;
 
+/**
+ * Class TextExtension
+ * @package Snowcap\CoreBundle\Twig\Extension
+ */
 class TextExtension extends \Twig_Extension
 {
-
     const MISSING_EXTENSION_EXCEPTION = 10;
 
     /**
@@ -48,10 +51,11 @@ public function getFilters()
 
     /**
      * @param $string
+     * @return string
      */
     public function camelize($string)
     {
-        return String::camelize($string);
+        return StringUtil::camelize($string);
     }
 
     /**

UPGRADE-3.0.md

@@ -0,0 +1,3 @@
+# Upgrade to 3.0
+
+The ``String`` class has been renamed to ``StringUtil`` as "string" is a reserved word in PHP7.

Util/String.php Util/StringUtil.php

@@ -2,7 +2,12 @@
 
 namespace Snowcap\CoreBundle\Util;
 
-class String {
+/**
+ * Class StringUtil
+ * @package Snowcap\CoreBundle\Util
+ */
+class StringUtil
+{
     /**
      * Camelizes a string.
      *