Merge pull request #68 from chrisryan/php8

Update to support PHP 8.x

Author: chrisryan

.coveralls.yml

@@ -11,14 +11,18 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
     steps:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Install PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-versions }}
+    - name: Install MongoDB
+      uses: supercharge/mongodb-github-action@1.8.0
+      with:
+        mongodb-version: '4.2'
     - name: Validate composer.json and composer.lock
       run: composer validate
     - name: Install dependencies

.github/workflows/php.yml

@@ -1,15 +1,13 @@
 # mongo-queue-php
-[![Build Status](https://travis-ci.org/traderinteractive/mongo-queue-php.svg?branch=master)](https://travis-ci.org/traderinteractive/mongo-queue-php)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/traderinteractive/mongo-queue-php/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/traderinteractive/mongo-queue-php/?branch=master)
-[![Coverage Status](https://coveralls.io/repos/github/traderinteractive/mongo-queue-php/badge.svg)](https://coveralls.io/github/traderinteractive/mongo-queue-php)
 
-[![Latest Stable Version](https://poser.pugx.org/traderinteractive/mongo-queue-php/v/stable)](https://packagist.org/packages/traderinteractive/mongo-queue-php)
-[![Latest Unstable Version](https://poser.pugx.org/traderinteractive/mongo-queue-php/v/unstable)](https://packagist.org/packages/traderinteractive/mongo-queue-php)
-[![License](https://poser.pugx.org/traderinteractive/mongo-queue-php/license)](https://packagist.org/packages/traderinteractive/mongo-queue-php)
+[![Latest Stable Version](https://poser.pugx.org/traderinteractive/mongo-queue/v/stable)](https://packagist.org/packages/traderinteractive/mongo-queue)
+[![Latest Unstable Version](https://poser.pugx.org/traderinteractive/mongo-queue/v/unstable)](https://packagist.org/packages/traderinteractive/mongo-queue)
+[![License](https://poser.pugx.org/traderinteractive/mongo-queue/license)](https://packagist.org/packages/traderinteractive/mongo-queue)
 
-[![Total Downloads](https://poser.pugx.org/traderinteractive/mongo-queue-php/downloads)](https://packagist.org/packages/traderinteractive/mongo-queue-php)
-[![Daily Downloads](https://poser.pugx.org/traderinteractive/mongo-queue-php/d/daily)](https://packagist.org/packages/traderinteractive/mongo-queue-php)
-[![Monthly Downloads](https://poser.pugx.org/traderinteractive/mongo-queue-php/d/monthly)](https://packagist.org/packages/traderinteractive/mongo-queue-php)
+[![Total Downloads](https://poser.pugx.org/traderinteractive/mongo-queue/downloads)](https://packagist.org/packages/traderinteractive/mongo-queue)
+[![Daily Downloads](https://poser.pugx.org/traderinteractive/mongo-queue/d/daily)](https://packagist.org/packages/traderinteractive/mongo-queue)
+[![Monthly Downloads](https://poser.pugx.org/traderinteractive/mongo-queue/d/monthly)](https://packagist.org/packages/traderinteractive/mongo-queue)
 
 PHP message queue using MongoDB as a backend.
 

.travis.yml

@@ -24,12 +24,12 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.0",
+        "php": "^7.2 || ^8.0",
         "ext-mongodb": "*",
-        "mongodb/mongodb": "^1.1"
+        "mongodb/mongodb": "^1.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5.2",
+        "phpunit/phpunit": "^8",
         "squizlabs/php_codesniffer": "^3.2"
     },
     "autoload": {

README.md

@@ -198,7 +198,7 @@ final public function count(array $query, bool $running = null) : int
             $totalQuery['earliestGet'] = [$key => new UTCDateTime((int)(microtime(true) * 1000))];
         }
 
-        return $this->collection->count($this->buildPayloadQuery($totalQuery, $query));
+        return $this->collection->countDocuments($this->buildPayloadQuery($totalQuery, $query));
     }
 
     /**
@@ -264,7 +264,7 @@ final public function send(Message $message)
      *
      * @throws \Exception couldnt create index after 5 attempts
      */
-    final private function ensureIndex(array $index)
+    private function ensureIndex(array $index)
     {
         if ($this->isIndexIncludedInExistingIndex($index)) {
             return;
@@ -384,7 +384,7 @@ private function indexExists(array $index) : bool
      *
      * @return void
      */
-    final private function verifySort(array $sort, string $label, array &$completeFields)
+    private function verifySort(array $sort, string $label, array &$completeFields)
     {
         foreach ($sort as $key => $value) {
             $this->throwIfTrue(!is_string($key), "key in \${$label} was not a string");

composer.json

@@ -110,26 +110,26 @@ public function withPriority()
     /**
      * @test
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage $priority was NaN
      *
      * @return void
      */
     public function constructWithNaNPriority()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('$priority was NaN');
         new Message(null, [], null, NAN);
     }
 
     /**
      * @test
      * @covers ::withPriority
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage $priority was NaN
      *
      * @return void
      */
     public function withNaNPriority()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('$priority was NaN');
         (new Message())->withPriority(NAN);
     }
 }

src/AbstractQueue.php

@@ -16,10 +16,9 @@ class QueueAwareTraitTest extends TestCase
     public function setQueue()
     {
         $mockQueue = $this->getObjectForTrait('\TraderInteractive\Mongo\QueueAwareTrait');
-        $this->assertAttributeEquals(null, 'mongoQueue', $mockQueue);
         $mongoQueue = $this->getMockBuilder('\\TraderInteractive\\Mongo\\QueueInterface')->getMock();
         $mockQueue->setQueue($mongoQueue);
-        $this->assertAttributeEquals($mongoQueue, 'mongoQueue', $mockQueue);
+        $this->assertEquals($mongoQueue, $mockQueue->getQueue());
     }
 
     /**

tests/MessageTest.php

@@ -18,7 +18,7 @@ final class QueueTest extends TestCase
     private $mongoUrl;
     private $queue;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->mongoUrl = getenv('TESTING_MONGO_URL') ?: 'mongodb://localhost:27017';
         $mongo = new Client(
@@ -32,18 +32,18 @@ public function setUp()
         $this->queue = new Queue($this->collection);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         (new Client($this->mongoUrl))->dropDatabase('testing');
     }
 
     /**
      * @test
      * @covers ::__construct
-     * @expectedException \InvalidArgumentException
      */
     public function constructWithNonStringUrl()
     {
+        $this->expectException(\InvalidArgumentException::class);
         new Queue(1, 'testing', 'messages');
     }
 
@@ -71,10 +71,10 @@ public function ensureGetIndex()
     /**
      * @test
      * @covers ::ensureGetIndex
-     * @expectedException \Exception
      */
     public function ensureGetIndexWithTooLongCollectionName()
     {
+        $this->expectException(\Exception::class);
         $collectionName = 'messages012345678901234567890123456789012345678901234567890123456789';
         $collectionName .= '012345678901234567890123456789012345678901234567890123456789';//128 chars
 
@@ -85,40 +85,40 @@ public function ensureGetIndexWithTooLongCollectionName()
     /**
      * @test
      * @covers ::ensureGetIndex
-     * @expectedException \InvalidArgumentException
      */
     public function ensureGetIndexWithNonStringBeforeSortKey()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->queue->ensureGetIndex([0 => 1]);
     }
 
     /**
      * @test
      * @covers ::ensureGetIndex
-     * @expectedException \InvalidArgumentException
      */
     public function ensureGetIndexWithNonStringAfterSortKey()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->queue->ensureGetIndex(['field' => 1], [0 => 1]);
     }
 
     /**
      * @test
      * @covers ::ensureGetIndex
-     * @expectedException \InvalidArgumentException
      */
     public function ensureGetIndexWithBadBeforeSortValue()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->queue->ensureGetIndex(['field' => 'NotAnInt']);
     }
 
     /**
      * @test
      * @covers ::ensureGetIndex
-     * @expectedException \InvalidArgumentException
      */
     public function ensureGetIndexWithBadAfterSortValue()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->queue->ensureGetIndex([], ['field' => 'NotAnInt']);
     }
 
@@ -127,11 +127,11 @@ public function ensureGetIndexWithBadAfterSortValue()
      *
      * @test
      * @covers ::ensureGetIndex
-     * @expectedException \Exception
-     * @expectedExceptionMessage couldnt create index after 5 attempts
      */
     public function ensureIndexCannotBeCreatedAfterFiveAttempts()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('couldnt create index after 5 attempts');
         $mockCollection = $this->getMockBuilder('\MongoDB\Collection')->disableOriginalConstructor()->getMock();
 
         $mockCollection->method('listIndexes')->willReturn([]);
@@ -180,20 +180,20 @@ public function ensureCountIndexWithPrefixOfPrevious()
     /**
      * @test
      * @covers ::ensureCountIndex
-     * @expectedException \InvalidArgumentException
      */
     public function ensureCountIndexWithNonStringKey()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->queue->ensureCountIndex([0 => 1], false);
     }
 
     /**
      * @test
      * @covers ::ensureCountIndex
-     * @expectedException \InvalidArgumentException
      */
     public function ensureCountIndexWithBadValue()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->queue->ensureCountIndex(['field' => 'NotAnInt'], false);
     }
 
@@ -237,10 +237,10 @@ public function getWithNegativePollDuration()
     /**
      * @test
      * @covers ::get
-     * @expectedException \InvalidArgumentException
      */
     public function getWithNonStringKey()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->queue->get([0 => 'a value']);
     }
 
@@ -386,10 +386,10 @@ public function earliestGet()
     /**
      * @test
      * @covers ::count
-     * @expectedException \InvalidArgumentException
      */
     public function countWithNonStringKey()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->queue->count([0 => 'a value']);
     }