Merge branch 'master' into drop-guzzle-psr7

.ci/travis_php.sh

@@ -175,7 +175,9 @@ function upload_coverage() (
             --remove coverage.info "/home/travis/build/include/*" \
             --compat-libtool \
             --output-file coverage.info
+    fi
 
+    if [[ "${COVERAGE}" = "true" ]] && [[ "${TRAVIS}" = "true" ]]; then
         echo "Uploading coverage"
         coveralls-lcov coverage.info
     fi

.dockerignore

@@ -55,7 +55,6 @@ third-party/
 
 # ci and docker
 .github
-.travis.*
 **/*.nix
 **/*Dockerfile
 **/.dockerignore

.gitattributes

@@ -3,7 +3,6 @@
 *.w32                   linguist-language=JavaScript
 .ci/**                  linguist-documentation=true
 .github/**              export-ignore linguist-documentation=true
-.travis.yml             export-ignore linguist-documentation=true
 appveyor.yml            export-ignore linguist-documentation=true
 nix/**                  linguist-documentation=true
 nix/deps/**             linguist-generated=true

.github/workflows/linux.sh

@@ -12,7 +12,19 @@ export SUDO=sudo
 function install_apt_packages() (
     ${SUDO} add-apt-repository ppa:ondrej/php
     ${SUDO} apt-get update
-    ${SUDO} apt-get install -y composer jq php${PHP_VERSION}-dev
+    ${SUDO} apt-get install -y composer jq lcov \
+        php${PHP_VERSION}-dev \
+        php${PHP_VERSION}-bcmath \
+        php${PHP_VERSION}-curl \
+        php${PHP_VERSION}-gd \
+        php${PHP_VERSION}-mbstring \
+        php${PHP_VERSION}-xml \
+        php${PHP_VERSION}-zip
+    ${SUDO} update-alternatives --set php /usr/bin/php${PHP_VERSION}
+    ${SUDO} update-alternatives --set php-config /usr/bin/php-config${PHP_VERSION}
+    ${SUDO} update-alternatives --set phpize /usr/bin/phpize${PHP_VERSION}
+    # ${SUDO} update-alternatives --set phpdbg /usr/bin/phpdbg${PHP_VERSION}
+    ${SUDO} update-alternatives --config php
 )
 
 cifold "install apt packages" install_apt_packages

.github/workflows/linux.yml

@@ -12,27 +12,23 @@ on:
     - master
 
 jobs:
-  php72:
-    runs-on: ubuntu-latest
+  linux:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        PHP_VERSION: ["7.2", "7.3", "7.4"]
+        COVERAGE: ["true", "false"]
     steps:
     - uses: actions/checkout@v2
     - name: I am tired of writing this shit in YAML and learning a new DSL for every CI service so I'm putting everything in a FSCKING BASH SCRIPT
       env:
-        PHP_VERSION: "7.2"
-      run: bash ./.github/workflows/linux.sh
-  php73:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: I am tired of writing this shit in YAML and learning a new DSL for every CI service so I'm putting everything in a FSCKING BASH SCRIPT
-      env:
-        PHP_VERSION: "7.3"
-      run: bash ./.github/workflows/linux.sh
-  php74:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: I am tired of writing this shit in YAML and learning a new DSL for every CI service so I'm putting everything in a FSCKING BASH SCRIPT
-      env:
-        PHP_VERSION: "7.4"
+        PHP_VERSION: ${{ matrix.PHP_VERSION }}
+        COVERAGE: ${{ matrix.COVERAGE }}
       run: bash ./.github/workflows/linux.sh
+    - name: Coveralls
+      if: ${{ matrix.COVERAGE == 'true' }}
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        path-to-lcov: ./coverage.info

README.md

@@ -1,7 +1,6 @@
 
 # php-psr
 
-[![Travis Build Status][:badge-travis:]][:build-travis:]
 [![Appveyor Build Status][:badge-appveyor:]][:build-appveyor:]
 [![GitHub Linux Build Status](https://github.com/jbboehr/php-psr/workflows/linux/badge.svg)](https://github.com/jbboehr/php-psr/actions?query=workflow%3Alinux)
 [![GitHub OSX Build Status](https://github.com/jbboehr/php-psr/workflows/osx/badge.svg)](https://github.com/jbboehr/php-psr/actions?query=workflow%3Aosx)
@@ -152,11 +151,9 @@ PSR Interfaces: Copyright (c) 2012-present [PHP Framework Interoperability Group
 [:psr-fig:]: https://www.php-fig.org/psr
 [:php-fig:]: https://www.php-fig.org
 [:pecl-psr:]: https://pecl.php.net/package/psr
-[:badge-travis:]: https://travis-ci.org/jbboehr/php-psr.svg?branch=master
 [:badge-appveyor:]: https://ci.appveyor.com/api/projects/status/x1ymkqggy1mkl0ux/branch/master?svg=true
 [:badge-coveralls:]: https://coveralls.io/repos/jbboehr/php-psr/badge.svg?branch=master&service=github
 [:badge-license:]: https://img.shields.io/badge/license-BSD-brightgreen.svg
-[:build-travis:]: https://travis-ci.org/jbboehr/php-psr
 [:build-appveyor:]: https://ci.appveyor.com/project/jbboehr/php-psr/branch/master
 [:build-coveralls:]: https://coveralls.io/github/jbboehr/php-psr?branch=master
 [:ext-license:]: https://github.com/jbboehr/php-psr/blob/master/LICENSE.md

default.nix

@@ -28,7 +28,7 @@
   phpPsrVersion ? null,
   phpPsrSha256 ? null,
   phpPsrSrc ? pkgs.lib.cleanSourceWith {
-    filter = (path: type: (builtins.all (x: x != baseNameOf path) [".idea" ".git" "ci.nix" ".travis.sh" ".travis.yml" ".ci" "nix" "default.nix"]));
+    filter = (path: type: (builtins.all (x: x != baseNameOf path) [".idea" ".git" ".github" "ci.nix" ".ci" "nix" "default.nix"]));
     src = gitignoreSource ./.;
   },