temporary disable amphp/postgres tests

php-service-bus · Dec 4, 2021 · 731180b · 731180b
1 parent 92bdf6e
commit 731180b
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
     "boesing/psalm-plugin-stringf": "v1.1.*"
   },
   "prefer-stable": true,
-  "minimum-stability": "stable",
+  "minimum-stability": "dev",
   "scripts": {
     "psalm": "rm -rf ~/.cache/psalm/ && ./vendor/bin/psalm --config=psalm.xml",
     "phpstan": "./vendor/bin/phpstan analyse src --level 9",

diff --git a/phpunit.xml b/phpunit.xml
@@ -39,4 +39,9 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
+    <groups>
+        <exclude>
+            <group>amphp</group>
+        </exclude>
+    </groups>
 </phpunit>
diff --git a/src/Sql/Finder/CachedSqlFinder.php b/src/Sql/Finder/CachedSqlFinder.php
@@ -102,7 +102,7 @@ function () use ($criteria): \Generator
         );
     }
 
-    public function find(array $criteria, ?int $offset, ?int $limit = null, ?array $orderBy = null): Promise
+    public function find(array $criteria, ?int $offset = null, ?int $limit = null, ?array $orderBy = null): Promise
     {
         return call(
             function () use ($criteria, $offset, $limit, $orderBy): \Generator

diff --git a/src/Sql/Finder/SimpleSqlFinder.php b/src/Sql/Finder/SimpleSqlFinder.php
@@ -78,7 +78,7 @@ function () use ($criteria): \Generator
         );
     }
 
-    public function find(array $criteria, ?int $offset, ?int $limit = null, ?array $orderBy = null): Promise
+    public function find(array $criteria, ?int $offset = null, ?int $limit = null, ?array $orderBy = null): Promise
     {
         return call(
             function () use ($criteria, $offset, $limit, $orderBy): \Generator

diff --git a/src/Sql/Finder/SqlFinder.php b/src/Sql/Finder/SqlFinder.php
@@ -61,5 +61,5 @@ public function findOneBy(array $criteria): Promise;
      * @throws \ServiceBus\Storage\Common\Exceptions\StorageInteractingFailed
      * @throws \ServiceBus\Storage\Common\Exceptions\ResultSetIterationFailed
      */
-    public function find(array $criteria, ?int $offset, ?int $limit = null, ?array $orderBy = null): Promise;
+    public function find(array $criteria, ?int $offset = null, ?int $limit = null, ?array $orderBy = null): Promise;
 }
diff --git a/tests/Sql/AmpPostgreSQL/AmpPostgreSQLAdapterTest.php b/tests/Sql/AmpPostgreSQL/AmpPostgreSQLAdapterTest.php
@@ -24,7 +24,7 @@
 use function ServiceBus\Storage\Sql\AmpPosgreSQL\postgreSqlAdapterFactory;
 
 /**
- *
+ * @group amphp
  */
 final class AmpPostgreSQLAdapterTest extends BaseStorageAdapterTest
 {

diff --git a/tests/Sql/AmpPostgreSQL/AmpPostgreSQLResultSetTest.php b/tests/Sql/AmpPostgreSQL/AmpPostgreSQLResultSetTest.php
@@ -24,7 +24,7 @@
 use function ServiceBus\Storage\Sql\fetchOne;
 
 /**
- *
+ * @group amphp
  */
 final class AmpPostgreSQLResultSetTest extends TestCase
 {

diff --git a/tests/Sql/AmpPostgreSQL/AmpPostgreSQLTransactionTest.php b/tests/Sql/AmpPostgreSQL/AmpPostgreSQLTransactionTest.php
@@ -21,7 +21,7 @@
 use function ServiceBus\Storage\Sql\AmpPosgreSQL\postgreSqlAdapterFactory;
 
 /**
- *
+ * @group amphp
  */
 final class AmpPostgreSQLTransactionTest extends BaseTransactionTest
 {

diff --git a/tests/Sql/DoctrineDBAL/DoctrineDBALAdapterTest.php b/tests/Sql/DoctrineDBAL/DoctrineDBALAdapterTest.php
@@ -25,7 +25,7 @@
 use function ServiceBus\Storage\Sql\DoctrineDBAL\inMemoryAdapter;
 
 /**
- *
+ * @group inmemory
  */
 final class DoctrineDBALAdapterTest extends BaseStorageAdapterTest
 {

diff --git a/tests/Sql/DoctrineDBAL/DoctrineDBALResultSetTest.php b/tests/Sql/DoctrineDBAL/DoctrineDBALResultSetTest.php
@@ -24,7 +24,7 @@
 use function ServiceBus\Storage\Sql\fetchOne;
 
 /**
- *
+ * @group inmemory
  */
 final class DoctrineDBALResultSetTest extends TestCase
 {

diff --git a/tests/Sql/DoctrineDBAL/DoctrineDBALTransactionTest.php b/tests/Sql/DoctrineDBAL/DoctrineDBALTransactionTest.php
@@ -21,7 +21,7 @@
 use function ServiceBus\Storage\Sql\DoctrineDBAL\inMemoryAdapter;
 
 /**
- *
+ * @group inmemory
  */
 final class DoctrineDBALTransactionTest extends BaseTransactionTest
 {

diff --git a/tests/Sql/Finder/CachedSqlFinderTest.php b/tests/Sql/Finder/CachedSqlFinderTest.php
@@ -10,7 +10,7 @@
  * @license https://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace ServiceBus\Storage\Tests\Sql\Finder;
 
@@ -20,6 +20,7 @@
 use ServiceBus\Storage\Common\DatabaseAdapter;
 use ServiceBus\Storage\Sql\Finder\CachedSqlFinder;
 use function Amp\Promise\wait;
+use function Latitude\QueryBuilder\criteria;
 use function ServiceBus\Common\uuid;
 use function ServiceBus\Storage\Sql\DoctrineDBAL\inMemoryAdapter;
 
@@ -68,7 +69,7 @@ protected function tearDown(): void
     public function selectOne(): void
     {
         Loop::run(
-            static function (): \Generator
+            static function(): \Generator
             {
                 yield self::$adapter->execute(
                     'INSERT INTO qwerty(id, title) VALUES(?,?), (?,?)',
@@ -91,7 +92,7 @@ static function (): \Generator
 
                 /** @noinspection PhpInternalEntityUsedInspection */
                 self::assertTrue(
-                    InMemoryStorage::instance()->has('6e1488a47d01310e8697f3e980935b2d4d2c8df3')
+                    InMemoryStorage::instance()->has('5b601b4ee0e739b9a3e13dbf08a5aa6c00898de4')
                 );
 
                 /** @var array $entry */
@@ -111,7 +112,7 @@ static function (): \Generator
     public function selectAll(): void
     {
         Loop::run(
-            static function (): \Generator
+            static function(): \Generator
             {
                 yield self::$adapter->execute(
                     'INSERT INTO qwerty(id, title) VALUES(?,?), (?,?)',
@@ -121,19 +122,27 @@ static function (): \Generator
                 $finder = new CachedSqlFinder('qwerty', self::$adapter);
 
                 /** @var array $rows */
-                $rows = yield $finder->find([], 100, ['id' => 'DESC']);
+                $rows = yield $finder->find(
+                    criteria: [],
+                    limit: 100,
+                    orderBy: ['id' => 'DESC']
+                );
 
                 self::assertCount(2, $rows);
 
                 /** Cached */
 
                 /** @noinspection PhpInternalEntityUsedInspection */
                 self::assertTrue(
-                    InMemoryStorage::instance()->has('5c2a559f629ec7eb8cc42876c6fec726b3ab82f2')
+                    InMemoryStorage::instance()->has('eab2eef3f648338cde6ccef7ec84db4041ef6266')
                 );
 
                 /** @var array $rows */
-                $rows = yield $finder->find([], 100, ['id' => 'DESC']);
+                $rows = yield $finder->find(
+                    criteria: [],
+                    limit: 100,
+                    orderBy: ['id' => 'DESC']
+                );
 
                 self::assertCount(2, $rows);
             }

diff --git a/tests/Sql/Finder/SimpleSqlFinderTest.php b/tests/Sql/Finder/SimpleSqlFinderTest.php
@@ -10,7 +10,7 @@
  * @license https://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace ServiceBus\Storage\Tests\Sql\Finder;
 
@@ -68,7 +68,7 @@ protected function tearDown(): void
     public function selectOne(): void
     {
         Loop::run(
-            static function (): \Generator
+            static function(): \Generator
             {
                 yield self::$adapter->execute(
                     'INSERT INTO qwerty(id, title) VALUES(?,?), (?,?)',
@@ -96,7 +96,7 @@ static function (): \Generator
     public function selectAll(): void
     {
         Loop::run(
-            static function (): \Generator
+            static function(): \Generator
             {
                 yield self::$adapter->execute(
                     'INSERT INTO qwerty(id, title) VALUES(?,?), (?,?)',
@@ -106,7 +106,11 @@ static function (): \Generator
                 $finder = new SimpleSqlFinder('qwerty', self::$adapter);
 
                 /** @var array $rows */
-                $rows = yield $finder->find([], 100, ['id' => 'DESC']);
+                $rows = yield $finder->find(
+                    criteria: [],
+                    limit: 100,
+                    orderBy: ['id' => 'DESC']
+                );
 
                 self::assertCount(2, $rows);
             }

diff --git a/tests/Sql/Migration/SqlMigrationProcessorTest.php b/tests/Sql/Migration/SqlMigrationProcessorTest.php
@@ -19,7 +19,7 @@
 use ServiceBus\Storage\Sql\Migration\SqlMigrationLoader;
 use ServiceBus\Storage\Sql\Migration\SqlMigrationProcessor;
 use function Amp\Promise\wait;
-use function ServiceBus\Storage\Sql\AmpPosgreSQL\postgreSqlAdapterFactory;
+use function ServiceBus\Storage\Sql\DoctrineDBAL\inMemoryAdapter;
 
 /**
  *
@@ -40,7 +40,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->storage            = postgreSqlAdapterFactory((string) \getenv('TEST_POSTGRES_DSN'));
+        $this->storage            = inMemoryAdapter();
         $this->migrationProcessor = new SqlMigrationProcessor(
             $this->storage,
             new SqlMigrationLoader(__DIR__ . '/stubs')

diff --git a/tests/Sql/Migration/stubs/Version201912201932.php b/tests/Sql/Migration/stubs/Version201912201932.php
@@ -16,11 +16,11 @@ final class Version201912201932 extends Migration
 {
     protected function up(): void
     {
-        $this->add('SELECT NOW()');
+        $this->add('SELECT date(\'now\')');
     }
 
     protected function down(): void
     {
-        $this->add('SELECT NOW()');
+        $this->add('SELECT date(\'now\')');
     }
 }
diff --git a/tests/Sql/Migration/stubs/Version202001152036.php b/tests/Sql/Migration/stubs/Version202001152036.php
@@ -19,7 +19,7 @@ final class Version202001152036 extends Migration
 {
     protected function up(): void
     {
-        $this->add('SELECT NOW()');
+        $this->add('SELECT date(\'now\')');
     }
 
     protected function down(): void