Reduced dependency to voryx/Thruway

Author: Mathieu Lemoine

GpsExtension.php

@@ -4,13 +4,14 @@
 
 use Enqueue\Gps\GpsConnectionFactory;
 use Enqueue\Gps\GpsContext;
+use PHPUnit\Framework\SkippedTestError;
 
 trait GpsExtension
 {
     private function buildGpsContext(): GpsContext
     {
         if (false == getenv('GPS_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         $config = getenv('GPS_DSN');

RabbitmqAmqpExtension.php

@@ -4,6 +4,7 @@
 
 use Enqueue\AmqpExt\AmqpConnectionFactory;
 use Enqueue\AmqpExt\AmqpContext;
+use PHPUnit\Framework\SkippedTestError;
 
 trait RabbitmqAmqpExtension
 {
@@ -13,7 +14,7 @@ trait RabbitmqAmqpExtension
     private function buildAmqpContext()
     {
         if (false == $dsn = getenv('AMQP_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         return (new AmqpConnectionFactory($dsn))->createContext();

RabbitmqStompExtension.php

@@ -4,13 +4,14 @@
 
 use Enqueue\Stomp\StompConnectionFactory;
 use Enqueue\Stomp\StompContext;
+use PHPUnit\Framework\SkippedTestError;
 
 trait RabbitmqStompExtension
 {
     private function buildStompContext(): StompContext
     {
         if (false == $dsn = getenv('RABITMQ_STOMP_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         return (new StompConnectionFactory($dsn))->createContext();

RedisExtension.php

@@ -6,13 +6,14 @@
 use Enqueue\Redis\PRedis;
 use Enqueue\Redis\RedisConnectionFactory;
 use Enqueue\Redis\RedisContext;
+use PHPUnit\Framework\SkippedTestError;
 
 trait RedisExtension
 {
     private function buildPhpRedisContext(): RedisContext
     {
         if (false == getenv('PHPREDIS_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         $config = getenv('PHPREDIS_DSN');
@@ -28,7 +29,7 @@ private function buildPhpRedisContext(): RedisContext
     private function buildPRedisContext(): RedisContext
     {
         if (false == getenv('PREDIS_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         $config = getenv('PREDIS_DSN');

RetryTrait.php

@@ -2,9 +2,12 @@
 
 namespace Enqueue\Test;
 
+use PHPUnit\Framework\IncompleteTestError;
+use PHPUnit\Framework\SkippedTestError;
+
 trait RetryTrait
 {
-    public function runBare()
+    public function runBare(): void
     {
         $e = null;
 
@@ -22,9 +25,9 @@ public function runBare()
                 parent::runBare();
 
                 return;
-            } catch (\PHPUnit_Framework_IncompleteTestError $e) {
+            } catch (IncompleteTestError $e) {
                 throw $e;
-            } catch (\PHPUnit_Framework_SkippedTestError $e) {
+            } catch (SkippedTestError $e) {
                 throw $e;
             } catch (\Throwable $e) {
                 // last one thrown below

SnsExtension.php

@@ -4,13 +4,14 @@
 
 use Enqueue\Sns\SnsConnectionFactory;
 use Enqueue\Sns\SnsContext;
+use PHPUnit\Framework\SkippedTestError;
 
 trait SnsExtension
 {
     private function buildSqsContext(): SnsContext
     {
         if (false == $dsn = getenv('SNS_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         return (new SnsConnectionFactory($dsn))->createContext();

SnsQsExtension.php

@@ -4,13 +4,14 @@
 
 use Enqueue\SnsQs\SnsQsConnectionFactory;
 use Enqueue\SnsQs\SnsQsContext;
+use PHPUnit\Framework\SkippedTestError;
 
 trait SnsQsExtension
 {
     private function buildSnsQsContext(): SnsQsContext
     {
         if (false == $dsn = getenv('SNSQS_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         return (new SnsQsConnectionFactory($dsn))->createContext();

SqsExtension.php

@@ -4,13 +4,14 @@
 
 use Enqueue\Sqs\SqsConnectionFactory;
 use Enqueue\Sqs\SqsContext;
+use PHPUnit\Framework\SkippedTestError;
 
 trait SqsExtension
 {
     private function buildSqsContext(): SqsContext
     {
         if (false == $dsn = getenv('SQS_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         return (new SqsConnectionFactory($dsn))->createContext();

WampExtension.php

@@ -4,13 +4,14 @@
 
 use Enqueue\Wamp\WampConnectionFactory;
 use Enqueue\Wamp\WampContext;
+use PHPUnit\Framework\SkippedTestError;
 
 trait WampExtension
 {
     private function buildWampContext(): WampContext
     {
         if (false == $dsn = getenv('WAMP_DSN')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
+            throw new SkippedTestError('Functional tests are not allowed in this environment');
         }
 
         return (new WampConnectionFactory($dsn))->createContext();