refactor(swoole): Introduce HttpServer class

Class has responsibility of managing Swoole\Http\Server object to avoid registering it globally
k911 · Sep 23, 2018 · 2b57c1e · 2b57c1e
1 parent c02bc9a
commit 2b57c1e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Bridge/Doctrine/ORM/EntityManagerHttpDriverTest.php b/Bridge/Doctrine/ORM/EntityManagerHttpDriverTest.php
@@ -4,8 +4,8 @@
 
 namespace App\Tests\Bundle\SwooleBundle\Bridge\Doctrine\ORM;
 
-use App\Bundle\SwooleBundle\Bridge\Doctrine\ORM\EntityManagerHttpDriver;
-use App\Bundle\SwooleBundle\Driver\HttpDriverInterface;
+use App\Bundle\SwooleBundle\Bridge\Doctrine\ORM\EntityManagerHttpServerDriver;
+use App\Bundle\SwooleBundle\Server\HttpServerDriverInterface;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
@@ -16,12 +16,12 @@
 class EntityManagerHttpDriverTest extends TestCase
 {
     /**
-     * @var EntityManagerHttpDriver
+     * @var EntityManagerHttpServerDriver
      */
     private $httpDriver;
 
     /**
-     * @var HttpDriverInterface|ObjectProphecy
+     * @var HttpServerDriverInterface|ObjectProphecy
      */
     private $decoratedProphecy;
 
@@ -38,17 +38,17 @@ class EntityManagerHttpDriverTest extends TestCase
     protected function setUp(): void
     {
         $this->entityManagerProphecy = $this->prophesize(EntityManagerInterface::class);
-        $this->decoratedProphecy = $this->prophesize(HttpDriverInterface::class);
+        $this->decoratedProphecy = $this->prophesize(HttpServerDriverInterface::class);
         $this->connectionProphecy = $this->prophesize(Connection::class);
 
-        /** @var HttpDriverInterface $decoratedMock */
+        /** @var HttpServerDriverInterface $decoratedMock */
         $decoratedMock = $this->decoratedProphecy->reveal();
 
         /** @var EntityManagerInterface $emMock */
         $emMock = $this->entityManagerProphecy->reveal();
 
         $this->setUpEntityManagerConnection();
-        $this->httpDriver = new EntityManagerHttpDriver($decoratedMock, $emMock);
+        $this->httpDriver = new EntityManagerHttpServerDriver($decoratedMock, $emMock);
     }
 
     public function testBoot(): void

diff --git a/Bridge/Symfony/HttpKernel/HttpKernelHttpDriverTest.php b/Bridge/Symfony/HttpKernel/HttpKernelHttpDriverTest.php
@@ -6,7 +6,7 @@
 
 use App\Bundle\SwooleBundle\Bridge\Symfony\HttpFoundation\RequestFactoryInterface;
 use App\Bundle\SwooleBundle\Bridge\Symfony\HttpFoundation\ResponseProcessorInterface;
-use App\Bundle\SwooleBundle\Bridge\Symfony\HttpKernel\HttpKernelHttpDriver;
+use App\Bundle\SwooleBundle\Bridge\Symfony\HttpKernel\HttpKernelHttpServerDriver;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Swoole\Http\Request as SwooleRequest;
@@ -20,7 +20,7 @@
 class HttpKernelHttpDriverTest extends TestCase
 {
     /**
-     * @var HttpKernelHttpDriver
+     * @var HttpKernelHttpServerDriver
      */
     private $httpDriver;
 
@@ -52,7 +52,7 @@ protected function setUp(): void
         /** @var ResponseProcessorInterface $responseProcessorMock */
         $responseProcessorMock = $this->responseProcessor->reveal();
 
-        $this->httpDriver = new HttpKernelHttpDriver($kernelMock, $requestFactoryMock, $responseProcessorMock);
+        $this->httpDriver = new HttpKernelHttpServerDriver($kernelMock, $requestFactoryMock, $responseProcessorMock);
     }
 
     public function testBoot(): void
@@ -123,6 +123,6 @@ private function setUpTerminableKernel(): void
         /** @var ResponseProcessorInterface $responseProcessorMock */
         $responseProcessorMock = $this->responseProcessor->reveal();
 
-        $this->httpDriver = new HttpKernelHttpDriver($kernelMock, $requestFactoryMock, $responseProcessorMock);
+        $this->httpDriver = new HttpKernelHttpServerDriver($kernelMock, $requestFactoryMock, $responseProcessorMock);
     }
 }
diff --git a/Memory/Atomic/AtomicCounterTest.php b/Memory/Atomic/AtomicCounterTest.php
@@ -4,7 +4,7 @@
 
 namespace App\Tests\Bundle\SwooleBundle\Memory\Atomic;
 
-use App\Bundle\SwooleBundle\Memory\Atomic\AtomicCounter;
+use App\Bundle\SwooleBundle\Component\AtomicCounter;
 use Generator;
 use PHPUnit\Framework\TestCase;