Merge pull request #3245 from teohhanhui/merge-2.5

Merge 2.5 into master

Author: teohhanhui

.circleci/config.yml

@@ -1,9 +1,27 @@
 # Changelog
 
-## 2.6.0
+## 2.6.x-dev
 
 * MongoDB: Possibility to add execute options (aggregate command fields) for a resource, like `allowDiskUse` (#3144)
 
+## 2.5.1
+
+* Compatibility with Symfony 5
+* Fix a notice in `SerializerContextBuilder`
+* Fix dashed path segment generation
+* Fix support for custom filters without constructor in the `@ApiFilter` annotation
+* Fix a bug that was preventing to disable Swagger/OpenAPI
+* Return a `404` HTTP status code instead of `500` whe the identifier is invalid (e.g.: invalid UUID)
+* Add links to the documentation in `@ApiResource` annotation's attributes to improve DX
+* JSON:API: fix pagination being ignored when using the `filter` query parameter
+* Elasticsearch: Allow multiple queries to be set
+* OpenAPI: Do not append `body` parameter if it already exists
+* OpenAPI: Fix removal of illegal characters in schema name for Amazon API Gateway
+* Swagger UI: Add missing `oauth2-redirect` configuration
+* Swagger UI: Allow changing the location of Swagger UI
+* GraphQL: Fix an error that was occurring when `SecurityBundle` was not installed
+* HTTP/2 Server Push: Push relations as `fetch`
+
 ## 2.5.0
 
 * Fix BC-break when using short-syntax notation for `access_control`

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ default:
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'
       filters:
-        tags: '~@postgres&&~@mongodb&&~@elasticsearch'
+        tags: '~@postgres&&~@mongodb&&~@elasticsearch&&~@legacy'
   extensions:
     'Behat\Symfony2Extension':
       kernel:
@@ -36,12 +36,6 @@ default:
           symfony2: ~
     'Behatch\Extension': ~
 
-default-no-legacy:
-  suites:
-    default:
-      filters:
-        tags: '~@postgres&&~@mongodb&&~@elasticsearch&&~@legacy'
-
 postgres:
   suites:
     default: false
@@ -64,14 +58,6 @@ postgres:
             schemaFile: '%paths.base%/tests/Fixtures/JsonHal/jsonhal.json'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'
-      filters:
-        tags: '~@sqlite&&~@mongodb&&~@elasticsearch'
-
-postgres-no-legacy:
-  suites:
-    default: false
-    postgres:
-      <<: *postgres-suite
       filters:
         tags: '~@sqlite&&~@mongodb&&~@elasticsearch&&~@legacy'
 
@@ -97,14 +83,6 @@ mongodb:
             schemaFile: '%paths.base%/tests/Fixtures/JsonHal/jsonhal.json'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'
-      filters:
-        tags: '~@sqlite&&~@elasticsearch&&~@!mongodb'
-
-mongodb-no-legacy:
-  suites:
-    default: false
-    mongodb:
-      <<: *mongodb-suite
       filters:
         tags: '~@sqlite&&~@elasticsearch&&~@!mongodb&&~@legacy'
 
@@ -124,20 +102,12 @@ elasticsearch:
         - 'JsonContext'
         - 'Behatch\Context\RestContext'
         - 'Behat\MinkExtension\Context\MinkContext'
-      filters:
-        tags: '@elasticsearch'
-
-elasticsearch-no-legacy:
-  suites:
-    default: false
-    elasticsearch:
-      <<: *elasticsearch-suite
       filters:
         tags: '@elasticsearch&&~@legacy'
 
 default-coverage:
   suites:
-    default:
+    default: &default-coverage-suite
       contexts:
         - 'CommandContext'
         - 'DoctrineContext':
@@ -161,7 +131,7 @@ default-coverage:
 mongodb-coverage:
   suites:
     default: false
-    mongodb:
+    mongodb: &mongodb-coverage-suite
       <<: *mongodb-suite
       contexts:
         - 'CommandContext'
@@ -186,7 +156,7 @@ mongodb-coverage:
 elasticsearch-coverage:
   suites:
     default: false
-    elasticsearch:
+    elasticsearch: &elasticsearch-coverage-suite
       <<: *elasticsearch-suite
       contexts:
         - 'CommandContext'
@@ -199,3 +169,56 @@ elasticsearch-coverage:
         - 'CoverageContext'
         - 'Behatch\Context\RestContext'
         - 'Behat\MinkExtension\Context\MinkContext'
+
+default-legacy:
+  suites:
+    default:
+      filters:
+        tags: '~@postgres&&~@mongodb&&~@elasticsearch'
+
+postgres-legacy:
+  suites:
+    default: false
+    postgres:
+      <<: *postgres-suite
+      filters:
+        tags: '~@sqlite&&~@mongodb&&~@elasticsearch'
+
+mongodb-legacy:
+  suites:
+    default: false
+    mongodb:
+      <<: *mongodb-suite
+      filters:
+        tags: '~@sqlite&&~@elasticsearch&&~@!mongodb'
+
+elasticsearch-legacy:
+  suites:
+    default: false
+    elasticsearch:
+      <<: *elasticsearch-suite
+      filters:
+        tags: '@elasticsearch'
+
+default-legacy-coverage:
+  suites:
+    default:
+      <<: *default-coverage-suite
+      filters:
+        tags: '~@postgres&&~@mongodb&&~@elasticsearch'
+
+mongodb-legacy-coverage:
+  suites:
+    default: false
+    mongodb:
+      <<: *mongodb-coverage-suite
+      filters:
+        tags: '~@sqlite&&~@elasticsearch&&~@!mongodb'
+
+elasticsearch-legacy-coverage:
+  suites:
+    default: false
+    elasticsearch:
+      <<: *elasticsearch-coverage-suite
+      filters:
+        tags: '@elasticsearch'

CHANGELOG.md

@@ -15,14 +15,15 @@
     "require": {
         "php": ">=7.1",
         "doctrine/inflector": "^1.0",
+        "fig/link-util": "^1.0",
         "psr/cache": "^1.0",
         "psr/container": "^1.0",
-        "symfony/http-foundation": "^3.4 || ^4.0",
-        "symfony/http-kernel": "^3.4 || ^4.0",
-        "symfony/property-access": "^3.4 || ^4.0",
-        "symfony/property-info": "^3.4 || ^4.0",
-        "symfony/serializer": "^4.3",
-        "symfony/web-link": "^4.1",
+        "symfony/http-foundation": "^4.3.6 || ^5.0",
+        "symfony/http-kernel": "^4.3.7 || ^5.0",
+        "symfony/property-access": "^3.4 || ^4.0 || ^5.0",
+        "symfony/property-info": "^3.4 || ^4.0 || ^5.0",
+        "symfony/serializer": "^4.3 || ^5.0",
+        "symfony/web-link": "^4.1 || ^5.0",
         "willdurand/negotiation": "^2.0.3"
     },
     "require-dev": {
@@ -31,11 +32,11 @@
         "behat/mink-browserkit-driver": "^1.3.1",
         "behat/mink-extension": "^2.2",
         "behat/symfony2-extension": "^2.1.1",
-        "behatch/contexts": "3.1.0",
+        "behatch/contexts": "^3.1.0",
         "doctrine/annotations": "^1.7",
         "doctrine/common": "^2.11",
         "doctrine/data-fixtures": "^1.2.2",
-        "doctrine/doctrine-bundle": "^1.8",
+        "doctrine/doctrine-bundle": "^1.8 || ^2.0",
         "doctrine/doctrine-cache-bundle": "^1.3.5",
         "doctrine/mongodb-odm": "^2.0",
         "doctrine/mongodb-odm-bundle": "^4.0",
@@ -50,7 +51,7 @@
         "phpdocumentor/type-resolver": "^0.3 || ^0.4",
         "phpspec/prophecy": "^1.8",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^0.11.10 <0.11.17",
+        "phpstan/phpstan": "^0.11.10",
         "phpstan/phpstan-doctrine": "^0.11.5",
         "phpstan/phpstan-phpunit": "^0.11.2",
         "phpstan/phpstan-symfony": "^0.11.6",
@@ -59,32 +60,32 @@
         "ramsey/uuid": "^3.7",
         "ramsey/uuid-doctrine": "^1.4",
         "sebastian/object-enumerator": "^3.0.3",
-        "symfony/asset": "^3.4 || ^4.0",
-        "symfony/browser-kit": "^4.3",
-        "symfony/cache": "^3.4 || ^4.0",
-        "symfony/config": "^3.4 || ^4.0",
-        "symfony/console": "^3.4 || ^4.0",
-        "symfony/css-selector": "^3.4 || ^4.0",
-        "symfony/debug": "^3.4 || ^4.0",
-        "symfony/dependency-injection": "^3.4 || ^4.0",
-        "symfony/doctrine-bridge": "^3.4 || ^4.0",
-        "symfony/dom-crawler": "^3.4 || ^4.0",
-        "symfony/event-dispatcher": "^3.4 || ^4.0",
-        "symfony/expression-language": "^3.4 || ^4.0",
-        "symfony/finder": "^3.4 || ^4.0",
-        "symfony/form": "^3.4 || ^4.0",
-        "symfony/framework-bundle": "^4.3.2",
-        "symfony/http-client": "^4.3",
+        "symfony/asset": "^3.4 || ^4.0 || ^5.0",
+        "symfony/browser-kit": "^4.3 || ^5.0",
+        "symfony/cache": "^3.4 || ^4.0 || ^5.0",
+        "symfony/config": "^3.4 || ^4.0 || ^5.0",
+        "symfony/console": "^3.4 || ^4.0 || ^5.0",
+        "symfony/css-selector": "^3.4 || ^4.0 || ^5.0",
+        "symfony/debug": "^3.4 || ^4.0 || ^5.0",
+        "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0",
+        "symfony/doctrine-bridge": "^3.4 || ^4.0 || ^5.0",
+        "symfony/dom-crawler": "^3.4 || ^4.0 || ^5.0",
+        "symfony/event-dispatcher": "^3.4 || ^4.0 || ^5.0",
+        "symfony/expression-language": "^3.4 || ^4.0 || ^5.0",
+        "symfony/finder": "^3.4 || ^4.0 || ^5.0",
+        "symfony/form": "^3.4 || ^4.0 || ^5.0",
+        "symfony/framework-bundle": "^4.3.2 || ^5.0",
+        "symfony/http-client": "^4.3 || ^5.0",
         "symfony/mercure-bundle": "*",
-        "symfony/messenger": "^4.3",
-        "symfony/phpunit-bridge": "^4.3@dev",
-        "symfony/routing": "^3.4 || ^4.3",
-        "symfony/security-bundle": "^3.4 || ^4.0",
-        "symfony/security-core": "^4.3",
-        "symfony/twig-bundle": "^3.4 || ^4.0",
-        "symfony/validator": "^3.4 || ^4.0",
-        "symfony/web-profiler-bundle": "^4.2",
-        "symfony/yaml": "^3.4 || ^4.0",
+        "symfony/messenger": "^4.3 || ^5.0",
+        "symfony/phpunit-bridge": "^4.3 || ^5.0",
+        "symfony/routing": "^3.4 || ^4.3 || ^5.0",
+        "symfony/security-bundle": "^3.4 || ^4.0 || ^5.0",
+        "symfony/security-core": "^4.3 || ^5.0",
+        "symfony/twig-bundle": "^3.4 || ^4.0 || ^5.0",
+        "symfony/validator": "^3.4 || ^4.0 || ^5.0",
+        "symfony/web-profiler-bundle": "^4.2 || ^5.0",
+        "symfony/yaml": "^3.4 || ^4.0 || ^5.0",
         "twig/twig": "^1.42.3 || ^2.12",
         "webonyx/graphql-php": ">=0.13.1 <1.0"
     },