Minor refactoring and using Symfony\Cache

kleijnweb · Jan 11, 2018 · 0deaad5 · 0deaad5
1 parent 3903924
commit 0deaad5
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -34,10 +34,11 @@
     "symfony/yaml": ">=2.8.18",
     "symfony/finder": ">=2.8.18",
     "symfony/property-access": ">=2.8.18",
+    "symfony/cache": "^3.3.0",
     "doctrine/collections": "^1.3",
-    "doctrine/cache": "^1.6",
     "kleijnweb/php-api-descriptions": "dev-master as 1.0.0-alpha5",
-    "kleijnweb/php-api-routing-bundle": "dev-master as 1.0.0-alpha2"
+    "kleijnweb/php-api-routing-bundle": "dev-master as 1.0.0-alpha2",
+    "symfony/psr-http-message-bridge": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.4",

diff --git a/src/Test/ApiTestCase.php b/src/Test/ApiTestCase.php
@@ -147,7 +147,7 @@ protected function request(
         array $content = null,
         array $server = []
     ) {
-        $apiRequest = new ApiRequest($this->assembleUri($path, $params), $method);
+        $apiRequest = new ApiTestRequest($this->assembleUri($path, $params), $method);
         $apiRequest->setServer(
             array_merge($server, ['CONTENT_TYPE' => 'application/json'], $this->getDefaultServerVars())
         );

diff --git a/src/Test/ApiRequest.php → src/Test/ApiTestRequest.php b/src/Test/ApiRequest.php → src/Test/ApiTestRequest.php
@@ -13,14 +13,14 @@
 /**
  * @author John Kleijn <john@kleijnweb.nl>
  */
-class ApiRequest extends Request
+class ApiTestRequest extends Request
 {
     /**
      * @param string $uri
      *
-     * @return ApiRequest
+     * @return ApiTestRequest
      */
-    public function setUri(string $uri): ApiRequest
+    public function setUri(string $uri): ApiTestRequest
     {
         $this->uri = $uri;
 
@@ -30,9 +30,9 @@ public function setUri(string $uri): ApiRequest
     /**
      * @param string $method
      *
-     * @return ApiRequest
+     * @return ApiTestRequest
      */
-    public function setMethod(string $method): ApiRequest
+    public function setMethod(string $method): ApiTestRequest
     {
         $this->method = $method;
 
@@ -42,9 +42,9 @@ public function setMethod(string $method): ApiRequest
     /**
      * @param array $parameters
      *
-     * @return ApiRequest
+     * @return ApiTestRequest
      */
-    public function setParameters(array $parameters): ApiRequest
+    public function setParameters(array $parameters): ApiTestRequest
     {
         $this->parameters = $parameters;
 
@@ -54,9 +54,9 @@ public function setParameters(array $parameters): ApiRequest
     /**
      * @param array $files
      *
-     * @return ApiRequest
+     * @return ApiTestRequest
      */
-    public function setFiles(array $files): ApiRequest
+    public function setFiles(array $files): ApiTestRequest
     {
         $this->files = $files;
 
@@ -66,9 +66,9 @@ public function setFiles(array $files): ApiRequest
     /**
      * @param array $cookies
      *
-     * @return ApiRequest
+     * @return ApiTestRequest
      */
-    public function setCookies(array $cookies): ApiRequest
+    public function setCookies(array $cookies): ApiTestRequest
     {
         $this->cookies = $cookies;
 
@@ -78,9 +78,9 @@ public function setCookies(array $cookies): ApiRequest
     /**
      * @param array $server
      *
-     * @return ApiRequest
+     * @return ApiTestRequest
      */
-    public function setServer(array $server): ApiRequest
+    public function setServer(array $server): ApiTestRequest
     {
         $this->server = $server;
 
@@ -90,9 +90,9 @@ public function setServer(array $server): ApiRequest
     /**
      * @param mixed $content
      *
-     * @return ApiRequest
+     * @return ApiTestRequest
      */
-    public function setContent($content): ApiRequest
+    public function setContent($content): ApiTestRequest
     {
         $this->content = $content;
 

diff --git a/tests/functional/PetStore/app/config.yml b/tests/functional/PetStore/app/config.yml
@@ -6,7 +6,7 @@ swagger:
 
 services:
   petstore.cache:
-    class: Doctrine\Common\Cache\ArrayCache
+    class: Symfony\Component\Cache\Simple\ArrayCache
   swagger.controller.pet:
     class: KleijnWeb\SwaggerBundle\Tests\Functional\PetStore\Controller\PetController
   swagger.controller.store:
@@ -41,4 +41,4 @@ monolog:
     stderr:
       type:  stream
       path:  php://stdout
-      level: debug
+      level: debug
diff --git a/tests/functional/PetStore/app/config_hydrator.yml b/tests/functional/PetStore/app/config_hydrator.yml
@@ -7,6 +7,6 @@ swagger:
 
 services:
   petstore.cache:
-    class: Doctrine\Common\Cache\ArrayCache
+    class: Symfony\Component\Cache\Simple\ArrayCache
   swagger.controller.pet:
-    class: KleijnWeb\SwaggerBundle\Tests\Functional\PetStore\Controller\HydratedPetController
+    class: KleijnWeb\SwaggerBundle\Tests\Functional\PetStore\Controller\HydratedPetController
diff --git a/tests/unit/Test/ApiRequestTest.php b/tests/unit/Test/ApiRequestTest.php
@@ -8,7 +8,7 @@
 
 namespace KleijnWeb\SwaggerBundle\Tests\Test;
 
-use KleijnWeb\SwaggerBundle\Test\ApiRequest;
+use KleijnWeb\SwaggerBundle\Test\ApiTestRequest;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -21,7 +21,7 @@ class ApiRequestTest extends TestCase
      */
     public function canChain()
     {
-        (new ApiRequest('/', 'POST'))
+        (new ApiTestRequest('/', 'POST'))
             ->setContent('')
             ->setCookies([])
             ->setFiles([])