Merge branch '2.x' into deprec-sync

.github/workflows/checks.yml

-name: Checks
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  roave-bc-check:
-    name: Roave BC Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Roave BC Check
-        uses: "docker://nyholm/roave-bc-check-ga"

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - '*.x'
   pull_request:
 
 jobs:

.github/workflows/static.yml

@@ -3,7 +3,7 @@ name: Static analysis
 on:
   push:
     branches:
-      - master
+      - '*.x'
   pull_request:
 
 jobs:

composer.json

@@ -28,11 +28,6 @@
         "friends-of-phpspec/phpspec-code-coverage": "^4.1 || ^5.0 || ^6.0",
         "phpspec/phpspec": "^5.1 || ^6.0 || ^7.0"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "Http\\Client\\": "src/"