Update PHP deps (#15)

JBZoo · Apr 28, 2021 · 0d52ea5 · 0d52ea5
1 parent 4add728
commit 0d52ea5
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 30 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -12,12 +12,12 @@
 #
 
 /.github             export-ignore
-/.phan               export-ignore
 /build               export-ignore
 /tests               export-ignore
 /.editorconfig       export-ignore
 /.gitattributes      export-ignore
 /.gitignore          export-ignore
+/.phan.php           export-ignore
 /.travis.yml         export-ignore
 /phpunit.xml.dist    export-ignore
 /Makefile            export-ignore

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@
 # @link       https://github.com/JBZoo/PHPUnit
 #
 
-name: Continuous Integration
+name: CI
 
 on:
   pull_request:
@@ -21,7 +21,7 @@ on:
     branches:
       - 'master'
   schedule:
-    - cron: '15 */8 * * *'
+    - cron: '35 */8 * * *'
 
 env:
   COLUMNS: 120
@@ -31,25 +31,28 @@ jobs:
   phpunit:
     name: PHPUnit
     runs-on: ubuntu-latest
+    env:
+      JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
     strategy:
       matrix:
-        php-version: [ 7.2, 7.3, 7.4 ]
-        xdebug: [ xdebug, none ]
+        php-version: [ 7.2, 7.3, 7.4, 8.0 ]
         experimental: [ false ]
+        coverage: [ xdebug, none ]
+        composer_flags: [ "--prefer-lowest", "" ]
         include:
-          - php-version: "8.0"
-            experimental: true
           - php-version: "8.1"
             experimental: true
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
-      - name: Setup PHP and composer
+      - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          coverage: ${{ matrix.xdebug }}
+          coverage: ${{ matrix.coverage }}
           tools: composer
 
       - name: Build the Project
@@ -60,10 +63,82 @@ jobs:
         continue-on-error: ${{ matrix.experimental }}
         run: make server-start test --no-print-directory
 
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
+          path: build/
+
+
+  linters:
+    name: Linters
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: [ 7.2, 7.3, 7.4, 8.0 ]
+        experimental: [ false ]
+        include:
+          - php-version: "8.1"
+            experimental: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer
+
+      - name: Build the Project
+        continue-on-error: ${{ matrix.experimental }}
+        run: make update --no-print-directory
+
       - name: 👍 Code Quality
         continue-on-error: ${{ matrix.experimental }}
         run: make codestyle --no-print-directory
 
-      - name: 📝 Build All Reports at Once
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Linters - ${{ matrix.php-version }}
+          path: build/
+
+
+  report:
+    name: Reports
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: [ 7.2, 7.3, 7.4, 8.0 ]
+        experimental: [ false ]
+        include:
+          - php-version: "8.1"
+            experimental: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer
+
+      - name: Build the Project
+        continue-on-error: ${{ matrix.experimental }}
+        run: make update --no-print-directory
+
+      - name: 📝 Build Reports
         continue-on-error: ${{ matrix.experimental }}
         run: make report-all --no-print-directory
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Reports - ${{ matrix.php-version }}
+          path: build/
diff --git a/.phan/config.php → .phan.php b/.phan/config.php → .phan.php
@@ -15,7 +15,7 @@
 
 declare(strict_types=1);
 
-$default = include __DIR__ . '/../vendor/jbzoo/codestyle/src/phan/default.php';
+$default = include __DIR__ . '/vendor/jbzoo/codestyle/src/phan/default.php';
 
 // See isNotLike(), isLike()
 $index = array_search('UnusedSuppressionPlugin', $default['plugins'], true);

diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,9 @@ language: php
 os: linux
 dist: xenial
 
+git:
+  depth: false
+
 php:
   - 7.2
   - 7.3
@@ -24,7 +27,7 @@ php:
 matrix:
   fast_finish: true
   allow_failures:
-    - php: 8.0
+    - php: 7.3
 
 env:
   matrix:

diff --git a/composer.json b/composer.json
@@ -14,30 +14,27 @@
     ],
 
     "require"     : {
-        "php"                                : ">=7.2",
-        "ext-filter"                         : "*",
-        "ext-mbstring"                       : "*",
+        "php"                                  : ">=7.2",
+        "ext-filter"                           : "*",
+        "ext-mbstring"                         : "*",
 
-        "hanneskod/classtools"               : "^1.2.1",
+        "phpunit/phpunit"                      : ">=8.5.15",
+        "phpunit/phpcov"                       : ">=6.0.1",
+        "codedungeon/phpunit-result-printer"   : ">=0.30.1",
+        "mheap/phpunit-github-actions-printer" : "^1.5.1",
 
-        "phpunit/phpunit"                    : ">=8.5.15",
-        "phpunit/phpcov"                     : ">=6.0.1",
-        "codedungeon/phpunit-result-printer" : ">=0.30.1",
-        "ulrichsg/getopt-php"                : "^3.4.0"
+        "hanneskod/classtools"                 : "^1.2.1",
+        "ulrichsg/getopt-php"                  : "^3.4.0"
     },
 
     "require-dev" : {
-        "jbzoo/utils"          : "^4.3.0",
-        "jbzoo/codestyle"      : "^2.12.0",
-        "jbzoo/data"           : "^4.2.1",
-        "jbzoo/http-client"    : "^3.5.0",
-        "jbzoo/composer-graph" : "^1.2.0",
-        "jbzoo/toolbox-ci"     : "^1.4.0",
-        "jbzoo/toolbox-dev"    : "^2.10.0",
-        "jbzoo/jbdump"         : "^1.5.6",
+        "jbzoo/toolbox-dev" : "^2.13.0",
+        "jbzoo/http-client" : "^3.5.0",
+        "jbzoo/data"        : "^4.2.1",
+        "jbzoo/utils"       : "^4.4.0",
 
-        "guzzlehttp/guzzle"    : ">=7.3.0",
-        "symfony/process"      : ">=5.2.4"
+        "guzzlehttp/guzzle" : ">=7.3.0",
+        "symfony/process"   : ">=5.2.4"
     },
 
     "suggest"     : {