fix

rmikalkenas · Mar 29, 2019 · a8fcee8 · a8fcee8
1 parent 8da930c
commit a8fcee8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/Metadata/Driver/AnnotationDriver.php b/Metadata/Driver/AnnotationDriver.php
@@ -31,10 +31,10 @@ public function __construct(AnnotationReader $reader)
         $this->reader = $reader;
     }
 
-    public function loadMetadataForClass(\ReflectionClass $class): ?JMSClassMetadata
+    public function loadMetadataForClass(\ReflectionClass $class)
     {
         if (!$this->isUploadable($class)) {
-            return null;
+            return;
         }
 
         $classMetadata = new ClassMetadata($class->name);

diff --git a/Metadata/Driver/XmlDriver.php b/Metadata/Driver/XmlDriver.php
@@ -2,7 +2,6 @@
 
 namespace Vich\UploaderBundle\Metadata\Driver;
 
-use Metadata\ClassMetadata as JMSClassMetadata;
 use Metadata\Driver\AbstractFileDriver;
 use Symfony\Component\Config\Util\XmlUtils;
 use Vich\UploaderBundle\Metadata\ClassMetadata;
@@ -13,7 +12,7 @@
  */
 class XmlDriver extends AbstractFileDriver
 {
-    protected function loadMetadataFromFile(\ReflectionClass $class, string $file): ?JMSClassMetadata
+    protected function loadMetadataFromFile(\ReflectionClass $class, $file)
     {
         $elem = XmlUtils::loadFile($file);
         $elem = \simplexml_import_dom($elem);

diff --git a/Metadata/Driver/YamlDriver.php b/Metadata/Driver/YamlDriver.php
@@ -2,7 +2,6 @@
 
 namespace Vich\UploaderBundle\Metadata\Driver;
 
-use Metadata\ClassMetadata as JMSClassMetadata;
 use Metadata\Driver\AbstractFileDriver;
 use Symfony\Component\Yaml\Yaml as YmlParser;
 use Vich\UploaderBundle\Metadata\ClassMetadata;
@@ -16,7 +15,7 @@ class YamlDriver extends AbstractFileDriver
     /**
      * {@inheritdoc}
      */
-    protected function loadMetadataFromFile(\ReflectionClass $class, string $file): ?JMSClassMetadata
+    protected function loadMetadataFromFile(\ReflectionClass $class, $file)
     {
         $config = $this->loadMappingFile($file);
         $className = $this->guessClassName($file, $config, $class);

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "doctrine/orm": "^2.5",
         "knplabs/knp-gaufrette-bundle": "^0.5",
         "matthiasnoback/symfony-dependency-injection-test": "^2.3|^3.0",
-        "mikey179/vfsStream": "^1.6",
+        "mikey179/vfsstream": "^1.6",
         "oneup/flysystem-bundle": "^3.0",
         "phpunit/phpunit": "^6.5|^7.0",
         "symfony/browser-kit": "^3.4|^4.0",