update github actions to latest version and use semantic branch naming

dbu · dbu · commit 89f5b02e2ce7 · 2023-02-18T14:59:46.000+01:00
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -4,7 +4,9 @@ on:
     pull_request:
     push:
         branches:
-            - 'master'
+            - '[0-9]+.x'
+            - '[0-9]+.[0-9]+'
+            - '[0-9]+.[0-9]+.x'
 
 jobs:
     test:
@@ -26,10 +28,11 @@ jobs:
                     - php-version: '7.4'
                     - php-version: '8.0'
                     - php-version: '8.1'
+                    - php-version: '8.2'
 
         steps:
             - name: Checkout project
-              uses: actions/checkout@v2
+              uses: actions/checkout@v3
 
             - name: Install and configure PHP
               uses: shivammathur/setup-php@v2
@@ -38,7 +41,7 @@ jobs:
                   tools: 'composer:v2'
 
             - name: Install dependencies with Composer
-              uses: ramsey/composer-install@v1
+              uses: ramsey/composer-install@v2
               with:
                   dependency-versions: ${{ matrix.dependencies }}
                   composer-options: --prefer-dist
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.1.7
+-----
+
+* **2023-02-18**: Adjust documentation links in README
+
 2.1.6
 -----
 
diff --git a/composer.json b/composer.json
@@ -37,10 +37,5 @@
         "psr-0": {
             "PHPCR": "tests"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
     }
 }
diff --git a/src/overview.html b/src/overview.html
@@ -9,7 +9,7 @@
 
 <body>
 
-<p>PHP Content Repository API based on the Java Content Repository specification (<a href="http://java.net/projects/jsr-283/">JSR-283</a>). If you know JCR, get the <a href="https://raw.github.com/phpcr/phpcr/master/doc/JCR_TO_PHPCR.txt">differences between PHPCR and JCR at a glance</a>. To learn PHPCR, please have a look at our <a href="https://github.com/phpcr/phpcr/blob/master/doc/Tutorial.md">tutorial</a>.</p>
+<p>PHP Content Repository API based on the Java Content Repository specification (<a href="http://java.net/projects/jsr-283/">JSR-283</a>). If you know JCR, get the <a href="https://raw.github.com/phpcr/phpcr/2.1.x/doc/JCR_TO_PHPCR.txt">differences between PHPCR and JCR at a glance</a>. To learn PHPCR, please have a look at our <a href="https://github.com/phpcr/phpcr/blob/2.1.x/doc/Tutorial.md">tutorial</a>.</p>
 <br />
 <h2>Basic Workflow</h2>
 
@@ -38,4 +38,3 @@ <h2>Basic Workflow</h2>
 
 </body>
 </html>
-

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,5 @@`
`37`	`37`	`"psr-0": {`
`38`	`38`	`"PHPCR": "tests"`
`39`	`39`	`}`
`40`		`- },`
`41`		`- "extra": {`
`42`		`- "branch-alias": {`
`43`		`- "dev-master": "2.1-dev"`
`44`		`- }`
`45`	`40`	`}`
`46`	`41`	`}`