Merge pull request #360 from doctrine/1.4.x

Merge up
doctrine · Jan 23, 2021 · 6b09c0b · 6b09c0b
2 parents 451694a + a7f9376
commit 6b09c0b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -5,20 +5,26 @@
     "docsSlug": "doctrine-data-fixtures",
     "versions": [
         {
-            "name": "1.4",
-            "branchName": "master",
+            "name": "1.5",
+            "branchName": "1.5.x",
             "slug": "latest",
             "upcoming": true
         },
         {
-            "name": "1.3",
-            "branchName": "1.3",
-            "slug": "1.3",
+            "name": "1.4",
+            "branchName": "1.4.x",
+            "slug": "1.4",
             "current": true,
             "aliases": [
                 "current",
                 "stable"
             ]
+        },
+        {
+            "name": "1.3",
+            "branchName": "1.3",
+            "slug": "1.3",
+            "maintained": false
         }
     ]
 }
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -4,11 +4,9 @@ on:
   pull_request:
     branches:
       - "*.x"
-      - "master"
   push:
     branches:
       - "*.x"
-      - "master"
 
 jobs:
   coding-standards:

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -4,11 +4,9 @@ on:
   pull_request:
     branches:
       - "*.x"
-      - "master"
   push:
     branches:
       - "*.x"
-      - "master"
 
 env:
   fail-fast: true
@@ -30,6 +28,7 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
+          - "8.0"
         dependencies:
           - "highest"
         include:

diff --git a/composer.json b/composer.json
@@ -38,11 +38,6 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4.x-dev"
-        }
-    },
     "autoload": {
         "psr-4": {
             "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures"