Merge commit 'f4d5ef05a08f520ecd3bc663a0b1ce421d1cbeca'

Author: barryvdh

.github/workflows/run-tests.yml

@@ -36,7 +36,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        composer require "symfony/http-foundation:${{ matrix.symfony }}" "symfony/http-kernel:${{ matrix.symfony }}" --no-interaction --no-update
+        composer require "symfony/http-foundation:${{ matrix.symfony }}" --no-interaction --no-update
         composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest --with-all-dependencies
 
     - name: Execute Unit Tests

CHANGELOG.md

@@ -7,15 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Fixed
+### Changed since split from asm89/stack-cors
 
-- Bug with `Access-Control-Allow-Origin` header is `null` then `allowedOrigins` is `['*']`, `supportsCredentials` is `true` and `Origin` header doesn't  set (#85)
-
-## [2.0.0] - 2020-05-11
-
-### Added
-- CORS headers are better cachable now, with correct Vary headers (#70, #74)
-
-### Changed
-- CORS headers are added to non-Origin requests when possible (#73)
-- Requests are no longer blocked by the server, only by the browser (#70)
+- Renamed Asm89\Stack namespace to Fruitcake\Cors
+- Removed HttpKernel middleware

LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2013-2017 Alexander <iam.asm89@gmail.com>
+Copyright (c) 2017-2022 Barryvdh <barryvdh@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,11 @@
 # Stack/Cors
+## Stand-alone fork of https://github.com/asm89/stack-cors
+
+[![Tests](https://github.com/fruitcake/php-cors/actions/workflows/run-tests.yml/badge.svg)](https://github.com/fruitcake/php-cors/actions/workflows/run-tests.yml)
+[![Packagist License](https://poser.pugx.org/fruitcake/php-corsr/license.png)](http://choosealicense.com/licenses/mit/)
+[![Latest Stable Version](https://poser.pugx.org/fruitcake/php-cors/version.png)](https://packagist.org/packages/fruitcake/php-cors)
+[![Total Downloads](https://poser.pugx.org/fruitcake/php-cors/d/total.png)](https://packagist.org/packages/fruitcake/php-cors)
+[![Fruitcake](https://img.shields.io/badge/Powered%20By-Fruitcake-b2bc35.svg)](https://fruitcake.nl/)
 
 Library and middleware enabling cross-origin resource sharing for your
 http-{foundation,kernel} using application. It attempts to implement the
@@ -10,13 +17,15 @@ Build status: ![.github/workflows/run-tests.yml](https://github.com/asm89/stack-
 
 ## Installation
 
-Require `asm89/stack-cors` using composer.
+Require `fruitcake/php-cors` using composer.
 
 ## Usage
 
-This package can be used as a library or as [stack middleware].
+This package can be used as a library. You can use it in your framework using:
 
-[stack middleware]: http://stackphp.com/
+ - [Stack middleware](http://stackphp.com/): https://github.com/asm89/stack-cors
+ - [Laravel](https://laravel.com): https://github.com/fruitcake/laravel-cors
+ 
 
 ### Options
 
@@ -41,7 +50,7 @@ If `['*']` is provided to _allowedMethods_, _allowedOrigins_ or _allowedHeaders_
 ```php
 <?php
 
-use Asm89\Stack\CorsService;
+use Fruitcake\Cors\CorsService;
 
 $cors = new CorsService([
     'allowedHeaders'         => ['x-allowed-header', 'x-other-allowed-header'],
@@ -65,7 +74,7 @@ $cors->isPreflightRequest(Request $request);
 ```php
 <?php
 
-use Asm89\Stack\Cors;
+use Fruitcake\Cors\Cors;
 
 $app = new Cors($app, [
     // you can use ['*'] to allow any headers
@@ -81,3 +90,9 @@ $app = new Cors($app, [
     'supportsCredentials' => false,
 ]);
 ```
+
+## License
+
+Released under the MIT License, see [LICENSE](LICENSE).
+The original author of this Library is Alexander <iam.asm89@gmail.com>, while Barry <barryvdh@gmail.com> has been involved since 2015.
+This package is split-off from https://github.com/asm89/stack-cors

composer.json

@@ -1,33 +1,32 @@
 {
-    "name": "asm89/stack-cors",
-    "description": "Cross-origin resource sharing library and stack middleware",
-    "keywords": ["stack", "cors"],
-    "homepage": "https://github.com/asm89/stack-cors",
+    "name": "fruitcake/php-cors",
+    "description": "Cross-origin resource sharing library for the Symfony HttpFoundation",
+    "keywords": ["cors", "symfony", "laravel"],
+    "homepage": "https://github.com/fruitcake/php-cors",
     "type": "library",
     "license": "MIT",
     "authors": [
         {
-            "name": "Alexander",
-            "email": "iam.asm89@gmail.com"
+            "name": "Barryvdh",
+            "email": "barryvdh@gmail.com"
         }
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "symfony/http-foundation": "^4|^5|^6",
-        "symfony/http-kernel": "^4|^5|^6"
+        "symfony/http-foundation": "^4|^5|^6"
     },
     "require-dev": {
         "phpunit/phpunit": "^7|^9",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
         "psr-4": {
-            "Asm89\\Stack\\": "src/"
+            "Fruitcake\\Cors\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Asm89\\Stack\\Tests\\": "tests/"
+            "Fruitcake\\Cors\\Tests\\": "tests/"
         }
     },
     "scripts": {
@@ -37,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "1.0-dev"
         }
     }
 }

phpunit.xml.dist

@@ -10,7 +10,7 @@
          stopOnFailure="false"
 >
   <testsuites>
-    <testsuite name="Stack Cors Test Suite">
+    <testsuite name="Fruitcake Cors Test Suite">
       <directory>./tests</directory>
     </testsuite>
   </testsuites>

src/Cors.php

@@ -1,15 +1,16 @@
 <?php
 
 /*
- * This file is part of asm89/stack-cors.
+ * This file is part of fruitcake/php-cors and was originally part of asm89/stack-cors
  *
  * (c) Alexander <iam.asm89@gmail.com>
+ * (c) Barryvdh <barryvdh@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Asm89\Stack;
+namespace Fruitcake\Cors;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;

src/CorsService.php

@@ -1,17 +1,18 @@
 <?php
 
 /*
- * This file is part of asm89/stack-cors.
+ * This file is part of fruitcake/php-cors and was originally part of asm89/stack-cors
  *
  * (c) Alexander <iam.asm89@gmail.com>
+ * (c) Barryvdh <barryvdh@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Asm89\Stack\Tests;
+namespace Fruitcake\Cors\Tests;
 
-use Asm89\Stack\CorsService;
+use Fruitcake\Cors\CorsService;
 use PHPUnit\Framework\TestCase;
 
 class CorsServiceTest extends TestCase

tests/CorsServiceTest.php

@@ -1,18 +1,18 @@
 <?php
 
 /*
- * This file is part of asm89/stack-cors.
+ * This file is part of fruitcake/php-cors and was originally part of asm89/stack-cors
  *
  * (c) Alexander <iam.asm89@gmail.com>
+ * (c) Barryvdh <barryvdh@gmail.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Asm89\Stack\Tests;
+namespace Fruitcake\Cors\Tests;
 
-use Asm89\Stack\Cors;
-use Asm89\Stack\CorsService;
+use Fruitcake\Cors\CorsService;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -24,7 +24,7 @@ class CorsTest extends TestCase
      */
     public function it_does_modify_on_a_request_without_origin()
     {
-        $app                = $this->createStackedApp();
+        $app = $this->createStackedApp();
 
         $response = $app->handle(new Request());
 
@@ -564,6 +564,6 @@ private function createStackedApp(array $options = array(), array $responseHeade
             $options
         );
 
-        return new Cors(new MockApp($responseHeaders), $passedOptions);
+        return new MockApp($responseHeaders, $passedOptions);
     }
 }