From c10f4f4bb3393a6daf90f8bec8283417fe5156f3 Mon Sep 17 00:00:00 2001 From: Andy Vaughn Date: Wed, 16 Dec 2020 20:21:50 -0800 Subject: [PATCH] update metadata --- .github/workflows/build.yml | 57 +++++++++++++++++++++---------------- README.md | 4 +-- composer.json | 4 +-- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 491f4b0..61cc820 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,42 +2,51 @@ name: build on: push: - branches: [ main ] + branches: [ main, 3.x ] pull_request: - branches: [ main ] + branches: [ main, 3.x ] jobs: test: runs-on: ubuntu-latest strategy: matrix: - php: [7.2, 7.3, 7.4] + php-versions: [7.2, 7.3, 7.4] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - - name: Validate dependencies - run: composer validate + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} - - name: Get dependency cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" + - name: Validate dependencies + run: composer validate - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-php-${{ hashFiles('**/composer.json') }} - restore-keys: | - ${{ runner.os }}-php- - - - name: Install dependencies - run: composer install --prefer-dist --no-progress --no-suggest + - name: Get dependency cache directory + id: composer-cache + run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - name: Run static analysis - run: vendor/bin/phpstan analyse + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-php-${{ hashFiles('**/composer.json') }} + restore-keys: | + ${{ runner.os }}-php- - - name: Run test suite - run: vendor/bin/phpunit --configuration phpunit.xml.dist --coverage-clover=coverage.xml + - name: Install dependencies + run: composer install --prefer-dist --no-progress --no-suggest - - uses: codecov/codecov-action@v1 + - name: Run static analysis + run: vendor/bin/phpstan analyse + + - name: Start http server + run: docker-compose up -d + + - name: Run test suite + run: phpdbg -qrr vendor/bin/phpunit --configuration phpunit.xml.dist --coverage-clover=coverage.xml + env: + HTTPBIN_BASEURI: http://localhost:8080 + + - uses: codecov/codecov-action@v1 \ No newline at end of file diff --git a/README.md b/README.md index 3af884f..3f16cd3 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ This library is provided for and supported by the open source community. Support ## Requirements -* PHP 5.5, 5.6 (php5, 1.x) -* PHP 7.2+ (main, 2.x, 3.x) +* PHP 5.5, 5.6 (1.x) +* PHP 7.2, 7.3, 7.4 (main, 2.x, 3.x) ## Installation diff --git a/composer.json b/composer.json index 306c2e4..edbe17e 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "issues": "https://github.com/mindtouch/mindtouch-http.php/issues" }, "require": { - "php": ">=7.2.0", + "php": "^7.2.0", "modethirteen/hyperplug": "^1.1.0", "modethirteen/xarray": "^1.1.0", "ext-fileinfo": "*", @@ -22,7 +22,7 @@ "ext-curl": "*" }, "require-dev": { - "phpstan/phpstan": "~0.12", + "phpstan/phpstan": "~0.12.0", "phpunit/phpunit": "~7.4.3" }, "autoload": {