Merge pull request #789 from driehle/feat/update-workflows

Updated upstream workflows, adding composer-lint

Author: driehle

.github/workflows/coding-standards.yml

@@ -11,6 +11,6 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.4.1"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0"
     with:
       php-version: '8.1'

.github/workflows/composer-lint.yml

@@ -0,0 +1,20 @@
+name: "Composer Lint"
+
+on:
+  pull_request:
+    branches:
+      - "*.x"
+    paths:
+      - "composer.json"
+  push:
+    branches:
+      - "*.x"
+    paths:
+      - "composer.json"
+
+jobs:
+  composer-lint:
+    name: "Composer Lint"
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      php-version: "8.1"

.github/workflows/continuous-integration.yml

@@ -2,72 +2,15 @@ name: "Continuous Integration"
 
 on:
   pull_request:
+    branches:
+      - "*.x"
   push:
     branches:
-      - '[0-9]+.[0-9]+.x'
-      - 'refs/pull/*'
+      - "*.x"
 
 jobs:
   phpunit:
     name: "PHPUnit"
-    runs-on: "ubuntu-20.04"
-
-    strategy:
-      matrix:
-        php-version:
-          - "7.4"
-          - "8.0"
-          - "8.1"
-        dependencies:
-          - "highest"
-          - "lowest"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php-version }}"
-          coverage: "pcov"
-          ini-values: "zend.assertions=1"
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-        with:
-          dependency-versions: "${{ matrix.dependencies }}"
-          composer-options: "--prefer-dist"
-
-      - name: "Run PHPUnit"
-        run: "composer test-coverage"
-
-      - name: "Upload coverage file"
-        uses: "actions/upload-artifact@v2"
-        with:
-          name: "phpunit-${{ matrix.php-version }}-${{ matrix.dependencies }}.coverage"
-          path: "coverage.xml"
-
-  upload_coverage:
-    name: "Upload coverage to Codecov"
-    runs-on: "ubuntu-20.04"
-    needs:
-      - "phpunit"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 2
-
-      - name: "Download coverage files"
-        uses: "actions/download-artifact@v2"
-        with:
-          path: "reports"
-
-      - name: "Upload to Codecov"
-        uses: "codecov/codecov-action@v1"
-        with:
-          directory: "reports"
+    uses: "doctrine/.github/.github/workflows/[email protected]"
+    with:
+      php-versions: '["7.4", "8.0", "8.1"]'

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.4.1"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.1.0"
     with:
       use-next-minor-as-default-branch: true
     secrets:

.github/workflows/static-analysis.yml

@@ -11,6 +11,6 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@1.4.1"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0"
     with:
       php-version: '8.1'

composer.json

@@ -1,9 +1,8 @@
 {
     "name": "doctrine/doctrine-module",
     "description": "Laminas Module that provides Doctrine basic functionality required for ORM and ODM modules",
-    "type": "library",
     "license": "MIT",
-    "homepage": "http://www.doctrine-project.org/",
+    "type": "library",
     "keywords": [
         "doctrine",
         "module",
@@ -35,12 +34,7 @@
             "homepage": "https://tomhanderson.com"
         }
     ],
-    "extra": {
-        "laminas": {
-            "config-provider": "DoctrineModule\\ConfigProvider",
-            "module": "DoctrineModule"
-        }
-    },
+    "homepage": "http://www.doctrine-project.org/",
     "require": {
         "php": "^7.4 || ~8.0.0 || ~8.1.0",
         "container-interop/container-interop": "^1.2.0",
@@ -63,9 +57,6 @@
         "laminas/laminas-validator": "^2.16.0",
         "symfony/console": "^5.4.3 || ^6.0.3"
     },
-    "provide": {
-        "laminas/laminas-cache-storage-implementation": "1.0.0"
-    },
     "require-dev": {
         "doctrine/coding-standard": "^9.0.0",
         "doctrine/mongodb-odm": "^2.3.0",
@@ -87,6 +78,9 @@
     "conflict": {
         "doctrine/orm": "2.12.0"
     },
+    "provide": {
+        "laminas/laminas-cache-storage-implementation": "1.0.0"
+    },
     "suggest": {
         "doctrine/data-fixtures": "Data Fixtures if you want to generate test data or bootstrap data for your deployments"
     },
@@ -104,12 +98,18 @@
         "bin/doctrine-module"
     ],
     "config": {
-        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        },
         "platform": {
             "ext-mongodb": "1.8.0"
         },
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
+        "sort-packages": true
+    },
+    "extra": {
+        "laminas": {
+            "config-provider": "DoctrineModule\\ConfigProvider",
+            "module": "DoctrineModule"
         }
     },
     "scripts": {