From 9b897741d1fb4e502b9386c203ddbedee6bb46a5 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 27 Feb 2024 19:03:15 +0000 Subject: [PATCH 1/2] Bump dependencies for Laravel 11 --- composer.json | 94 +++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/composer.json b/composer.json index eaef98b..aca4d36 100644 --- a/composer.json +++ b/composer.json @@ -1,50 +1,50 @@ { - "name": "ratehub/laravel-newrelic", - "description": "A library for new relic tracking", - "type": "library", - "license": "Apache-2.0", - "authors": [ - { - "name": "Lee Robert", - "email": "lee.robert@ratehub.ca" + "name": "ratehub/laravel-newrelic", + "description": "A library for new relic tracking", + "type": "library", + "license": "Apache-2.0", + "authors": [ + { + "name": "Lee Robert", + "email": "lee.robert@ratehub.ca" + } + ], + "suggest": { + "ext-newrelic": "This is what this package is built to use" + }, + "require": { + "php": ">=7.4", + "ext-json": "*", + "illuminate/container": "^5.6|^6|^7|^8|^9|^10|^11.0", + "illuminate/log": "^5.6|^6|^7|^8|^9|^10|^11.0", + "illuminate/queue": "^5.6|^6|^7|^8|^9|^10|^11.0", + "illuminate/routing": "^5.6|^6|^7|^8|^9|^10|^11.0", + "illuminate/support": "^5.6|^6|^7|^8|^9|^10|^11.0", + "psr/log": "^3.0" + }, + "autoload": { + "psr-4": { + "RateHub\\NewRelic\\": "src/RateHub/NewRelic" + } + }, + "require-dev": { + "phpunit/phpunit": "^10.0", + "squizlabs/php_codesniffer": "*" + }, + "autoload-dev": { + "psr-4": { + "Tests\\": "tests/" + } + }, + "extra": { + "laravel": { + "providers": [ + "RateHub\\NewRelic\\Providers\\NewRelicServiceProvider" + ] + } + }, + "scripts": { + "cs": "./vendor/bin/phpcs", + "cbf": "./vendor/bin/phpcbf" } - ], - "suggest": { - "ext-newrelic": "This is what this package is built to use" - }, - "require": { - "php": ">=7.4", - "ext-json": "*", - "illuminate/container": "^5.6|^6|^7|^8|^9|^10", - "illuminate/log": "^5.6|^6|^7|^8|^9|^10", - "illuminate/queue": "^5.6|^6|^7|^8|^9|^10", - "illuminate/routing": "^5.6|^6|^7|^8|^9|^10", - "illuminate/support": "^5.6|^6|^7|^8|^9|^10", - "psr/log": "^3.0" - }, - "autoload": { - "psr-4": { - "RateHub\\NewRelic\\": "src/RateHub/NewRelic" - } - }, - "require-dev": { - "phpunit/phpunit": "^10.0", - "squizlabs/php_codesniffer": "*" - }, - "autoload-dev": { - "psr-4": { - "Tests\\": "tests/" - } - }, - "extra": { - "laravel": { - "providers": [ - "RateHub\\NewRelic\\Providers\\NewRelicServiceProvider" - ] - } - }, - "scripts": { - "cs": "./vendor/bin/phpcs", - "cbf": "./vendor/bin/phpcbf" - } } From a1082b6e929d5df3efd4d263b06072ae6ad93066 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 27 Feb 2024 19:03:15 +0000 Subject: [PATCH 2/2] Update GitHub Actions for Laravel 11 --- .github/workflows/ci.yml | 58 +++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2cc0447..b5e94b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,38 +5,42 @@ on: branches: - migrate-gh-actions - jobs: build: runs-on: ubuntu-latest + strategy: matrix: - php-versions: ['7.1', '7.2', '7.4'] + php-versions: ['7.1', '7.2', '7.4', '8.2'] + steps: - - name: Action checkout - uses: actions/checkout@v2 - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-versions }} - tools: composer, php-config, phpunit - - name: ssh setup - uses: webfactory/ssh-agent@v0.1.1 - with: - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - name: Cache dependencies - uses: actions/cache@v2 - with: - path: $HOME/.composer/cache - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer- - - name: Composer install - run: | - composer self-update - composer install --no-interaction --prefer-dist - - name: Run scripts - run: | - vendor/bin/phpunit - vendor/bin/phpcs + - name: Action checkout + uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + tools: composer, php-config, phpunit + + - name: ssh setup + uses: webfactory/ssh-agent@v0.1.1 + with: + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: $HOME/.composer/cache + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- + - name: Composer install + run: | + composer self-update + composer install --no-interaction --prefer-dist + - name: Run scripts + run: | + vendor/bin/phpunit + vendor/bin/phpcs