Fixup Database behaviour

diff --git a/src/Model/Storage/Database.php b/src/Model/Storage/Database.php
index 9edfe2170897f6d08b832eaa06c572e518380467..a77e26811753ec0ee2c246cbf452f5a1648c0227 100644 (file)
--- a/src/Model/Storage/Database.php
+++ b/src/Model/Storage/Database.php
@@ -101,7 +101,7 @@ class Database implements ISelectableStorage
        public function delete(string $reference)
        {
                try {
-                       if (!$this->dba->delete('storage', ['id' => $reference])) {
+                       if (!$this->dba->delete('storage', ['id' => $reference]) || $this->dba->affectedRows() === 0) {
                                throw new ReferenceStorageException(sprintf('Database storage failed to delete %s', $reference));
                        }
                } catch (Exception $exception) {

diff --git a/tests/src/Model/Storage/DatabaseStorageTest.php b/tests/src/Model/Storage/DatabaseStorageTest.php
index 5e61ea13a420623d76afb855fe28be1705d83716..62c8e7f116d4d5310912e26a2f36df63cd1eca27 100644 (file)
--- a/tests/src/Model/Storage/DatabaseStorageTest.php
+++ b/tests/src/Model/Storage/DatabaseStorageTest.php
@@ -21,16 +21,14 @@
 
 namespace Friendica\Test\src\Model\Storage;
 
-use Friendica\Core\L10n;
 use Friendica\Factory\ConfigFactory;
 use Friendica\Model\Storage\Database;
-use Friendica\Model\Storage\IStorage;
+use Friendica\Model\Storage\ISelectableStorage;
 use Friendica\Test\DatabaseTestTrait;
 use Friendica\Test\Util\Database\StaticDatabase;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Profiler;
-use Mockery\MockInterface;
 use Psr\Log\NullLogger;
 
 class DatabaseStorageTest extends StorageTest
@@ -65,7 +63,7 @@ class DatabaseStorageTest extends StorageTest
                return new Database($dba);
        }
 
-       protected function assertOption(IStorage $storage)
+       protected function assertOption(ISelectableStorage $storage)
        {
                self::assertEmpty($storage->getOptions());
        }

diff --git a/tests/src/Model/Storage/FilesystemStorageTest.php b/tests/src/Model/Storage/FilesystemStorageTest.php
index 3319ea3fa4bd0779c7cf42d97a3422633e50f8b1..a0f267d183acc233f10a3f7050ecc213b9ed75df 100644 (file)
--- a/tests/src/Model/Storage/FilesystemStorageTest.php
+++ b/tests/src/Model/Storage/FilesystemStorageTest.php
@@ -24,13 +24,12 @@ namespace Friendica\Test\src\Model\Storage;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\L10n;
 use Friendica\Model\Storage\Filesystem;
-use Friendica\Model\Storage\IStorage;
+use Friendica\Model\Storage\ISelectableStorage;
 use Friendica\Model\Storage\StorageException;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\Profiler;
 use Mockery\MockInterface;
 use org\bovigo\vfs\vfsStream;
-use Psr\Log\NullLogger;
 
 class FilesystemStorageTest extends StorageTest
 {
@@ -65,7 +64,7 @@ class FilesystemStorageTest extends StorageTest
                return new Filesystem($this->config, $l10n);
        }
 
-       protected function assertOption(IStorage $storage)
+       protected function assertOption(ISelectableStorage $storage)
        {
                self::assertEquals([
                        'storagepath' => [

diff --git a/tests/src/Model/Storage/StorageTest.php b/tests/src/Model/Storage/StorageTest.php
index eadddcf02d879067bb05c71011328985c0a17a16..4001bfc68b0b6acff8652c1b044d8b1f6bd64168 100644 (file)
--- a/tests/src/Model/Storage/StorageTest.php
+++ b/tests/src/Model/Storage/StorageTest.php
@@ -21,17 +21,17 @@
 
 namespace Friendica\Test\src\Model\Storage;
 
+use Friendica\Model\Storage\ISelectableStorage;
 use Friendica\Model\Storage\IStorage;
 use Friendica\Model\Storage\ReferenceStorageException;
-use Friendica\Model\Storage\StorageException;
 use Friendica\Test\MockedTest;
 
 abstract class StorageTest extends MockedTest
 {
-       /** @return IStorage */
+       /** @return ISelectableStorage */
        abstract protected function getInstance();
 
-       abstract protected function assertOption(IStorage $storage);
+       abstract protected function assertOption(ISelectableStorage $storage);
 
        /**
         * Test if the instance is "really" implementing the interface