symfony · fabpot · Aug 9, 2019 · Jul 24, 2019 · Jul 24, 2019 · Jul 24, 2019
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 4.4 for features / 3.4, 4.2 or 4.3 for bug fixes <!-- see below -->
+| Branch?       | 4.4 for features / 3.4 or 4.3 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | BC breaks?    | no     <!-- see https://symfony.com/bc -->

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ vendor/
 composer.lock
 phpunit.xml
 .php_cs.cache
+.phpunit.result.cache
 composer.phar
 package.tar
 /packages.json

diff --git a/.php_cs.dist b/.php_cs.dist
@@ -8,8 +8,9 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHPUnit48Migration:risky' => true,
-        'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
+        '@PHPUnit75Migration:risky' => true,
+        'php_unit_dedicate_assert' => ['target' => '5.6'],
+        'phpdoc_no_empty_return' => false, // triggers almost always false positive
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => false,
         'ordered_imports' => true,

diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,7 @@ env:
         - MIN_PHP=7.1.3
         - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
         - MESSENGER_AMQP_DSN=amqp://localhost/%2f/messages
+        - MESSENGER_REDIS_DSN=redis://127.0.0.1:7001/messages
 
 matrix:
     include:
@@ -28,7 +29,9 @@ matrix:
           env: deps=high
         - php: 7.3
           env: deps=low
-
+        - php: 7.4snapshot
+    allow_failures:
+    - php: 7.4snapshot
     fast_finish: true
 
 cache:
@@ -56,15 +59,18 @@ before_install:
 
     - |
       # Start Redis cluster
-      docker pull grokzen/redis-cluster:4.0.8
-      docker run -d -p 7000:7000 -p 7001:7001 -p 7002:7002 -p 7003:7003 -p 7004:7004 -p 7005:7005 --name redis-cluster grokzen/redis-cluster:4.0.8
+      docker pull grokzen/redis-cluster:5.0.4
+      docker run -d -p 7000:7000 -p 7001:7001 -p 7002:7002 -p 7003:7003 -p 7004:7004 -p 7005:7005 --name redis-cluster grokzen/redis-cluster:5.0.4
       export REDIS_CLUSTER_HOSTS='localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
 
     - |
       # General configuration
       set -e
       stty cols 120
       mkdir /tmp/slapd
+      if [ ! -e /tmp/slapd-modules ]; then
+          [ -d /usr/lib/openldap ] && ln -s /usr/lib/openldap /tmp/slapd-modules || ln -s /usr/lib/ldap /tmp/slapd-modules
+      fi
       slapd -f src/Symfony/Component/Ldap/Tests/Fixtures/conf/slapd.conf -h ldap://localhost:3389 &
       [ -d ~/.composer ] || mkdir ~/.composer
       cp .composer/* ~/.composer/
@@ -114,6 +120,7 @@ before_install:
           local ext_name=$1
           local ext_so=$2
           local INI=$3
+          local input=${4:-yes}
           local ext_dir=$(php -r "echo ini_get('extension_dir');")
           local ext_cache=~/php-ext/$(basename $ext_dir)/$ext_name
 
@@ -122,7 +129,7 @@ before_install:
           else
               rm ~/.pearrc /tmp/pear 2>/dev/null || true
               mkdir -p $ext_cache
-              echo yes | pecl install -f $ext_name &&
+              echo $input | pecl install -f $ext_name &&
               cp $ext_dir/$ext_so $ext_cache
           fi
       }
@@ -145,7 +152,6 @@ before_install:
           echo session.gc_probability = 0 >> $INI
           echo opcache.enable_cli = 1 >> $INI
           echo apc.enable_cli = 1 >> $INI
-          echo extension = redis.so >> $INI
           echo extension = memcached.so >> $INI
       done
 
@@ -159,12 +165,16 @@ before_install:
               tfold ext.libsodium tpecl libsodium sodium.so $INI
           fi
 
-          tfold ext.apcu tpecl apcu-5.1.16 apcu.so $INI
+          tfold ext.apcu tpecl apcu-5.1.17 apcu.so $INI
           tfold ext.mongodb tpecl mongodb-1.6.0alpha1 mongodb.so $INI
           tfold ext.igbinary tpecl igbinary-2.0.8 igbinary.so $INI
           tfold ext.zookeeper tpecl zookeeper-0.7.1 zookeeper.so $INI
           tfold ext.amqp tpecl amqp-1.9.4 amqp.so $INI
+          tfold ext.redis tpecl redis-4.3.0 redis.so $INI "no"
       done
+    - |
+      # List all php extensions with versions
+    - php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;'
 
     - |
       # Load fixtures
@@ -174,6 +184,23 @@ before_install:
       fi
 
 install:
+    - |
+      # Install the phpunit-bridge from a PR if required
+      #
+      # To run a PR with a patched phpunit-bridge, first submit the path for the
+      # phpunit-bridge as a separate PR against the next feature-branch then
+      # uncomment and update the following line with that PR number
+      #SYMFONY_PHPUNIT_BRIDGE_PR=32886
+
+      if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then
+          git fetch origin refs/pull/$SYMFONY_PHPUNIT_BRIDGE_PR/head
+          git rm -rq src/Symfony/Bridge/PhpUnit
+          git checkout -q FETCH_HEAD -- src/Symfony/Bridge/PhpUnit
+          SYMFONY_VERSION=$(cat src/Symfony/Bridge/PhpUnit/composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
+          sed -i 's/"symfony\/phpunit-bridge": ".*"/"symfony\/phpunit-bridge": "'$SYMFONY_VERSION'.x@dev"/' composer.json
+          rm -rf .phpunit
+      fi
+
     - |
       # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
       if [[ ! $deps ]]; then
@@ -182,10 +209,14 @@ install:
           export SYMFONY_DEPRECATIONS_HELPER=weak &&
           cp composer.json composer.json.orig &&
           echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json &&
-          php .github/build-packages.php HEAD^ $COMPONENTS &&
+          php .github/build-packages.php HEAD^ $(find src/Symfony -mindepth 3 -type f -name composer.json -printf '%h\n') &&
           mv composer.json composer.json.phpunit &&
           mv composer.json.orig composer.json
       fi
+      if [[ $SYMFONY_PHPUNIT_BRIDGE_PR ]]; then
+          git rm -fq -- src/Symfony/Bridge/PhpUnit/composer.json
+          git diff --staged -- src/Symfony/Bridge/PhpUnit/ | git apply -R --index
+      fi
 
     - |
       # For the master branch, when deps=high, the version before master is checked out and tested with the locally patched components