Merge branch '2.3'

Author: dunglas

.travis.yml

@@ -9,17 +9,18 @@ jobs:
   include:
     - php: '7.1'
     - php: '7.2'
-    - php: '7.2'
+    - php: '7.3'
+    - php: '7.3'
       env: deps=low
-    - php: '7.2'
+    - php: '7.3'
       env: SYMFONY_DEPRECATIONS_HELPER=0
-    - php: '7.2'
+    - php: '7.3'
       services:
         - postgresql
       before_script:
         - psql -c 'create database api_platform_test;' -U postgres
       env: APP_ENV=postgres
-    - php: '7.2'
+    - php: '7.3'
       services:
         - mysql
       before_script:

composer.json

@@ -34,46 +34,45 @@
         "behatch/contexts": "3.1.0",
         "doctrine/annotations": "^1.2",
         "doctrine/doctrine-bundle": "^1.8",
-        "doctrine/orm": "^2.5.2",
+        "doctrine/orm": "^2.6.3",
         "friendsofsymfony/user-bundle": "^2.1",
         "guzzlehttp/guzzle": "^6.0",
         "justinrainbow/json-schema": "^5.0",
         "nelmio/api-doc-bundle": "^2.13.3",
         "php-mock/php-mock-phpunit": "^2.0",
         "phpdocumentor/reflection-docblock": "^3.0 || ^4.0",
-        "phpdocumentor/type-resolver": "^0.2.1 || ^0.3 || 0.4",
+        "phpdocumentor/type-resolver": "^0.3 || ^0.4",
         "phpunit/phpunit": "^6.1",
         "psr/log": "^1.0",
         "ramsey/uuid": "^3.7",
         "ramsey/uuid-doctrine": "^1.4",
-        "symfony/asset": "^3.3 || ^4.0",
-        "symfony/cache": "^3.3 || ^4.0",
+        "symfony/asset": "^3.4 || ^4.0",
+        "symfony/cache": "^3.4 || ^4.0",
         "symfony/config": "^3.4 || ^4.0",
         "symfony/console": "^3.4 || ^4.0",
-        "symfony/debug": "^2.8 || ^3.0 || ^4.0",
+        "symfony/debug": "^3.4 || ^4.0",
         "symfony/dependency-injection": "^3.4 || ^4.0",
-        "symfony/doctrine-bridge": "^2.8.12 || ^3.0 || ^4.0",
+        "symfony/doctrine-bridge": "^3.4 || ^4.0",
         "symfony/event-dispatcher": "^3.4 || ^4.0",
-        "symfony/expression-language": "^2.8 || ^3.0 || ^4.0",
-        "symfony/finder": "^3.3 || ^4.0",
-        "symfony/form": "^3.3 || ^4.0",
-        "symfony/framework-bundle": "^3.3 || ^4.0",
+        "symfony/expression-language": "^3.4 || ^4.0",
+        "symfony/finder": "^3.4 || ^4.0",
+        "symfony/form": "^3.4 || ^4.0",
+        "symfony/framework-bundle": "^3.4 || ^4.0",
         "symfony/mercure": "*",
         "symfony/mercure-bundle": "*",
         "symfony/messenger": "^4.1",
-        "symfony/phpunit-bridge": "^3.3 || ^4.0",
-        "symfony/routing": "^3.3 || ^4.0",
-        "symfony/security": "^3.0 || ^4.0",
+        "symfony/phpunit-bridge": "^3.4 || ^4.0",
+        "symfony/routing": "^3.4 || ^4.0",
+        "symfony/security": "^3.4 || ^4.0",
         "symfony/security-bundle": "^3.4 || ^4.0",
         "symfony/twig-bundle": "^3.4 || ^4.0",
-        "symfony/validator": "^3.3 || ^4.0",
-        "symfony/web-profiler-bundle": "^3.3 || ^4.0",
-        "symfony/yaml": "^3.3 || ^4.0",
+        "symfony/validator": "^3.4 || ^4.0",
+        "symfony/web-profiler-bundle": "^3.4 || ^4.0",
+        "symfony/yaml": "^3.4 || ^4.0",
         "webonyx/graphql-php": ">=0.13 <1.0"
     },
     "conflict": {
-        "doctrine/common": "<2.7",
-        "symfony/dependency-injection": "<3.4"
+        "doctrine/common": "<2.7"
     },
     "suggest": {
         "friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge.",