add missing command configuration

rmikalkenas · Apr 15, 2018 · 37bc4b3 · 37bc4b3
1 parent faaf662
commit 37bc4b3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/DependencyInjection/VichUploaderExtension.php b/DependencyInjection/VichUploaderExtension.php
@@ -60,7 +60,7 @@ protected function loadServicesFiles(ContainerBuilder $container, array $config)
 
         $toLoad = [
             'adapter.xml', 'listener.xml', 'storage.xml', 'injector.xml',
-            'mapping.xml', 'factory.xml', 'namer.xml', 'handler.xml',
+            'mapping.xml', 'factory.xml', 'namer.xml', 'handler.xml', 'command.xml'
         ];
         foreach ($toLoad as $file) {
             $loader->load($file);

diff --git a/Form/Type/VichFileType.php b/Form/Type/VichFileType.php
@@ -46,8 +46,12 @@ class VichFileType extends AbstractType
      */
     protected $propertyAccessor;
 
-    public function __construct(StorageInterface $storage, UploadHandler $handler, PropertyMappingFactory $factory, PropertyAccessorInterface $propertyAccessor = null)
-    {
+    public function __construct(
+        StorageInterface $storage,
+        UploadHandler $handler, 
+        PropertyMappingFactory $factory,
+        PropertyAccessorInterface $propertyAccessor = null
+    ) {
         $this->storage = $storage;
         $this->handler = $handler;
         $this->factory = $factory;

diff --git a/Form/Type/VichImageType.php b/Form/Type/VichImageType.php
@@ -20,12 +20,17 @@
 class VichImageType extends VichFileType
 {
     /**
-     * @var CacheManager
+     * @var CacheManager|null
      */
     private $cacheManager;
 
-    public function __construct(StorageInterface $storage, UploadHandler $handler, PropertyMappingFactory $factory, PropertyAccessorInterface $propertyAccessor = null, CacheManager $cacheManager = null)
-    {
+    public function __construct(
+        StorageInterface $storage,
+        UploadHandler $handler,
+        PropertyMappingFactory $factory,
+        PropertyAccessorInterface $propertyAccessor = null,
+        CacheManager $cacheManager = null
+    ) {
         parent::__construct($storage, $handler, $factory, $propertyAccessor);
         $this->cacheManager = $cacheManager;
     }
@@ -55,9 +60,9 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         $view->vars['image_uri'] = null;
         $view->vars['download_uri'] = null;
 
-        if ($object) {
+        if (null !== $object) {
             if ($options['imagine_pattern']) {
-                if (!$this->cacheManager) {
+                if (null === $this->cacheManager) {
                     throw new \RuntimeException('LiipImagineBundle must be installed and configured for using "imagine_pattern" option.');
                 }