Raw content is now stored with announce messages as well

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

diff --git a/src/Model/Storage/Database.php b/src/Model/Storage/Database.php
index 84dd116b526e834c4f2dd2bf6a193ff59bd2233f..c7eb3628cf97e0c87b40cc4bced22fbb72dc40d0 100644 (file)
--- a/src/Model/Storage/Database.php
+++ b/src/Model/Storage/Database.php
@@ -1,40 +1,52 @@
 <?php
 /**
- * @file src/Model/Storage/Filesystem.php
- * @brief Storage backend system
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Model\Storage;
 
 use Friendica\Core\L10n;
 use Psr\Log\LoggerInterface;
+use Friendica\Database\Database as DBA;
 
 /**
- * @brief Database based storage system
+ * Database based storage system
  *
  * This class manage data stored in database table.
  */
-class Database implements IStorage
+class Database extends AbstractStorage
 {
        const NAME = 'Database';
 
-       /** @var \Friendica\Database\Database */
+       /** @var DBA */
        private $dba;
-       /** @var LoggerInterface */
-       private $logger;
-       /** @var L10n\L10n */
-       private $l10n;
 
        /**
-        * @param \Friendica\Database\Database $dba
-        * @param LoggerInterface              $logger
-        * @param L10n\L10n                    $l10n
+        * @param DBA             $dba
+        * @param LoggerInterface $logger
+        * @param L10n            $l10n
         */
-       public function __construct(\Friendica\Database\Database $dba, LoggerInterface $logger, L10n\L10n $l10n)
+       public function __construct(DBA $dba, LoggerInterface $logger, L10n $l10n)
        {
-               $this->dba    = $dba;
-               $this->logger = $logger;
-               $this->l10n   = $l10n;
+               parent::__construct($l10n, $logger);
+
+               $this->dba = $dba;
        }
 
        /**
@@ -58,15 +70,15 @@ class Database implements IStorage
                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()]);
+                               $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 $reference;
                } else {
                        $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()]);
+                               $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'));
                        }
 
@@ -101,7 +113,7 @@ class Database implements IStorage
        /**
         * @inheritDoc
         */
-       public function __toString()
+       public static function getName()
        {
                return self::NAME;
        }