From f1f3fa7216d58e49b0178c7e617c6c125adebb12 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 25 Jun 2021 20:13:50 +0200 Subject: [PATCH 1/2] Add constructor injection for ExternalResource --- src/Model/Storage/ExternalResource.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Model/Storage/ExternalResource.php b/src/Model/Storage/ExternalResource.php index 9c57e3990..8d1aded15 100644 --- a/src/Model/Storage/ExternalResource.php +++ b/src/Model/Storage/ExternalResource.php @@ -22,7 +22,7 @@ namespace Friendica\Model\Storage; use BadMethodCallException; -use Friendica\DI; +use Friendica\Network\IHTTPRequest; /** * External resource storage class @@ -34,6 +34,14 @@ class ExternalResource implements IStorage { const NAME = 'ExternalResource'; + /** @var IHTTPRequest */ + private $httpRequest; + + public function __construct(IHTTPRequest $httpRequest) + { + $this->httpRequest = $httpRequest; + } + /** * @inheritDoc */ @@ -44,7 +52,7 @@ class ExternalResource implements IStorage return ""; } - $curlResult = DI::httpRequest()->get($filename); + $curlResult = $this->httpRequest->get($filename); if ($curlResult->isSuccess()) { return $curlResult->getBody(); } else { From b5acc07eafb0ef29003f002dad5275f49760e7ff Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 26 Jun 2021 21:17:10 +0200 Subject: [PATCH 2/2] Add todo for develop phase --- src/Model/Storage/IStorage.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Model/Storage/IStorage.php b/src/Model/Storage/IStorage.php index 8a9b60f73..0a0f58958 100644 --- a/src/Model/Storage/IStorage.php +++ b/src/Model/Storage/IStorage.php @@ -23,6 +23,8 @@ namespace Friendica\Model\Storage; /** * Interface for storage backends + * + * @todo Split this interface into "IStorage" for get() operations (including Resource fetching) and "IUserStorage" for real user backends including put/delete/options */ interface IStorage {