Merge branch '4.4' into 5.1

* 4.4:
  Fix merge

Author: nicolas-grekas

.appveyor.yml

@@ -49,7 +49,7 @@ install:
     - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
     - git config --global user.email ""
     - git config --global user.name "Symfony"
-    - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
+    - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
     - SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev
     - php composer.phar update --no-progress --no-suggest --ansi
     - php phpunit install

src/Symfony/Bridge/PhpUnit/composer.json

@@ -46,12 +46,5 @@
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
-<<<<<<< HEAD
-    },
-    "extra": {
-        "branch-version": "5.1-dev"
-    }
-=======
     }
->>>>>>> 4.4
 }

src/Symfony/Component/Notifier/composer.json

@@ -29,13 +29,7 @@
         ]
     },
     "minimum-stability": "dev",
-<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
     "extra": {
         "branch-version": "5.1-dev"
     }
-=======
-    "extra": {
-        "branch-version": "5.1-dev"
-    }
->>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
 }