From 8e7d4298b909e1ca0deaf8be5cc5292052d52584 Mon Sep 17 00:00:00 2001 From: David Windell Date: Tue, 7 Dec 2021 19:19:31 +0000 Subject: [PATCH] Improve factory definition to match core --- Model/File/Storage/Synchronization.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Model/File/Storage/Synchronization.php b/Model/File/Storage/Synchronization.php index c840767..c9c0bf5 100644 --- a/Model/File/Storage/Synchronization.php +++ b/Model/File/Storage/Synchronization.php @@ -10,7 +10,7 @@ class Synchronization /** * @var BucketFactory */ - protected $bucket; + protected $storageFactory; /** * File stream handler @@ -20,11 +20,11 @@ class Synchronization protected $mediaDirectory; public function __construct( - DirectoryWrite $directory, - BucketFactory $bucket + BucketFactory $storageFactory, + DirectoryWrite $directory ) { + $this->storageFactory = $storageFactory; $this->mediaDirectory = $directory; - $this->bucket = $bucket; } /** @@ -35,9 +35,14 @@ public function __construct( */ public function synchronize($relativeFileName) { - $storage = $this->bucket->loadByFilename($relativeFileName); - + /** @var $storage Bucket */ + $storage = $this->storageFactory->create(); + try { + $storage->loadByFilename($relativeFileName); + } catch (\Exception $e) { + } if ($storage->getId()) { + /** @var WriteInterface $file */ $file = $this->mediaDirectory->openFile($relativeFileName, 'w'); try { $file->lock();