Fix namespaces

Author: snapshotpl

test/Generator/Md5GeneratorTest.php

@@ -4,9 +4,9 @@
 
 use PhpMiddleware\RequestId\Generator\GeneratorInterface;
 use PhpMiddleware\RequestId\Generator\Md5Generator;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class Md5GeneratorTest extends PHPUnit_Framework_TestCase
+class Md5GeneratorTest extends TestCase
 {
     protected $generator;
 

test/Generator/PhpUniqidGeneratorTest.php

@@ -3,9 +3,9 @@
 namespace PhpMiddlewareTestTest\RequestId\Generator;
 
 use PhpMiddleware\RequestId\Generator\PhpUniqidGenerator;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class PhpUniqidGeneratorTest extends PHPUnit_Framework_TestCase
+class PhpUniqidGeneratorTest extends TestCase
 {
     protected $generator;
 

test/Generator/PrefixedGeneratorTest.php

@@ -4,9 +4,9 @@
 
 use PhpMiddleware\RequestId\Generator\GeneratorInterface;
 use PhpMiddleware\RequestId\Generator\PrefixedGenerator;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-class PrefixedGeneratorTest extends PHPUnit_Framework_TestCase
+class PrefixedGeneratorTest extends TestCase
 {
     protected $decoratedGenerator;
 

test/Generator/RamseyFactoryUuidGeneratorTest.php

@@ -6,11 +6,11 @@
 use PhpMiddleware\RequestId\Generator\RamseyUuid3Generator;
 use PhpMiddleware\RequestId\Generator\RamseyUuid4Generator;
 use PhpMiddleware\RequestId\Generator\RamseyUuid5Generator;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Ramsey\Uuid\UuidFactoryInterface;
 use Ramsey\Uuid\UuidInterface;
 
-class RamseyFactoryUuidGeneratorTest extends PHPUnit_Framework_TestCase
+class RamseyFactoryUuidGeneratorTest extends TestCase
 {
     protected $factory;
     protected $uuid;

test/Generator/RamseyUuid4StaticGeneratorTest.php

@@ -3,11 +3,11 @@
 namespace PhpMiddlewareTestTest\RequestId\Generator;
 
 use PhpMiddleware\RequestId\Generator\RamseyUuid4StaticGenerator;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
 
-class RamseyUuid4StaticGeneratorTest extends PHPUnit_Framework_TestCase
+class RamseyUuid4StaticGeneratorTest extends TestCase
 {
     protected $generator;
 

test/MonologProcessorTest.php

@@ -5,13 +5,11 @@
 use PhpMiddleware\RequestId\Exception\MissingRequestId;
 use PhpMiddleware\RequestId\MonologProcessor;
 use PhpMiddleware\RequestId\RequestIdProviderInterface;
+use PHPUnit\Framework\TestCase;
 
-class MonologProcessorTest extends \PHPUnit_Framework_TestCase
+class MonologProcessorTest extends TestCase
 {
     protected $processor;
-    /**
-     * @var RequestIdProviderInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
     private $requestIdProvider;
 
     public function testIsRequestIdInRecord()

test/RequestDecoratorTest.php

@@ -4,9 +4,10 @@
 
 use PhpMiddleware\RequestId\RequestDecorator;
 use PhpMiddleware\RequestId\RequestIdProviderInterface;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 
-class RequestDecoratorTest extends \PHPUnit_Framework_TestCase
+class RequestDecoratorTest extends TestCase
 {
     const CUSTOM_HEADER_NAME = 'custom-header-name';
 

test/RequestIdMiddlewareTest.php

@@ -7,12 +7,12 @@
 use PhpMiddleware\RequestId\RequestIdProvider;
 use PhpMiddleware\RequestId\RequestIdProviderFactoryInterface;
 use PhpMiddleware\RequestId\RequestIdProviderInterface;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
 
-class RequestIdMiddlewareTest extends PHPUnit_Framework_TestCase
+class RequestIdMiddlewareTest extends TestCase
 {
     public function testEmmitRequestIdToResponse()
     {

test/RequestIdProviderTest.php

@@ -6,19 +6,17 @@
 use PhpMiddleware\RequestId\Exception\MissingRequestId;
 use PhpMiddleware\RequestId\Generator\GeneratorInterface;
 use PhpMiddleware\RequestId\OverridePolicy\OverridePolicyInterface;
-use PhpMiddleware\RequestId\RequestIdMiddleware;
 use PhpMiddleware\RequestId\RequestIdProvider;
-use PHPUnit_Framework_TestCase;
-use Zend\Diactoros\Response;
+use PHPUnit\Framework\TestCase;
 use Zend\Diactoros\ServerRequest;
 
-class RequestIdProviderTest extends \PHPUnit_Framework_TestCase
+class RequestIdProviderTest extends TestCase
 {
     protected $generator;
 
     protected function setUp()
     {
-        $this->generator = $this->getMock(GeneratorInterface::class);
+        $this->generator = $this->createMock(GeneratorInterface::class);
     }
 
     public function testGenerateIdBecauseNotExistInHeader()
@@ -57,13 +55,13 @@ public function provideEmptyRequestIdValues()
 
     public function testTryToGenerateNotStringRequestId()
     {
-        $this->setExpectedException(InvalidRequestId::class);
-
         $this->generator->expects($this->once())->method('generateRequestId')->willReturn(1);
 
         $request = new ServerRequest();
         $provider = new RequestIdProvider($request, $this->generator);
 
+        $this->expectException(InvalidRequestId::class);
+
         $provider->getRequestId();
     }
 
@@ -105,7 +103,7 @@ public function testOverridePolicyAllowOverride()
 
         $request = new ServerRequest([], [], 'https://github.com/php-middleware/request-id', 'GET', 'php://input', [RequestIdProvider::DEFAULT_REQUEST_HEADER => '987654321']);
 
-        $policy = $this->getMock(OverridePolicyInterface::class);
+        $policy = $this->createMock(OverridePolicyInterface::class);
         $policy->method('isAllowToOverride')->with($request)->willReturn(true);
 
         $provider = new RequestIdProvider($request, $this->generator, $policy);
@@ -119,7 +117,7 @@ public function testOverridePolicyDisallowOverride()
         $this->generator->method('generateRequestId')->willReturn('123456789');
         $request = new ServerRequest([], [], 'https://github.com/php-middleware/request-id', 'GET', 'php://input', [RequestIdProvider::DEFAULT_REQUEST_HEADER => '987654321']);
 
-        $policy = $this->getMock(OverridePolicyInterface::class);
+        $policy = $this->createMock(OverridePolicyInterface::class);
         $policy->method('isAllowToOverride')->with($request)->willReturn(false);
 
         $provider = new RequestIdProvider($request, $this->generator, $policy);