Merge branch '2.x' into deprec-sync

dbu · web-flow · commit 785c0b795d5e · 2023-04-14T16:44:38.000+02:00
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - '*.x'
   pull_request:
 
 jobs:
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -3,7 +3,7 @@ name: Static analysis
 on:
   push:
     branches:
-      - master
+      - '*.x'
   pull_request:
 
 jobs:
diff --git a/composer.json b/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/"
