diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 11535b0..4ef98d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,15 +12,12 @@ jobs: strategy: matrix: php-version: - - '5.5' - - '5.6' - - '7.0' - - '7.1' - - '7.2' - - '7.3' - - '7.4' - '8.0' - '8.1' + - '8.2' + - '8.3' + - '8.4' + - '8.5' steps: - uses: actions/checkout@v2 @@ -36,7 +33,7 @@ jobs: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 id: cache with: path: | @@ -48,12 +45,7 @@ jobs: - name: Install dependencies run: | composer remove --dev phpstan/phpstan - # PHPUnit 4 for PHP 5 - if [ "${{ matrix.php-version }}" == "5.5" ] || [ "${{ matrix.php-version }}" == "5.6" ]; then composer require --dev -W "phpunit/phpunit:^4"; fi - # PHPUnit 6 for PHP 7.0 - 7.2 - if [ "${{ matrix.php-version }}" == "7.0" ] || [ "${{ matrix.php-version }}" == "7.1" ] || [ "${{ matrix.php-version }}" == "7.2" ]; then composer require --dev -W "phpunit/phpunit:^6"; fi - # PHPUnit 9 for 7.3+ - if [ "${{ matrix.php-version }}" == "7.3" ] || [ "${{ matrix.php-version }}" == "7.4" ] || [ "${{ matrix.php-version }}" == "8.0" ] || [ "${{ matrix.php-version }}" == "8.1" ]; then composer require --dev -W "phpunit/phpunit:^9"; fi + composer require --dev -W "phpunit/phpunit:^9" composer install --prefer-dist --no-progress --no-interaction --no-scripts mkdir -p build/logs @@ -62,7 +54,7 @@ jobs: vendor/bin/phpunit - name: Upload coverage results to Coveralls - if: ${{ github.event_name == 'push' && matrix.php-version == '7.4' }} + if: ${{ github.event_name == 'push' && matrix.php-version == '8.5' }} env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} continue-on-error: true @@ -75,7 +67,7 @@ jobs: strategy: matrix: php-version: - - '7.4' + - '8.5' steps: - uses: actions/checkout@v2 @@ -91,7 +83,7 @@ jobs: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 id: cache with: path: | diff --git a/composer.json b/composer.json index 90616b3..fefe9f2 100644 --- a/composer.json +++ b/composer.json @@ -25,11 +25,11 @@ } ], "require": { - "php": ">=5.4", + "php": ">=8.0", "ext-json": "*", "ext-mbstring": "*", "guzzlehttp/guzzle": "^6.0|^7.0", - "firebase/php-jwt": "~5.0|~6.0" + "firebase/php-jwt": "^7.0" }, "require-dev": { "phpunit/phpunit": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", diff --git a/src/Collection.php b/src/Collection.php index a2ad3af..17cfde9 100644 --- a/src/Collection.php +++ b/src/Collection.php @@ -45,7 +45,7 @@ public function parseLinkHeader($header) // pull out rel="..." $matches = []; preg_match('/rel="(.*)"/', $section[1], $matches); - $name = $matches[1]; + $name = $matches[1]; /* @phpstan-ignore-line */ $links[$name] = $url; }