Merge pull request #8 from apacheborys/clean-up-docker-and-fix-pdo-transport

fix transport, fix styles, delete docker files, introduce github actions

Author: apacheborys

.github/workflows/php.yml

@@ -0,0 +1,42 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install dependencies
+      run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-memcached
+
+    - name: Update dependencies
+      run: composer update
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate --strict
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v3
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php-
+
+    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+    # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+    - name: Run test suite
+      run: composer test

composer.json

@@ -11,14 +11,13 @@
     ],
     "require": {
         "php": "^7.4||^8.0",
-        "apacheborys/re-try-php": "*",
+        "apacheborys/re-try-php": "^0.15",
         "psr/log": "^1.1"
     },
     "require-dev": {
         "ext-mongodb": "*",
         "ext-json": "*",
         "ext-pdo": "*",
-        "ext-inotify": "*",
         "ext-memcached": "*",
         "phpunit/phpunit": "9.5.21",
         "vimeo/psalm": "^4.30"

docker-compose.yml

@@ -20,5 +20,10 @@
                 <file name="src/BasicTransport/Migration/MongoDbTransportMigration.php" />
             </errorLevel>
         </PossiblyInvalidArgument>
+        <UnresolvableInclude>
+            <errorLevel type="suppress">
+                <file name="src/Common/WarmUpService.php" />
+            </errorLevel>
+        </UnresolvableInclude>
     </issueHandlers>
 </psalm>

docker-image/Dockerfile

@@ -123,7 +123,7 @@ public function getCorrelationId(Throwable $exception, Config $config): string
             $id = $config->getTransport()->getNextId($exception, $config);
         }
 
-        return (string) $id;
+        return $id;
     }
 
     private function compileArguments(Message $message): string

psalm.xml

@@ -35,6 +35,7 @@ class DbPdoTransport implements Transport
         self::COLUMN_IS_PROCESSED,
         self::COLUMN_SHOULD_BE_EXECUTED_AT,
         self::COLUMN_EXECUTOR,
+        self::COLUMN_CREATED_AT,
     ];
 
     private PDO $pdo;
@@ -74,6 +75,7 @@ public function send(Message $message): bool
         $isProcessed = $message->getIsProcessed();
         $shouldBeExecutedAt = $message->getShouldBeExecutedAt()->format('c');
         $executor = $message->getExecutor();
+        $createdAt = (new \DateTimeImmutable())->setTimezone(new \DateTimeZone('UTC'))->format('c');
 
         $st = $this->pdo->prepare($sql);
         $st->bindParam(self::COLUMN_ID, $id);
@@ -84,6 +86,7 @@ public function send(Message $message): bool
         $st->bindParam(self::COLUMN_IS_PROCESSED, $isProcessed, PDO::PARAM_BOOL);
         $st->bindParam(self::COLUMN_SHOULD_BE_EXECUTED_AT, $shouldBeExecutedAt);
         $st->bindParam(self::COLUMN_EXECUTOR, $executor);
+        $st->bindParam(self::COLUMN_CREATED_AT, $createdAt);
 
         return $st->execute();
     }