Reduced dependency to voryx/Thruway

Mathieu Lemoine · Mathieu Lemoine · commit a6f398b1de37 · 2019-12-12T02:50:26.000+01:00
diff --git a/Tests/Functional/MongodbConsumerTest.php b/Tests/Functional/MongodbConsumerTest.php
@@ -24,7 +24,7 @@ public function setUp()
         $this->context = $this->buildMongodbContext();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->context) {
             $this->context->close();
diff --git a/Tests/MongodbConsumerTest.php b/Tests/MongodbConsumerTest.php
@@ -113,15 +113,15 @@ public function testRejectShouldReSendMessageToSameQueueOnRequeue()
     }
 
     /**
-     * @return MongodbProducer|\PHPUnit_Framework_MockObject_MockObject
+     * @return MongodbProducer|\PHPUnit\Framework\MockObject\MockObject
      */
     private function createProducerMock()
     {
         return $this->createMock(MongodbProducer::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|MongodbContext
+     * @return \PHPUnit\Framework\MockObject\MockObject|MongodbContext
      */
     private function createContextMock()
     {
diff --git a/Tests/MongodbContextTest.php b/Tests/MongodbContextTest.php
@@ -183,7 +183,7 @@ public function testShouldThrowNotSupportedOnCreateTemporaryQueueCall()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Client
+     * @return \PHPUnit\Framework\MockObject\MockObject|Client
      */
     private function createClientMock()
     {
diff --git a/Tests/MongodbProducerTest.php b/Tests/MongodbProducerTest.php
@@ -43,7 +43,7 @@ public function testShouldThrowIfDestinationOfInvalidType()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|MongodbContext
+     * @return \PHPUnit\Framework\MockObject\MockObject|MongodbContext
      */
     private function createContextMock()
     {
diff --git a/Tests/MongodbSubscriptionConsumerTest.php b/Tests/MongodbSubscriptionConsumerTest.php
@@ -145,7 +145,7 @@ public function testThrowsIfTryConsumeWithoutSubscribers()
     }
 
     /**
-     * @return MongodbContext|\PHPUnit_Framework_MockObject_MockObject
+     * @return MongodbContext|\PHPUnit\Framework\MockObject\MockObject
      */
     private function createMongodbContextMock()
     {
@@ -155,7 +155,7 @@ private function createMongodbContextMock()
     /**
      * @param mixed|null $queueName
      *
-     * @return Consumer|\PHPUnit_Framework_MockObject_MockObject
+     * @return Consumer|\PHPUnit\Framework\MockObject\MockObject
      */
     private function createConsumerStub($queueName = null)
     {
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "php": "^7.1.3",
     "queue-interop/queue-interop": "^0.7|^0.8",
     "mongodb/mongodb": "^1.2",
-    "ext-mongodb": "^1.3"
+    "ext-mongodb": "^1.5"
   },
   "require-dev": {
     "phpunit/phpunit": "~5.4.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="./vendor/autoload.php"
         >
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function setUp()`
`24`	`24`	`$this->context = $this->buildMongodbContext();`
`25`	`25`	`}`
`26`	`26`
`27`		`- protected function tearDown()`
	`27`	`+ protected function tearDown(): void`
`28`	`28`	`{`
`29`	`29`	`if ($this->context) {`
`30`	`30`	`$this->context->close();`
Original file line number	Diff line number	Diff line change
`@@ -113,15 +113,15 @@ public function testRejectShouldReSendMessageToSameQueueOnRequeue()`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/**`
`116`		`- * @return MongodbProducer\|\PHPUnit_Framework_MockObject_MockObject`
	`116`	`+ * @return MongodbProducer\|\PHPUnit\Framework\MockObject\MockObject`
`117`	`117`	`*/`
`118`	`118`	`private function createProducerMock()`
`119`	`119`	`{`
`120`	`120`	`return $this->createMock(MongodbProducer::class);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/**`
`124`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|MongodbContext`
	`124`	`+ * @return \PHPUnit\Framework\MockObject\MockObject\|MongodbContext`
`125`	`125`	`*/`
`126`	`126`	`private function createContextMock()`
`127`	`127`	`{`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public function testShouldThrowNotSupportedOnCreateTemporaryQueueCall()`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/**`
`186`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|Client`
	`186`	`+ * @return \PHPUnit\Framework\MockObject\MockObject\|Client`
`187`	`187`	`*/`
`188`	`188`	`private function createClientMock()`
`189`	`189`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testShouldThrowIfDestinationOfInvalidType()`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/**`
`46`		`- * @return \PHPUnit_Framework_MockObject_MockObject\|MongodbContext`
	`46`	`+ * @return \PHPUnit\Framework\MockObject\MockObject\|MongodbContext`
`47`	`47`	`*/`
`48`	`48`	`private function createContextMock()`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function testThrowsIfTryConsumeWithoutSubscribers()`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`/**`
`148`		`- * @return MongodbContext\|\PHPUnit_Framework_MockObject_MockObject`
	`148`	`+ * @return MongodbContext\|\PHPUnit\Framework\MockObject\MockObject`
`149`	`149`	`*/`
`150`	`150`	`private function createMongodbContextMock()`
`151`	`151`	`{`
`@@ -155,7 +155,7 @@ private function createMongodbContextMock()`
`155`	`155`	`/**`
`156`	`156`	`* @param mixed\|null $queueName`
`157`	`157`	`*`
`158`		`- * @return Consumer\|\PHPUnit_Framework_MockObject_MockObject`
	`158`	`+ * @return Consumer\|\PHPUnit\Framework\MockObject\MockObject`
`159`	`159`	`*/`
`160`	`160`	`private function createConsumerStub($queueName = null)`
`161`	`161`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`convertWarningsToExceptions="true"`
`9`	`9`	`processIsolation="false"`
`10`	`10`	`stopOnFailure="false"`
`11`		`- syntaxCheck="false"`
`12`	`11`	`bootstrap="./vendor/autoload.php"`
`13`	`12`	`>`
`14`	`13`