.gitattributes

@@ -0,0 +1,5 @@
+/Tests export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+phpunit.xml.dist export-ignore

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['7.4', '8.0', '8.1', '8.2']
+
+    name: PHP ${{ matrix.php }} tests
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          coverage: none
+          extensions: mongodb
+
+      - uses: "ramsey/composer-install@v1"
+        with:
+          composer-options: "--prefer-source"
+
+      - run: vendor/bin/phpunit --exclude-group=functional

JSON.php

@@ -14,10 +14,7 @@ class JSON
     public static function decode($string)
     {
         if (!is_string($string)) {
-            throw new \InvalidArgumentException(sprintf(
-                'Accept only string argument but got: "%s"',
-                is_object($string) ? get_class($string) : gettype($string)
-            ));
+            throw new \InvalidArgumentException(sprintf('Accept only string argument but got: "%s"', is_object($string) ? $string::class : gettype($string)));
         }
 
         // PHP7 fix - empty string and null cause syntax error
@@ -26,32 +23,22 @@ public static function decode($string)
         }
 
         $decoded = json_decode($string, true);
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new \InvalidArgumentException(sprintf(
-                'The malformed json given. Error %s and message %s',
-                json_last_error(),
-                json_last_error_msg()
-            ));
+        if (\JSON_ERROR_NONE !== json_last_error()) {
+            throw new \InvalidArgumentException(sprintf('The malformed json given. Error %s and message %s', json_last_error(), json_last_error_msg()));
         }
 
         return $decoded;
     }
 
     /**
-     * @param mixed $value
-     *
      * @return string
      */
     public static function encode($value)
     {
-        $encoded = json_encode($value, JSON_UNESCAPED_UNICODE);
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new \InvalidArgumentException(sprintf(
-                'Could not encode value into json. Error %s and message %s',
-                json_last_error(),
-                json_last_error_msg()
-            ));
+        $encoded = json_encode($value, \JSON_UNESCAPED_UNICODE);
+
+        if (\JSON_ERROR_NONE !== json_last_error()) {
+            throw new \InvalidArgumentException(sprintf('Could not encode value into json. Error %s and message %s', json_last_error(), json_last_error_msg()));
         }
 
         return $encoded;

MongodbConnectionFactory.php

@@ -1,11 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Mongodb;
 
-use Interop\Queue\PsrConnectionFactory;
+use Interop\Queue\ConnectionFactory;
+use Interop\Queue\Context;
 use MongoDB\Client;
 
-class MongodbConnectionFactory implements PsrConnectionFactory
+class MongodbConnectionFactory implements ConnectionFactory
 {
     /**
      * @var array
@@ -24,7 +27,7 @@ class MongodbConnectionFactory implements PsrConnectionFactory
      *
      * or
      *
-     * mongodb://127.0.0.1:27017/dbname?polling_interval=1000&enqueue_collection=enqueue
+     * mongodb://127.0.0.1:27017/defaultauthdb?polling_interval=1000&enqueue_database=enqueue&enqueue_collection=enqueue
      *
      * @param array|string|null $config
      */
@@ -35,6 +38,10 @@ public function __construct($config = 'mongodb:')
         } elseif (is_string($config)) {
             $config = $this->parseDsn($config);
         } elseif (is_array($config)) {
+            $config = array_replace(
+                $config,
+                $this->parseDsn(empty($config['dsn']) ? 'mongodb:' : $config['dsn'])
+            );
         } else {
             throw new \LogicException('The config must be either an array of options, a DSN string or null');
         }
@@ -47,14 +54,17 @@ public function __construct($config = 'mongodb:')
         $this->config = $config;
     }
 
-    public function createContext()
+    /**
+     * @return MongodbContext
+     */
+    public function createContext(): Context
     {
         $client = new Client($this->config['dsn']);
 
         return new MongodbContext($client, $this->config);
     }
 
-    public static function parseDsn($dsn)
+    public static function parseDsn(string $dsn): array
     {
         $parsedUrl = parse_url($dsn);
         if (false === $parsedUrl) {
@@ -67,35 +77,36 @@ public static function parseDsn($dsn)
             'mongodb' => true,
         ];
         if (false == isset($parsedUrl['scheme'])) {
-            throw new \LogicException(sprintf(
-                'The given DSN schema "%s" is not supported. There are supported schemes: "%s".',
-                $parsedUrl['scheme'],
-                implode('", "', array_keys($supported))
-            ));
+            throw new \LogicException(sprintf('The given DSN schema "%s" is not supported. There are supported schemes: "%s".', $parsedUrl['scheme'], implode('", "', array_keys($supported))));
         }
         if ('mongodb:' === $dsn) {
             return [
                 'dsn' => 'mongodb://127.0.0.1/',
             ];
         }
         $config['dsn'] = $dsn;
+        // FIXME this is NOT a dbname but rather authdb. But removing this would be a BC break.
+        // see: https://github.com/php-enqueue/enqueue-dev/issues/1027
         if (isset($parsedUrl['path']) && '/' !== $parsedUrl['path']) {
             $pathParts = explode('/', $parsedUrl['path']);
-            //DB name
+            // DB name
             if ($pathParts[1]) {
                 $config['dbname'] = $pathParts[1];
             }
         }
         if (isset($parsedUrl['query'])) {
             $queryParts = null;
             parse_str($parsedUrl['query'], $queryParts);
-            //get enqueue attributes values
+            // get enqueue attributes values
             if (!empty($queryParts['polling_interval'])) {
-                $config['polling_interval'] = $queryParts['polling_interval'];
+                $config['polling_interval'] = (int) $queryParts['polling_interval'];
             }
             if (!empty($queryParts['enqueue_collection'])) {
                 $config['collection_name'] = $queryParts['enqueue_collection'];
             }
+            if (!empty($queryParts['enqueue_database'])) {
+                $config['dbname'] = $queryParts['enqueue_database'];
+            }
         }
 
         return $config;