Merge pull request #3179 from teohhanhui/merge-2.5

Merge 2.5 into master

Author: teohhanhui

.circleci/config.yml

@@ -46,6 +46,13 @@ commands:
           command: |
             sudo pecl install pcov-1.0.6
             sudo docker-php-ext-enable pcov
+  install-symfony-flex:
+    steps:
+      - run:
+          name: Install Symfony Flex
+          command: |
+            composer global require --prefer-dist --no-progress --no-suggest --ansi \
+              symfony/flex
   merge-code-coverage-reports:
     parameters:
       dir:
@@ -117,11 +124,11 @@ commands:
     steps:
       - save_cache:
           paths:
-            - ~/.composer/cache
+            - ~/.composer/cache/files
           key: composer-cache-{{ .Branch }}-{{ .BuildNum }}
       - save_cache:
           paths:
-            - ~/.composer/cache
+            - ~/.composer/cache/files
           key: composer-cache-{{ .Revision }}-{{ .BuildNum }}
   save-npm-cache:
     steps:
@@ -201,27 +208,33 @@ executors:
   php:
     docker:
       - image: circleci/php:7.3-node
+        environment:
+          SYMFONY_REQUIRE: ^3.4 || ^4.0
   php-and-elasticsearch:
     docker:
       - image: circleci/php:7.3-node
-      # https://github.com/elastic/elasticsearch-docker/issues/84
-      - image: docker.elastic.co/elasticsearch/elasticsearch:6.7.2
+        environment:
+          SYMFONY_REQUIRE: ^3.4 || ^4.0
+      - image: docker.elastic.co/elasticsearch/elasticsearch:6.8.3 # https://github.com/elastic/elasticsearch/issues/43627
   php-and-mongodb:
     docker:
       - image: circleci/php:7.3-node
+        environment:
+          SYMFONY_REQUIRE: ^3.4 || ^4.0
       - image: circleci/mongo:4
 
 jobs:
   php-cs-fixer:
     executor: php
     environment:
-      PHP_CS_FIXER_FUTURE_MODE: 1
+      PHP_CS_FIXER_FUTURE_MODE: '1'
     working_directory: ~/api-platform/core
     steps:
       - checkout
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - restore-composer-cache
+      - install-symfony-flex
       - run:
           name: Install PHP-CS-Fixer
           command: |
@@ -239,15 +252,15 @@ jobs:
   phpstan:
     executor: php
     environment:
-      # https://github.com/phpstan/phpstan-symfony/issues/37
-      APP_DEBUG: 1
+      APP_DEBUG: '1' # https://github.com/phpstan/phpstan-symfony/issues/37
     working_directory: ~/api-platform/core
     steps:
       - checkout
       - install-mongodb-php-extension
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - restore-composer-cache
+      - install-symfony-flex
       - update-project-dependencies
       - save-composer-cache
       - clear-test-app-cache
@@ -268,6 +281,7 @@ jobs:
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - restore-composer-cache
+      - install-symfony-flex
       - update-project-dependencies
       - save-composer-cache
       - clear-test-app-cache
@@ -315,6 +329,7 @@ jobs:
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - restore-composer-cache
+      - install-symfony-flex
       - update-project-dependencies
       - save-composer-cache
       - clear-test-app-cache
@@ -360,6 +375,7 @@ jobs:
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - restore-composer-cache
+      - install-symfony-flex
       - update-project-dependencies
       - save-composer-cache
       - clear-test-app-cache
@@ -397,6 +413,7 @@ jobs:
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - restore-composer-cache
+      - install-symfony-flex
       - update-project-dependencies
       - save-composer-cache
       - clear-test-app-cache
@@ -440,6 +457,7 @@ jobs:
       - disable-xdebug-php-extension
       - disable-php-memory-limit
       - restore-composer-cache
+      - install-symfony-flex
       - update-project-dependencies
       - save-composer-cache
       - clear-test-app-cache