Merge pull request #308 from doctrine/11.0.x

Merge 11.0.x up into 11.1.x
doctrine · Jan 6, 2023 · 4bcfa9d · 4bcfa9d
2 parents b6660e1 + eec72ad
commit 4bcfa9d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -5,21 +5,27 @@
     "docsSlug": "doctrine-coding-standard",
     "versions": [
         {
-            "name": "11.0",
-            "branchName": "11.0.x",
-            "slug": "11.0",
+            "name": "12.0",
+            "branchName": "12.0.x",
+            "slug": "12.0",
             "upcoming": true
         },
         {
-            "name": "10.0",
-            "branchName": "10.0.x",
-            "slug": "10.0",
+            "name": "11.0",
+            "branchName": "11.0.x",
+            "slug": "11.0",
             "current": true,
             "aliases": [
                 "current",
                 "stable"
             ]
         },
+        {
+            "name": "10.0",
+            "branchName": "10.0.x",
+            "slug": "10.0",
+            "maintained": false
+        },
         {
             "name": "9.0",
             "branchName": "9.0.x",

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -14,7 +14,7 @@ jobs:
   coding-standards:
     name: "Coding Standards"
 
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-22.04"
 
     strategy:
       matrix:
@@ -47,7 +47,7 @@ jobs:
   validate-against-schema:
     name: "Validate against schema"
 
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-22.04"
 
     strategy:
       matrix:
@@ -85,7 +85,7 @@ jobs:
   test-report:
     name: "Test report"
 
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-22.04"
 
     strategy:
       fail-fast: false
@@ -123,7 +123,7 @@ jobs:
   test-fixes:
     name: "Test fixes"
 
-    runs-on: "ubuntu-18.04"
+    runs-on: "ubuntu-22.04"
 
     strategy:
       fail-fast: false

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
+        "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0.0",
         "slevomat/coding-standard": "^8.6.2",
         "squizlabs/php_codesniffer": "^3.7"
     },