Change default branch from master to main

* Change default branch from master to main * Also add PHP 8.2 to CI. * Add `--allow-polyfill-parser` for Phan on Windows PHP 8.2
samwilson · Apr 24, 2023 · 192ccbb · 192ccbb
1 parent 7c6bfe5
commit 192ccbb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
         # All supported PHP versions https://www.php.net/supported-versions.php
-        php: [ '7.4', '8.0', '8.1' ]
+        php: [ '7.4', '8.0', '8.1', '8.2' ]
 
     runs-on: ${{matrix.os}}
 

diff --git a/.github/workflows/netlify-deploy.yml b/.github/workflows/netlify-deploy.yml
@@ -2,7 +2,7 @@ name: 'Netlify Deploy'
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   deploy:

diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
             "parallel-lint . --exclude node_modules --exclude vendor",
             "phpcs -s",
             "phpunit",
-            "phan"
+            "phan --allow-polyfill-parser"
         ]
     }
 }
diff --git a/docs/content/templates.md b/docs/content/templates.md
@@ -34,7 +34,7 @@ these are explained on this page.
    To get the full details of the returned structure,
    see e.g. [wikidata.org/wiki/Special:EntityData/Q42.json](https://www.wikidata.org/wiki/Special:EntityData/Q42.json).
 5. `wikidata_query(sparql)` — Returns the result of the Sparql query from Wikidata.
-   See the example in [/example/templates/tag.html.twig](https://github.com/samwilson/basildon/blob/master/example/templates/tag.html.twig)
+   See the example in [/example/templates/tag.html.twig](https://github.com/samwilson/basildon/blob/main/example/templates/tag.html.twig)
 6. `wikipedia(lang, title)` — Returns an HTML extract of the given article.
    For example: `{{wikipedia('en', 'Tag (metadata)')|raw}}`
 

diff --git a/docs/templates/index.html.twig b/docs/templates/index.html.twig
@@ -19,7 +19,7 @@
 <footer>
     <ul>
         <li><a href="https://github.com/samwilson/basildon/issues">Report an issue</a></li>
-        <li><a href="https://github.com/samwilson/basildon/edit/master/docs/content{{ page.id }}{{ site.ext }}">Edit this page</a></li>
+        <li><a href="https://github.com/samwilson/basildon/edit/main/docs/content{{ page.id }}{{ site.ext }}">Edit this page</a></li>
     </ul>
 </footer>
 </body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: 'Netlify Deploy' @@
     on:
       push:
-        branches: [ master ]
+        branches: [ main ]
     jobs:
       deploy:
@@ Expand Down @@