Merge branch 'master' into hotfix/work-on-prioritzed-job-list

Author: Henning

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## [0.10.14](https://github.com/php-enqueue/enqueue-dev/tree/0.10.14) (2021-10-29)
+[Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.13...0.10.14)
+
+**Merged pull requests:**
+
+- Fix passed parameters for compatibility with newest version of dbal [\#1203](https://github.com/php-enqueue/enqueue-dev/pull/1203) ([dgafka](https://github.com/dgafka))
+- Allow psr/log v2 and v3 [\#1198](https://github.com/php-enqueue/enqueue-dev/pull/1198) ([snapshotpl](https://github.com/snapshotpl))
+- Fix partition's choice for the cases when partition number is zero [\#1196](https://github.com/php-enqueue/enqueue-dev/pull/1196) ([rodrigosarmentopicpay](https://github.com/rodrigosarmentopicpay))
+- Added getter for offset field in RdKafkaConsumer class [\#1184](https://github.com/php-enqueue/enqueue-dev/pull/1184) ([DigitVE](https://github.com/DigitVE))
+
 ## [0.10.13](https://github.com/php-enqueue/enqueue-dev/tree/0.10.13) (2021-08-25)
 [Full Changelog](https://github.com/php-enqueue/enqueue-dev/compare/0.10.12...0.10.13)
 

pkg/dbal/DbalConsumerHelperTrait.php

@@ -90,7 +90,7 @@ protected function redeliverMessages(): void
             ->set('redelivered', ':redelivered')
             ->andWhere('redeliver_after < :now')
             ->andWhere('delivery_id IS NOT NULL')
-            ->setParameter(':now', time(), DbalType::BIGINT)
+            ->setParameter('now', time(), DbalType::BIGINT)
             ->setParameter('deliveryId', null, DbalType::GUID)
             ->setParameter('redelivered', true, DbalType::BOOLEAN)
         ;
@@ -118,7 +118,7 @@ protected function removeExpiredMessages(): void
             ->andWhere('delivery_id IS NULL')
             ->andWhere('redelivered = :redelivered')
 
-            ->setParameter(':now', time(), DbalType::BIGINT)
+            ->setParameter('now', time(), DbalType::BIGINT)
             ->setParameter('redelivered', false, DbalType::BOOLEAN)
         ;
 

pkg/dbal/Tests/Functional/DbalConsumerTest.php

@@ -173,7 +173,7 @@ private function getQuerySize(): int
     {
         return (int) $this->context->getDbalConnection()
             ->executeQuery('SELECT count(*) FROM '.$this->context->getTableName())
-            ->fetchColumn(0)
+            ->fetchOne()
         ;
     }
 }

pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php

@@ -6,6 +6,8 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Enqueue\Consumption\Context\MessageReceived;
 use Enqueue\Consumption\MessageReceivedExtensionInterface;
+use ErrorException;
+use Throwable;
 
 class DoctrinePingConnectionExtension implements MessageReceivedExtensionInterface
 {
@@ -27,7 +29,7 @@ public function onMessageReceived(MessageReceived $context): void
                 continue;
             }
 
-            if ($connection->ping()) {
+            if ($this->ping($connection)) {
                 continue;
             }
 
@@ -43,4 +45,23 @@ public function onMessageReceived(MessageReceived $context): void
             );
         }
     }
+
+    private function ping(Connection $connection): bool
+    {
+        set_error_handler(static function (int $severity, string $message, string $file, int $line): bool {
+            throw new ErrorException($message, $severity, $severity, $file, $line);
+        });
+
+        try {
+            $dummySelectSQL = $connection->getDatabasePlatform()->getDummySelectSQL();
+
+            $connection->executeQuery($dummySelectSQL);
+
+            return true;
+        } catch (Throwable $exception) {
+            return false;
+        } finally {
+            restore_error_handler();
+        }
+    }
 }

pkg/enqueue-bundle/Tests/Unit/Consumption/Extension/DoctrinePingConnectionExtensionTest.php

@@ -3,6 +3,7 @@
 namespace Enqueue\Bundle\Tests\Unit\Consumption\Extension;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\Persistence\ManagerRegistry;
 use Enqueue\Bundle\Consumption\Extension\DoctrinePingConnectionExtension;
 use Enqueue\Consumption\Context\MessageReceived;
@@ -29,10 +30,17 @@ public function testShouldNotReconnectIfConnectionIsOK()
             ->method('isConnected')
             ->willReturn(true)
         ;
+
+        $abstractPlatform = $this->createMock(AbstractPlatform::class);
+        $abstractPlatform->expects($this->once())
+            ->method('getDummySelectSQL')
+            ->willReturn('dummy')
+        ;
+
         $connection
             ->expects($this->once())
-            ->method('ping')
-            ->willReturn(true)
+            ->method('getDatabasePlatform')
+            ->willReturn($abstractPlatform)
         ;
         $connection
             ->expects($this->never())
@@ -68,10 +76,11 @@ public function testShouldDoesReconnectIfConnectionFailed()
             ->method('isConnected')
             ->willReturn(true)
         ;
+
         $connection
             ->expects($this->once())
-            ->method('ping')
-            ->willReturn(false)
+            ->method('getDatabasePlatform')
+            ->willThrowException(new \Exception())
         ;
         $connection
             ->expects($this->once())
@@ -118,7 +127,7 @@ public function testShouldSkipIfConnectionWasNotOpened()
         ;
         $connection1
             ->expects($this->never())
-            ->method('ping')
+            ->method('getDatabasePlatform')
         ;
 
         // 2nd connection was opened in the past
@@ -128,10 +137,16 @@ public function testShouldSkipIfConnectionWasNotOpened()
             ->method('isConnected')
             ->willReturn(true)
         ;
+        $abstractPlatform = $this->createMock(AbstractPlatform::class);
+        $abstractPlatform->expects($this->once())
+            ->method('getDummySelectSQL')
+            ->willReturn('dummy')
+        ;
+
         $connection2
             ->expects($this->once())
-            ->method('ping')
-            ->willReturn(true)
+            ->method('getDatabasePlatform')
+            ->willReturn($abstractPlatform)
         ;
 
         $context = $this->createContext();

pkg/enqueue-bundle/composer.json

@@ -20,6 +20,12 @@
         "source": "https://github.com/php-enqueue/enqueue-dev",
         "docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
     },
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/andrewmy/php-rabbitmq-management-api.git"
+        }
+    ],
     "require-dev": {
         "phpunit/phpunit": "^9.5",
         "enqueue/stomp": "0.10.x-dev",

pkg/job-queue/Tests/Functional/Entity/Job.php

@@ -95,7 +95,7 @@ class Job extends BaseJob
     /**
      * @var array
      *
-     * @ORM\Column(name="data", type="json_array", nullable=true)
+     * @ORM\Column(name="data", type="json", nullable=true)
      */
     protected $data;
 

pkg/null/.github/workflows/ci.yml

@@ -26,4 +26,4 @@ jobs:
         with:
           composer-options: "--prefer-source"
 
-      - run: vendor/bin/phpunit --exlude-group=functional
+      - run: vendor/bin/phpunit --exclude-group=functional

pkg/rdkafka/.github/workflows/ci.yml

@@ -22,8 +22,10 @@ jobs:
           php-version: ${{ matrix.php }}
           coverage: none
 
-      - run: php Tests/fix_composer_json.php
-
       - uses: "ramsey/composer-install@v1"
+        with: # ext-rdkafka not needed for tests, and a pain to install on CI;
+          composer-options: "--ignore-platform-req=ext-rdkafka"
+
+      - run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
 
       - run: vendor/bin/phpunit --exclude-group=functional