From b43287ba213b4c626c0c562f71bb8eaf1abe96e1 Mon Sep 17 00:00:00 2001
From: Josemar Lohn <j@lohn.in>
Date: Sat, 7 Aug 2021 05:52:36 -0300
Subject: [PATCH] update workflow to include matrix of phps

---
 .github/workflows/php.yml | 53 +++++++++++++++++++++++----------------
 composer.json             | 14 +++++------
 composer.lock             | 29 +++++++++++----------
 3 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 8db103e..882c33c 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -2,32 +2,41 @@ name: PHP Composer
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   build:
-
+    strategy:
+      matrix:
+        php-versions: ["7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1"]
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Validate composer.json and composer.lock
-      run: composer validate --strict
-
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-
-
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress
-
-    - name: Run test suite
-      run: composer run-script test
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, simplexml, dom, curl
+          coverage: pcov
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate --strict
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run test suite
+        run: composer run-script test
diff --git a/composer.json b/composer.json
index 03000d4..179bee1 100644
--- a/composer.json
+++ b/composer.json
@@ -7,12 +7,12 @@
   "require": {
     "mf2/mf2": "^0.4",
     "ezyang/htmlpurifier": "^4.10",
-    "indieweb/link-rel-parser": "0.1.*",
-    "dg/twitter-php": "3.6.*",
-    "p3k/timezone": "~0.1.0",
-    "p3k/http": "~0.1.11",
-    "cebe/markdown": "1.1.*",
-    "p3k/picofeed": "~0.1.40",
+    "indieweb/link-rel-parser": "^0.1.0",
+    "dg/twitter-php": "^3.0.0",
+    "p3k/timezone": "^0.1.0",
+    "p3k/http": "^0.1.0",
+    "cebe/markdown": "^1.1.0",
+    "p3k/picofeed": "^0.1.0",
     "masterminds/html5": "^2.3"
   },
   "autoload": {
@@ -27,7 +27,7 @@
   "require-dev": {
     "league/plates": "3.*",
     "league/route": "1.*",
-    "phpunit/phpunit": "^9.0.0"
+    "phpunit/phpunit": "^8.0.0|^9.0.0"
   },
   "autoload-dev": {
     "files": [
diff --git a/composer.lock b/composer.lock
index 2da9997..06d04e5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1e861fcf3e3f352fc91a011ff1bae693",
+    "content-hash": "1b2e5d5447b1df7329bbcaf10c44d29f",
     "packages": [
         {
             "name": "cebe/markdown",
-            "version": "1.1.2",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cebe/markdown.git",
-                "reference": "25b28bae8a6f185b5030673af77b32e1163d5c6e"
+                "reference": "9bac5e971dd391e2802dca5400bbeacbaea9eb86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cebe/markdown/zipball/25b28bae8a6f185b5030673af77b32e1163d5c6e",
-                "reference": "25b28bae8a6f185b5030673af77b32e1163d5c6e",
+                "url": "https://api.github.com/repos/cebe/markdown/zipball/9bac5e971dd391e2802dca5400bbeacbaea9eb86",
+                "reference": "9bac5e971dd391e2802dca5400bbeacbaea9eb86",
                 "shasum": ""
             },
             "require": {
@@ -35,7 +35,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -68,25 +68,25 @@
                 "issues": "https://github.com/cebe/markdown/issues",
                 "source": "https://github.com/cebe/markdown"
             },
-            "time": "2017-07-16T21:13:23+00:00"
+            "time": "2018-03-26T11:24:36+00:00"
         },
         {
             "name": "dg/twitter-php",
-            "version": "v3.6",
+            "version": "v3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dg/twitter-php.git",
-                "reference": "dd872ad12121ff919b358989e61f7f08ba6cc7a8"
+                "reference": "d9370c9759138200a77ca86abcb0c5ddfe857c68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dg/twitter-php/zipball/dd872ad12121ff919b358989e61f7f08ba6cc7a8",
-                "reference": "dd872ad12121ff919b358989e61f7f08ba6cc7a8",
+                "url": "https://api.github.com/repos/dg/twitter-php/zipball/d9370c9759138200a77ca86abcb0c5ddfe857c68",
+                "reference": "d9370c9759138200a77ca86abcb0c5ddfe857c68",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
-                "php": ">=5.2.0"
+                "php": ">=5.4.0"
             },
             "type": "library",
             "autoload": {
@@ -111,10 +111,9 @@
                 "twitter"
             ],
             "support": {
-                "issues": "https://github.com/dg/twitter-php/issues",
-                "source": "https://github.com/dg/twitter-php/tree/v3.6"
+                "source": "https://github.com/dg/twitter-php/tree/v3.8"
             },
-            "time": "2016-08-15T16:46:22+00:00"
+            "time": "2019-02-08T16:20:01+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",