Merge pull request #80 from symfony2admingenerator/symfony4-support

Added Symfony 4 support

Author: tobias-93

.gitignore

@@ -0,0 +1,4 @@
+.idea
+composer.lock
+composer.phar
+vendor

DependencyInjection/AdmingeneratorFormExtensionsExtension.php

@@ -4,7 +4,6 @@
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\DefinitionDecorator;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Definition;

DependencyInjection/Compiler/FormCompilerPass.php

@@ -4,6 +4,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Processes twig configuration
@@ -17,34 +18,25 @@ class FormCompilerPass implements CompilerPassInterface
      */
     public function process(ContainerBuilder $container)
     {
+        // Used templates
+        $templates = ['@AdmingeneratorFormExtensions/Form/form_html.html.twig',
+            '@AdmingeneratorFormExtensions/Form/form_js.html.twig',
+            '@AdmingeneratorFormExtensions/Form/form_css.html.twig'];
+
         if (($twigConfiguration = $container->getParameter('admingenerator.form.twig')) !== false) {
             $resources = $container->getParameter('twig.form.resources');
-            $alreadyImported = in_array('AdmingeneratorFormExtensionsBundle:Form:form_html.html.twig', $resources)
-                            && in_array('AdmingeneratorFormExtensionsBundle:Form:form_js.html.twig', $resources)
-                            && in_array('AdmingeneratorFormExtensionsBundle:Form:form_css.html.twig', $resources);
+            $alreadyImported = count(array_intersect($resources, $templates)) == count($templates);
 
             if ($twigConfiguration['use_form_resources'] && !$alreadyImported) {
                 if (($key = array_search('bootstrap_3_layout.html.twig', $resources)) !== false) {
                     // Insert right after bootstrap_3_layout.html.twig if exists
-                    array_splice($resources, ++$key, 0, array(
-                        'AdmingeneratorFormExtensionsBundle:Form:form_html.html.twig',
-                        'AdmingeneratorFormExtensionsBundle:Form:form_js.html.twig',
-                        'AdmingeneratorFormExtensionsBundle:Form:form_css.html.twig'
-                    ));
+                    array_splice($resources, ++$key, 0, $templates);
                 } else if (($key = array_search('form_div_layout.html.twig', $resources)) !== false) {
                     // Insert right after form_div_layout.html.twig if exists
-                    array_splice($resources, ++$key, 0, array(
-                        'AdmingeneratorFormExtensionsBundle:Form:form_html.html.twig',
-                        'AdmingeneratorFormExtensionsBundle:Form:form_js.html.twig',
-                        'AdmingeneratorFormExtensionsBundle:Form:form_css.html.twig'
-                    ));
+                    array_splice($resources, ++$key, 0, $templates);
                 } else {
                     // Put it in first position
-                    array_unshift($resources, array(
-                        'AdmingeneratorFormExtensionsBundle:Form:form_html.html.twig',
-                        'AdmingeneratorFormExtensionsBundle:Form:form_js.html.twig',
-                        'AdmingeneratorFormExtensionsBundle:Form:form_css.html.twig'
-                    ));
+                    array_unshift($resources, $templates);
                 }
 
                 $container->setParameter('twig.form.resources', $resources);

EventListener/UploadCollectionListener.php

@@ -88,7 +88,7 @@ private function fixPropertyPath($propertyPath)
 
     /**
      * @param array $files
-     * @return array
+     * @return \stdClass
      */
     private function formatResponse(array $files)
     {

Form/DataTransformer/ArrayToStringTransformer.php

@@ -26,7 +26,8 @@ class ArrayToStringTransformer implements DataTransformerInterface
     /**
      * Default constructor
      *
-     * @param string $glue
+     * @param string $separator
+     * @param array $keys
      */
     public function __construct($separator = ',', array $keys = array())
     {

Form/EventListener/ReorderCollectionSubscriber.php

@@ -4,9 +4,7 @@
 
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Form\FormInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\Form\FormBuilderInterface;
 
 /**
  * @author Piotr Gołębiewski <[email protected]>
@@ -26,7 +24,6 @@ public static function getSubscribedEvents()
     public function preSubmit(FormEvent $event)
     {
         $data = $event->getData();
-        $form = $event->getForm();
 
         if (is_array($data)) {
             $event->setData(array_values($data));

Form/EventListener/UploadCollectionSubscriber.php

@@ -9,7 +9,6 @@
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
  * @author Piotr Gołębiewski <[email protected]>

Form/Extension/NoValidateExtension.php

@@ -5,9 +5,7 @@
 use Symfony\Component\Form\AbstractTypeExtension;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * @author Piotr Gołębiewski <[email protected]>

Form/Model/UploadCollectionFileInterface.php

@@ -2,6 +2,8 @@
 
 namespace Admingenerator\FormExtensionsBundle\Form\Model;
 
+use Symfony\Component\HttpFoundation\File\File;
+
 /**
  * Interface for UploadCollectionType files.
  *
@@ -19,16 +21,16 @@ public function getSize();
     /**
      * Set governing entity
      *
-     * @var $parent Governing entity
+     * @var $parent object Governing entity
      */
     public function setParent($parent);
 
     /**
      * Set uploaded file
      *
-     * @var $file Uploaded file
+     * @var $file File Uploaded file
      */
-    public function setFile(\Symfony\Component\HttpFoundation\File\File $file);
+    public function setFile(File $file);
 
     /**
      * Get file

README.md

@@ -61,7 +61,7 @@ For Admingenerator users:
 {% block stylesheets %}
     {{ parent() }}
 
-    {% include 'AdmingeneratorFormExtensionsBundle::stylesheets.html.twig' %}
+    {% include '@AdmingeneratorFormExtensions/stylesheets.html.twig' %}
     {% if form is defined and form is not empty %}
         {{ form_css(form) }}
     {% endif %}
@@ -70,7 +70,7 @@ For Admingenerator users:
 {% block javascripts %}
     {{ parent() }}
 
-    {% include 'AdmingeneratorFormExtensionsBundle::javascripts.html.twig' %}
+    {% include '@AdmingeneratorFormExtensions/javascripts.html.twig' %}
     {% if form is defined and form is not empty %}
         {{ form_js(form) }}
     {% endif %}
@@ -81,15 +81,15 @@ For others:
 
 ```html+django
 {% block stylesheets %}
-    {% include 'AdmingeneratorFormExtensionsBundle::stylesheets.html.twig' %}
+    {% include '@AdmingeneratorFormExtensions/stylesheets.html.twig' %}
     
     {% if form is defined and form is not empty %}
         {{ form_css(form) }}
     {% endif %}
 {% endblock %}
 
 {% block javascripts %}
-    {% include 'AdmingeneratorFormExtensionsBundle::javascripts.html.twig' %}
+    {% include '@AdmingeneratorFormExtensions/javascripts.html.twig' %}
     
     {% if form is defined and form is not empty %}
         {{ form_js(form) }}