Merge bef233a into c6c48aa

zf-fr · Jun 18, 2019 · b5642b3 · b5642b3
2 parents c6c48aa + bef233a
commit b5642b3
Show file tree

Hide file tree

Showing 16 changed files with 1,622 additions and 1,268 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,52 +9,31 @@ cache:
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - COMPOSER_ARGS="--no-interaction"
 
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
-      env:
-        - DEPS=lowest
-    - php: 5.6
-      env:
-        - DEPS=locked
-        - TEST_COVERAGE=true
-    - php: 5.6
-      env:
-        - DEPS=latest
-    - php: 7
+    - php: 7.1
       env:
         - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=locked
-        - CS_CHECK=true
-    - php: 7
+    - php: 7.1
       env:
         - DEPS=latest
-    - php: 7.1
+        - TEST_COVERAGE=true
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: 7.1
-      env:
-        - DEPS=locked
-        - CS_CHECK=true
-    - php: 7.1
+    - php: 7.2
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: 7.3
       env:
         - DEPS=lowest
-    - php: hhvm
-      env:
-        - DEPS=locked
-    - php: hhvm
+    - php: 7.3
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
+        - CS_CHECK=true
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+# CHANGELOG
+
+## 2.0.0 - YYYY-MM-DD
+
+### Added
+
+- [#59](https://github.com/zf-fr/zfr-cors/pull/59) Added support for php 7.1, 7.2 and 7.3 versions
+
+### Changed
+
+- [#54](https://github.com/zf-fr/zfr-cors/pull/54) [BC Break] Changed `\ZfrCors\Mvc\CorsRequestListener` event `MvcEvent::EVENT_ROUTE` priority with has slight chance to cause BC Break. 
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#59](https://github.com/zf-fr/zfr-cors/pull/59) Removed support for hhvm, php 5.6 and 7.0 versions
+
+### Fixed
+
+- [#53](https://github.com/zf-fr/zfr-cors/pull/53), [#54](https://github.com/zf-fr/zfr-cors/pull/54) Method Routes preflight
+- [#55](https://github.com/zf-fr/zfr-cors/pull/55) Fixed `README.md` documentation for route-based configurations
+- [#56](https://github.com/zf-fr/zfr-cors/pull/56) Fixed issue with `zendframework/zend-http` v2.8
+- [#58](https://github.com/zf-fr/zfr-cors/pull/58), [#57](https://github.com/zf-fr/zfr-cors/pull/57) The second step of the CORS request need router params
+
 # 1.5.0
 
 - You may now configure rules per-route within zend-mvc route configuration.

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ builds HTTP responses that follow the CORS documentation.
 Install the module by typing (or add it to your `composer.json` file):
 
 ```sh
-$ php composer.phar require zfr/zfr-cors:1.*
+$ php composer.phar require zfr/zfr-cors
 ```
 
 Then, enable it by adding "ZfrCors" in your `application.config.php` file.
@@ -112,7 +112,9 @@ return [
                             'route' => '/blogpost',
                             'defaults' => [
                                 // This would only allow `http://example.org` to GET this route
-                                'allowed_methods' => ['GET'],
+                                \ZfrCors\Options\CorsOptions::ROUTE_PARAM => [
+                                    'allowed_methods' => ['GET'],
+                                ],
                             ],
                         ],
                         'may_terminate' => true,
@@ -123,7 +125,9 @@ return [
                                     'route' => ':id',
                                     // This would only allow origin `http://example.org` to apply DELETE on this route
                                     'defaults' => [
-                                        'allowed_methods' => ['DELETE'],
+                                        \ZfrCors\Options\CorsOptions::ROUTE_PARAM => [
+                                            'allowed_methods' => ['DELETE'],
+                                        ],
                                     ],
                                 ],
                             ],

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zfr/zfr-cors",
-    "description": "Zend Framework 2 module that let you deal with CORS requests",
+    "description": "Zend Framework module that let you deal with CORS requests",
     "type": "library",
     "license": "MIT",
     "keywords": [
@@ -28,21 +28,21 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
-        "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
-        "zendframework/zend-http": "^2.5.5",
-        "zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
-        "zendframework/zend-servicemanager": "^2.7.6 || ^3.1.1"
+        "php": "^7.1",
+        "zendframework/zend-eventmanager": "^2.6.4 || ^3.2.1",
+        "zendframework/zend-http": "^2.10",
+        "zendframework/zend-mvc": "^2.7.15 || ^3.1.1",
+        "zendframework/zend-servicemanager": "^2.7.9 || ^3.4.0"
     },
     "require-dev": {
-        "zendframework/zend-i18n": "^2.7.3",
-        "zendframework/zend-log": "^2.9.1",
+        "zendframework/zend-i18n": "^2.9",
+        "zendframework/zend-log": "^2.10",
         "zendframework/zend-modulemanager": "^2.7.2",
         "zendframework/zend-serializer": "^2.8",
         "zendframework/zend-view": "^2.8.1",
-        "phpunit/phpunit": "^4.8 || ^5.0",
-        "squizlabs/php_codesniffer": "^2.6.2",
-        "satooshi/php-coveralls": "^1.0.1"
+        "phpunit/phpunit": "^7.5.9 || ^8.2.2",
+        "php-coveralls/php-coveralls": "^2.1",
+        "squizlabs/php_codesniffer": "^3.4"
     },
     "autoload": {
         "psr-0": {
@@ -59,6 +59,6 @@
         "cs-fix": "phpcbf",
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover build/logs/clover.xml",
-        "upload-coverage": "coveralls -v"
+        "upload-coverage": "php-coveralls -v"
     }
 }