cors

Author: daycry

composer.json

@@ -21,16 +21,6 @@
         "daycry/cronjob": "^2.0",
         "daycry/settings": "^1"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url" : "git@ssh.dev.azure.com:v3/ImaginaDEVOPS/MEDIAPRO%20-%20Equipo%20Desarrollo/AzureOauthServer"
-        },
-        {
-            "type": "git",
-            "url": "https://github.com/abraham/phpunit-testlistener-vcr"
-        }
-    ],
     "require-dev":
     {
         "codeigniter4/devkit": "^1",

phpstan.neon.dist

@@ -25,6 +25,8 @@ parameters:
 		- '#Call to deprecated method getMethod\(\) of class CodeIgniter\\HTTP\\Request:#'
 		- '#Call to deprecated method getStatusCode\(\) of class CodeIgniter\\HTTP\\ResponseInterface:#'
 		- '#Negated boolean expression is always true.#'
+		- '#class CodeIgniter\\HTTP\\Request constructor expects Config\\App#'
+		- '#class CodeIgniter\\HTTP\\Response constructor expects Config\\App#'
 	universalObjectCratesClasses:
 		- CodeIgniter\Entity
 		- CodeIgniter\Entity\Entity

src/Config/RestFul.php

@@ -254,7 +254,7 @@ class RestFul extends BaseConfig
      * @var boolean
      */
     public $supportsCredentials = false;
-    
+
     /**
     * --------------------------------------------------------------------------
     * Enable block Invalid Attempts

src/Config/Routes.php

@@ -2,4 +2,4 @@
 
 /** @var \CodeIgniter\Router\RouteCollection $routes */
 
-$routes->options('(:any)', '', ['filter' => 'cors']);
+$routes->options('(:any)', '', ['filter' => 'cors']);

src/Filters/CorsFilter.php

@@ -10,14 +10,13 @@
 class CorsFilter implements FilterInterface
 {
     /**
-     * @var \Fluent\Cors\ServiceCors $cors
+     * @var \Daycry\RestFul\Libraries\Cors $cors
      */
     protected $cors;
 
     /**
      * Constructor.
      *
-     * @param array $options
      * @return void
      */
     public function __construct()
@@ -55,4 +54,4 @@ public function after(RequestInterface $request, ResponseInterface $response, $a
 
         return $response;
     }
-}
+}

src/Libraries/Cors.php

@@ -42,7 +42,7 @@ public function __construct(?RestFul $config = null)
     }
 
     /**
-     * @param array|CorsInputOptions $options
+     * @param RestFul $config
      */
     public function setOptions(RestFul $config): void
     {
@@ -257,4 +257,4 @@ public function varyHeader(ResponseInterface $response, string $header): Respons
 
         return $response;
     }
-}
+}

src/Validators/Cors.php

@@ -2,7 +2,7 @@
 
 namespace Daycry\RestFul\Validators;
 
-use Config\Services;
+use Daycry\RestFul\Config\Services;
 use CodeIgniter\HTTP\ResponseInterface;
 
 class Cors

tests/Filters/CorsTest.php

@@ -32,7 +32,7 @@ public function testCorsSuccess(): void
 
         $request = service('request');
         $request->setHeader('Origin', 'https://test-cors1.local');
-        
+
         Services::injectMock('request', $request);
 
         $result = $this->call('get', 'example-filter');
@@ -48,13 +48,13 @@ public function testCorsError(): void
 
         $request = service('request');
         $request->setHeader('Origin', 'https://test-cors1.local');
-        
+
         Services::injectMock('request', $request);
 
         $result = $this->call('get', 'example-filter');
 
         $response = Services::response();
-        
+
         $this->assertNotEquals(
             'https://test-cors1.local',
             $response->getHeaderLine('Access-Control-Allow-Origin')
@@ -64,7 +64,7 @@ public function testCorsError(): void
         $result->assertHeaderMissing('Access-Control-Allow-Credentials');
     }
 
-    
+
 
     protected function tearDown(): void
     {

tests/Validators/CorsTest.php

@@ -32,7 +32,6 @@ protected function request()
         return new Request(Factories::config('App'));
     }
 
-    /** @var Response */
     protected function response()
     {
         return new Response(Factories::config('App'));
@@ -62,7 +61,7 @@ public function testIsPreflightRequest()
             ->withMethod('OPTIONS')
             ->setHeader('Access-Control-Request-Method', 'GET');
 
-            $cors = new Cors(config('RestFul'));
+        $cors = new Cors(config('RestFul'));
 
         $this->assertTrue($cors->isPreflightRequest($request));
     }
@@ -72,7 +71,7 @@ public function testIsNotPreflightRequest()
         $request = $this->request()->withMethod('GET')
             ->setHeader('Access-Control-Request-Method', 'GET');
 
-            $cors = new Cors(config('RestFul'));
+        $cors = new Cors(config('RestFul'));
 
         $this->assertFalse($cors->isPreflightRequest($request));
     }
@@ -82,22 +81,22 @@ public function testVaryHeader()
         $response = $this->response()
             ->setHeader('Vary', 'Access-Control-Request-Method');
 
-            $cors = new Cors(config('RestFul'));
+        $cors = new Cors(config('RestFul'));
 
         $vary = $cors->varyHeader($response, 'Access-Control-Request-Method');
 
         $this->assertEquals($response->getHeaderLine('Vary'), $vary->getHeaderLine('Vary'));
     }
-    
+
     public function testHandlePreflightRequest()
     {
         $request = $this->request()
             ->withMethod('OPTIONS')
             ->setHeader('Origin', 'http://foobar.com')
             ->setHeader('Access-Control-Request-Method', 'GET')
             ->setHeader('Access-Control-Request-Headers', 'X-CSRF-TOKEN');
-            
-            $cors = new Cors(config('RestFul'));
+
+        $cors = new Cors(config('RestFul'));
 
         $expected = $cors->handlePreflightRequest($request);
 
@@ -123,7 +122,7 @@ public function testHandleRequest()
         $response = $this->response()
             ->setHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin'));
 
-            $cors = new Cors(config('RestFul'));
+        $cors = new Cors(config('RestFul'));
 
         $expected = $cors->addPreflightRequestHeaders($response, $request);
 
@@ -242,7 +241,7 @@ public function testHandlePreflightRequestWithExposeHeadersNotSet()
             ->setHeader('Origin', 'http://foo.com')
             ->setHeader('Access-Control-Request-Headers', 'X-CSRF-TOKEN');
 
-            $cors = new Cors(config('RestFul'));
+        $cors = new Cors(config('RestFul'));
 
         $expeted = $cors->addPreflightRequestHeaders($this->response(), $request);
 
@@ -311,4 +310,4 @@ protected function tearDown(): void
     {
         parent::tearDown();
     }
-}
+}