Make Storage testable & add tests

[friendica.git] / src / Model / Storage / Database.php

diff --git a/src/Model/Storage/Database.php b/src/Model/Storage/Database.php
index f9ad7fb7d41697c50b1b33204e0839594b0217e0..84dd116b526e834c4f2dd2bf6a193ff59bd2233f 100644 (file)
--- a/src/Model/Storage/Database.php
+++ b/src/Model/Storage/Database.php
@@ -6,9 +6,8 @@
 
 namespace Friendica\Model\Storage;
 
-use Friendica\Core\Logger;
 use Friendica\Core\L10n;
-use Friendica\Database\DBA;
+use Psr\Log\LoggerInterface;
 
 /**
  * @brief Database based storage system
@@ -17,41 +16,93 @@ use Friendica\Database\DBA;
  */
 class Database implements IStorage
 {
-       public static function get($ref)
+       const NAME = 'Database';
+
+       /** @var \Friendica\Database\Database */
+       private $dba;
+       /** @var LoggerInterface */
+       private $logger;
+       /** @var L10n\L10n */
+       private $l10n;
+
+       /**
+        * @param \Friendica\Database\Database $dba
+        * @param LoggerInterface              $logger
+        * @param L10n\L10n                    $l10n
+        */
+       public function __construct(\Friendica\Database\Database $dba, LoggerInterface $logger, L10n\L10n $l10n)
+       {
+               $this->dba    = $dba;
+               $this->logger = $logger;
+               $this->l10n   = $l10n;
+       }
+
+       /**
+        * @inheritDoc
+        */
+       public function get(string $reference)
        {
-               $r = DBA::selectFirst('storage', ['data'], ['id' => $ref]);
-               if (!DBA::isResult($r)) {
+               $result = $this->dba->selectFirst('storage', ['data'], ['id' => $reference]);
+               if (!$this->dba->isResult($result)) {
                        return '';
                }
 
-               return $r['data'];
+               return $result['data'];
        }
 
-       public static function put($data, $ref = '')
+       /**
+        * @inheritDoc
+        */
+       public function put(string $data, string $reference = '')
        {
-               if ($ref !== '') {
-                       $r = DBA::update('storage', ['data' => $data], ['id' => $ref]);
-                       if ($r === false) {
-                               Logger::log('Failed to update data with id ' . $ref . ': ' . DBA::errorNo() . ' : ' . DBA::errorMessage());
-                               throw new StorageException(L10n::t('Database storage failed to update %s', $ref));
+               if ($reference !== '') {
+                       $result = $this->dba->update('storage', ['data' => $data], ['id' => $reference]);
+                       if ($result === false) {
+                               $this->logger->warning('Failed to update data.', ['id' => $reference, 'errorCode' =>  $this->dba->errorNo(), 'errorMessage' => $this->dba->errorMessage()]);
+                               throw new StorageException($this->l10n->t('Database storage failed to update %s', $reference));
                        }
-                       return $ref;
+
+                       return $reference;
                } else {
-                       $r = DBA::insert('storage', ['data' => $data]);
-                       if ($r === false) {
-                               Logger::log('Failed to insert data: ' . DBA::errorNo() . ' : ' . DBA::errorMessage());
-                               throw new StorageException(L10n::t('Database storage failed to insert data'));
+                       $result = $this->dba->insert('storage', ['data' => $data]);
+                       if ($result === false) {
+                               $this->logger->warning('Failed to insert data.', ['errorCode' =>  $this->dba->errorNo(), 'errorMessage' => $this->dba->errorMessage()]);
+                               throw new StorageException($this->l10n->t('Database storage failed to insert data'));
                        }
-                       return DBA::lastInsertId();
+
+                       return $this->dba->lastInsertId();
                }
        }
 
-       public static function delete($ref)
+       /**
+        * @inheritDoc
+        */
+       public function delete(string $reference)
+       {
+               return $this->dba->delete('storage', ['id' => $reference]);
+       }
+
+       /**
+        * @inheritDoc
+        */
+       public function getOptions()
+       {
+               return [];
+       }
+
+       /**
+        * @inheritDoc
+        */
+       public function saveOptions(array $data)
+       {
+               return [];
+       }
+
+       /**
+        * @inheritDoc
+        */
+       public function __toString()
        {
-               return DBA::delete('storage', ['id' => $ref]);
+               return self::NAME;
        }
-       
-       public static function getOptions() { return []; }
-       
-       public static function saveOptions($data) { return []; }
 }