Merge branch '4.4'

* 4.4:
  Run the phpunit-bridge from a PR

.gitignore

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

.travis.yml

@@ -181,6 +181,22 @@ 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
+      fi
+
     - |
       # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
       if [[ ! $deps ]]; then
@@ -193,6 +209,10 @@ install:
           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