GDrive: fix error when no properties are set

iqb · Dec 30, 2018 · 0a7ce5d · 0a7ce5d
1 parent 8035a33
commit 0a7ce5d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Driver.php b/Driver.php
@@ -207,7 +207,7 @@ final public function refreshConnection() : bool
 
 
     /** @inheritdoc */
-    final public function fileFactory(string $fileName, FolderInterface $parent = null, string $id = null, int $size = null, string $md5 = null, array $properties = []) : FileInterface
+    final public function fileFactory(string $fileName, FolderInterface $parent = null, string $id = null, int $size = null, string $md5 = null, array $properties = null) : FileInterface
     {
         if ($this->fileFactory) {
             $file = ($this->fileFactory)($this, $parent, $id, $fileName, $size, $md5, $properties);
@@ -228,7 +228,7 @@ final public function setFileFactory(callable $fileFactory)
 
 
     /** @inheritdoc */
-    final public function folderFactory(string $folderName, FolderInterface $parent = null, string $id = null, array $properties = []) : FolderInterface
+    final public function folderFactory(string $folderName, FolderInterface $parent = null, string $id = null, array $properties = null) : FolderInterface
     {
         if ($this->folderFactory) {
             $folder = ($this->folderFactory)($this, $parent, $id, $folderName, $properties);

diff --git a/Entry.php b/Entry.php
@@ -41,16 +41,19 @@ abstract class Entry implements EntryInterface
      */
     public $properties;
 
+    /**
+     * @var Driver
+     */
     protected $driver;
 
 
-    public function __construct(Driver $driver, Folder $parent = null, string $id, string $name, array $properties = [])
+    public function __construct(Driver $driver, Folder $parent = null, string $id, string $name, array $properties = null)
     {
         $this->driver = $driver;
         $this->parent = $parent;
         $this->id = $id;
         $this->name = $name;
-        $this->properties = $properties;
+        $this->properties = ($properties ?: []);
 
         $parent->entries[$id] = $this;
     }

diff --git a/File.php b/File.php
@@ -26,7 +26,7 @@ class File extends Entry implements FileInterface
     private $size;
 
 
-    public function __construct(Driver $driver, Folder $parent, string $id, string $name, int $size, string $md5, array $properties = [])
+    public function __construct(Driver $driver, Folder $parent, string $id, string $name, int $size, string $md5, array $properties = null)
     {
         parent::__construct($driver, $parent, $id, $name, $properties);
         $this->size = $size;