From 8928b7a36b8b73c84b8cb15e206a3705b02f25e0 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Tue, 28 Feb 2023 00:01:40 +0300 Subject: [PATCH 01/18] SIP-371: update: package version bump --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index a4c1b63..a078cd4 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ "prefer-stable": true, "require": { "ext-json": "*", - "php": ">=8.0.2", - "illuminate/auth": "^9.0", - "illuminate/config": "^9.0", - "illuminate/database": "^9.0", - "illuminate/support": "^9.0", - "illuminate/translation": "^9.0" + "php": ">=8.1", + "illuminate/auth": "^10.0", + "illuminate/config": "^10.0", + "illuminate/database": "^10.0", + "illuminate/support": "^10.0", + "illuminate/translation": "^10.0" }, "autoload": { "psr-4": { @@ -44,7 +44,7 @@ } }, "require-dev": { - "squizlabs/php_codesniffer": "^3.5", - "phpunit/phpunit": "^9.5" + "squizlabs/php_codesniffer": "^3.7", + "phpunit/phpunit": "^10.0" } } From 5cfb086060ac0ac6d9a786af4ca14ea4262ff1fa Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Tue, 28 Feb 2023 00:21:40 +0300 Subject: [PATCH 02/18] SIP-371: update: revert to using version --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index a078cd4..a9023f6 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,11 @@ "require": { "ext-json": "*", "php": ">=8.1", - "illuminate/auth": "^10.0", - "illuminate/config": "^10.0", - "illuminate/database": "^10.0", - "illuminate/support": "^10.0", - "illuminate/translation": "^10.0" + "illuminate/auth": "^9.0", + "illuminate/config": "^9.0", + "illuminate/database": "^9.0", + "illuminate/support": "^9.0", + "illuminate/translation": "^9.0" }, "autoload": { "psr-4": { From 6f545fa010e62d781890f3ae54163eaf7e324d6f Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Tue, 28 Feb 2023 00:21:58 +0300 Subject: [PATCH 03/18] SIP-371: update: docker use php-8.1 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8e58826..a1b9297 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.0-fpm +FROM php:8.1-fpm RUN apt-get update && apt-get install -y \ git \ From 5ad8ac85dcfa0ed8046756fec2ba75784f621afa Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Tue, 28 Feb 2023 17:05:00 +0300 Subject: [PATCH 04/18] SIP-371: update: restore phpunit v9 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a9023f6..1841a8c 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,6 @@ }, "require-dev": { "squizlabs/php_codesniffer": "^3.7", - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^9.5" } } From 99241b26a8fe617c697d3548fe2a23ae3d137e66 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Tue, 28 Feb 2023 17:17:33 +0300 Subject: [PATCH 05/18] SIP-371: update: allow php v8.0 and v8.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1841a8c..f6d7a4a 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "prefer-stable": true, "require": { "ext-json": "*", - "php": ">=8.1", + "php": "^8.0|^8.1", "illuminate/auth": "^9.0", "illuminate/config": "^9.0", "illuminate/database": "^9.0", From 11ceac1dd364e842729a01cbf14c6231e69a5e4a Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Tue, 28 Feb 2023 20:13:07 +0300 Subject: [PATCH 06/18] SIP-371: update: update read me --- .github/workflows/main.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8746c8..ae49daf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,7 +62,7 @@ jobs: coverage: none - name: Install dependencies - run: composer install --no-suggest --prefer-dist -n -o + run: composer install --no-suggest --prefer-dist --no-interaction --optimize-autoloader - name: Run style check run: vendor/bin/phpcs diff --git a/README.md b/README.md index fde88a9..7f695c1 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This means that the method for storage must be efficient, unlike other packages ### Laravel -You are reading the documentation for 9.x. +You are reading the documentation for 10.x and 9.x. * If you're using Laravel 6, 7 or 8 please see the docs for [3.x](https://github.com/sourcetoad/Logger/releases/tag/v3.0.1). * If you're using Laravel 5 or below please see docs for [1.x](https://github.com/sourcetoad/Logger/releases/tag/v1.3.0) From 40ec9ca80d17c81e4251feba5fcf7c8623119f64 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:05:06 +0300 Subject: [PATCH 07/18] SIP-371: update: add laravel 10 build support --- .github/workflows/main.yml | 64 +++++++++++++++++++++++++++++++++----- composer.json | 10 +++--- 2 files changed, 61 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ae49daf..b87e000 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,37 +3,85 @@ on: pull_request: push: jobs: - tests: + tests-80: runs-on: ubuntu-latest strategy: fail-fast: true matrix: - php: [8.0, 8.1] - stability: [prefer-lowest, prefer-stable] - name: PHP ${{ matrix.php }} - ${{ matrix.stability }} + php: [ 8.0.2 ] + laravel: [ 9.0 ] + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code uses: actions/checkout@v3 - - name: Get Composer Cache Directory + - name: Get composer cache directory id: composer-cache run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + - name: Cache dependencies - uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer- + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap + coverage: none + + - name: Install dependencies + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o + + + - name: Execute tests + run: vendor/bin/phpunit --verbose + + tests-81: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [ 8.1 ] + laravel: [ 9.0, 10.0 ] + stability: [ prefer-lowest, prefer-stable ] + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} + tools: composer:v2 extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap coverage: none - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o - name: Execute tests run: vendor/bin/phpunit --verbose diff --git a/composer.json b/composer.json index f6d7a4a..dbed7ec 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,11 @@ "require": { "ext-json": "*", "php": "^8.0|^8.1", - "illuminate/auth": "^9.0", - "illuminate/config": "^9.0", - "illuminate/database": "^9.0", - "illuminate/support": "^9.0", - "illuminate/translation": "^9.0" + "illuminate/auth": "^9.0|^10.0", + "illuminate/config": "^9.0|^10.0", + "illuminate/database": "^9.0|^10.0", + "illuminate/support": "^9.0|^10.0", + "illuminate/translation": "^9.0|^10.0" }, "autoload": { "psr-4": { From 912923971dffab6ca1600ba353c0a366a9668f6c Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:07:33 +0300 Subject: [PATCH 08/18] SIP-371: update: change php version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b87e000..7c00328 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.0.2 ] + php: [ 8.0 ] laravel: [ 9.0 ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: From 6486eb3c51199123ac4061ae1a8575833b7926d4 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:14:59 +0300 Subject: [PATCH 09/18] SIP-371: update: revert install dependency logic --- .github/workflows/main.yml | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c00328..f53a302 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,8 +8,9 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.0 ] - laravel: [ 9.0 ] + php: [8.0.2] + stability: [prefer-lowest, prefer-stable] + laravel: [9.0] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -34,12 +35,7 @@ jobs: coverage: none - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o - + run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests run: vendor/bin/phpunit --verbose @@ -49,9 +45,9 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.1 ] - laravel: [ 9.0, 10.0 ] - stability: [ prefer-lowest, prefer-stable ] + php: [8.1] + laravel: [9.0, 10.0] + stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -77,11 +73,7 @@ jobs: coverage: none - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o + run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests run: vendor/bin/phpunit --verbose From 6524efcb8a2d7ceeb71b90e97f06ad700ede97ec Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:27:06 +0300 Subject: [PATCH 10/18] SIP-371: update: workflow install dependencies --- .github/workflows/main.yml | 26 +++++++---- composer.json | 94 +++++++++++++++++++------------------- 2 files changed, 64 insertions(+), 56 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f53a302..427f3c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,9 +8,8 @@ jobs: strategy: fail-fast: true matrix: - php: [8.0.2] - stability: [prefer-lowest, prefer-stable] - laravel: [9.0] + php: [ 8.0 ] + laravel: [ 9.0 ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -35,7 +34,11 @@ jobs: coverage: none - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n - name: Execute tests run: vendor/bin/phpunit --verbose @@ -45,9 +48,8 @@ jobs: strategy: fail-fast: true matrix: - php: [8.1] - laravel: [9.0, 10.0] - stability: [prefer-lowest, prefer-stable] + php: [ 8.1 ] + laravel: [ 9.0, 10.0 ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -73,7 +75,11 @@ jobs: coverage: none - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o - name: Execute tests run: vendor/bin/phpunit --verbose @@ -92,13 +98,15 @@ jobs: - uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} restore-keys: ${{ runner.os }}-composer- - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: '8.1' + tools: composer:v2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap coverage: none - name: Install dependencies diff --git a/composer.json b/composer.json index dbed7ec..cbe3b13 100644 --- a/composer.json +++ b/composer.json @@ -1,50 +1,50 @@ { - "name": "sourcetoad/logger", - "description": "Creating an audit of activity throughout an application.", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "Connor Tumbleson", - "email": "connor@sourcetoad.com" - } - ], - "config": { - "sort-packages": true - }, - "minimum-stability": "stable", - "prefer-stable": true, - "require": { - "ext-json": "*", - "php": "^8.0|^8.1", - "illuminate/auth": "^9.0|^10.0", - "illuminate/config": "^9.0|^10.0", - "illuminate/database": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0", - "illuminate/translation": "^9.0|^10.0" - }, - "autoload": { - "psr-4": { - "Sourcetoad\\Logger\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "Sourcetoad\\Logger\\Test\\": "tests/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Sourcetoad\\Logger\\LoggerServiceProvider" - ], - "aliases": { - "Logger": "Sourcetoad\\Logger\\LoggerFacade" - } - } - }, - "require-dev": { - "squizlabs/php_codesniffer": "^3.7", - "phpunit/phpunit": "^9.5" + "name": "sourcetoad/logger", + "description": "Creating an audit of activity throughout an application.", + "type": "library", + "license": "MIT", + "authors": [ + { + "name": "Connor Tumbleson", + "email": "connor@sourcetoad.com" } + ], + "config": { + "sort-packages": true + }, + "minimum-stability": "stable", + "prefer-stable": true, + "require": { + "ext-json": "*", + "php": "^8.0|^8.1", + "illuminate/auth": "^9.0|^10.0", + "illuminate/config": "^9.0|^10.0", + "illuminate/database": "^9.0|^10.0", + "illuminate/support": "^9.0|^10.0", + "illuminate/translation": "^9.0|^10.0" + }, + "autoload": { + "psr-4": { + "Sourcetoad\\Logger\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Sourcetoad\\Logger\\Test\\": "tests/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Sourcetoad\\Logger\\LoggerServiceProvider" + ], + "aliases": { + "Logger": "Sourcetoad\\Logger\\LoggerFacade" + } + } + }, + "require-dev": { + "squizlabs/php_codesniffer": "^3.7", + "phpunit/phpunit": "^9.5" + } } From ecc5341ee20d7ab04a72ae73fb5277def1b1014f Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:28:49 +0300 Subject: [PATCH 11/18] SIP-371: update: align yaml file --- .github/workflows/main.yml | 224 ++++++++++++++++++------------------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 427f3c4..cd49860 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,115 +2,115 @@ name: main on: pull_request: push: -jobs: - tests-80: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0 ] - laravel: [ 9.0 ] - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Get composer cache directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - name: Cache dependencies - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap - coverage: none - - - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n - - - name: Execute tests - run: vendor/bin/phpunit --verbose - - tests-81: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.1 ] - laravel: [ 9.0, 10.0 ] - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Get composer cache directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - name: Cache dependencies - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - tools: composer:v2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap - coverage: none - - - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o - - - name: Execute tests - run: vendor/bin/phpunit --verbose - - code_styles: - runs-on: ubuntu-latest - name: Code Style - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Get Composer Cache Directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.1' - tools: composer:v2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap - coverage: none - - - name: Install dependencies - run: composer install --no-suggest --prefer-dist --no-interaction --optimize-autoloader - - - name: Run style check - run: vendor/bin/phpcs + jobs: + tests-80: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [ 8.0 ] + laravel: [ 9.0 ] + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap + coverage: none + + - name: Install dependencies + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n + + - name: Execute tests + run: vendor/bin/phpunit --verbose + + tests-81: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [ 8.1 ] + laravel: [ 9.0, 10.0 ] + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + tools: composer:v2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap + coverage: none + + - name: Install dependencies + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o + + - name: Execute tests + run: vendor/bin/phpunit --verbose + + code_styles: + runs-on: ubuntu-latest + name: Code Style + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Get Composer Cache Directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.1' + tools: composer:v2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap + coverage: none + + - name: Install dependencies + run: composer install --no-suggest --prefer-dist --no-interaction --optimize-autoloader + + - name: Run style check + run: vendor/bin/phpcs From 1f317404c2c2a1ae02f591a4bc933b24598d16a4 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:31:41 +0300 Subject: [PATCH 12/18] SIP-371: update: align yaml file --- .github/workflows/main.yml | 224 ++++++++++++++++++------------------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cd49860..427f3c4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,115 +2,115 @@ name: main on: pull_request: push: - jobs: - tests-80: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0 ] - laravel: [ 9.0 ] - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Get composer cache directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - name: Cache dependencies - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap - coverage: none - - - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n - - - name: Execute tests - run: vendor/bin/phpunit --verbose - - tests-81: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.1 ] - laravel: [ 9.0, 10.0 ] - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Get composer cache directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - name: Cache dependencies - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - tools: composer:v2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap - coverage: none - - - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o - - - name: Execute tests - run: vendor/bin/phpunit --verbose - - code_styles: - runs-on: ubuntu-latest - name: Code Style - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Get Composer Cache Directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.1' - tools: composer:v2 - extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap - coverage: none - - - name: Install dependencies - run: composer install --no-suggest --prefer-dist --no-interaction --optimize-autoloader - - - name: Run style check - run: vendor/bin/phpcs +jobs: + tests-80: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [ 8.0 ] + laravel: [ 9.0 ] + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap + coverage: none + + - name: Install dependencies + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n + + - name: Execute tests + run: vendor/bin/phpunit --verbose + + tests-81: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [ 8.1 ] + laravel: [ 9.0, 10.0 ] + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Get composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - name: Cache dependencies + uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + tools: composer:v2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap + coverage: none + + - name: Install dependencies + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o + + - name: Execute tests + run: vendor/bin/phpunit --verbose + + code_styles: + runs-on: ubuntu-latest + name: Code Style + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Get Composer Cache Directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.1' + tools: composer:v2 + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap + coverage: none + + - name: Install dependencies + run: composer install --no-suggest --prefer-dist --no-interaction --optimize-autoloader + + - name: Run style check + run: vendor/bin/phpcs From cc6635264164138d4a39cfbf4b905493e5d5f077 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:38:47 +0300 Subject: [PATCH 13/18] SIP-371: update: revert to last point jobs worked --- .github/workflows/main.yml | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 427f3c4..7fe4ada 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,9 +8,9 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.0 ] - laravel: [ 9.0 ] - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + php: [8.0, 8.1] + stability: [prefer-lowest, prefer-stable] + name: PHP ${{ matrix.php }} - ${{ matrix.stability }} steps: - name: Checkout code uses: actions/checkout@v3 @@ -23,8 +23,8 @@ jobs: - uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -34,11 +34,7 @@ jobs: coverage: none - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n + run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests run: vendor/bin/phpunit --verbose @@ -49,7 +45,7 @@ jobs: fail-fast: true matrix: php: [ 8.1 ] - laravel: [ 9.0, 10.0 ] + stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -63,8 +59,8 @@ jobs: uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}- - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -75,11 +71,7 @@ jobs: coverage: none - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o + run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - name: Execute tests run: vendor/bin/phpunit --verbose From c689033e286391ee77d089feb0c973342e0111f1 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:45:33 +0300 Subject: [PATCH 14/18] SIP-371: update: dependency install --- .github/workflows/main.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7fe4ada..1ba978f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} restore-keys: ${{ runner.os }}-composer- - name: Setup PHP @@ -34,7 +34,11 @@ jobs: coverage: none - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n - name: Execute tests run: vendor/bin/phpunit --verbose @@ -45,7 +49,7 @@ jobs: fail-fast: true matrix: php: [ 8.1 ] - stability: [prefer-lowest, prefer-stable] + laravel: [ 9.0, 10.0 ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -59,8 +63,8 @@ jobs: uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}- + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -71,7 +75,11 @@ jobs: coverage: none - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest + run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && + composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o - name: Execute tests run: vendor/bin/phpunit --verbose From 07cb89efc7d6b1989458caac4dde737ebd83e065 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 17:53:58 +0300 Subject: [PATCH 15/18] SIP-371: update: GitHub actions fix --- .github/workflows/main.yml | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ba978f..33bfc6c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,9 +8,9 @@ jobs: strategy: fail-fast: true matrix: - php: [8.0, 8.1] - stability: [prefer-lowest, prefer-stable] - name: PHP ${{ matrix.php }} - ${{ matrix.stability }} + php: [8.0] + laravel: [9.0] + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code uses: actions/checkout@v3 @@ -20,25 +20,22 @@ jobs: run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies - - uses: actions/cache@v3 + uses: actions/cache@v3 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer- + key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.laravel }}- - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} + tools: composer:v2 extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap coverage: none - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n + run: composer require "illuminate/auth:^${{ matrix.laravel }}" "illuminate/config:^${{ matrix.laravel }}" "illuminate/database:^${{ matrix.laravel }}" "illuminate/support:^${{ matrix.laravel }}" "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist --no-interaction - name: Execute tests run: vendor/bin/phpunit --verbose @@ -48,8 +45,8 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.1 ] - laravel: [ 9.0, 10.0 ] + php: [8.1] + laravel: [9.0, 10.0] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -75,11 +72,7 @@ jobs: coverage: none - name: Install dependencies - run: composer require "illuminate/auth:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/config:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/database:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/support:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o && - composer require "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist -n -o + run: composer require "illuminate/auth:^${{ matrix.laravel }}" "illuminate/config:^${{ matrix.laravel }}" "illuminate/database:^${{ matrix.laravel }}" "illuminate/support:^${{ matrix.laravel }}" "illuminate/translation:^${{ matrix.laravel }}" --prefer-stable --prefer-dist --no-interaction - name: Execute tests run: vendor/bin/phpunit --verbose From 1c938b207c42030d1721e92d5c721344dcedcd6b Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 18:28:29 +0300 Subject: [PATCH 16/18] SIP-371: update: add stability tests for php --- .github/workflows/main.yml | 42 ++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 33bfc6c..a08fab4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,13 +3,47 @@ on: pull_request: push: jobs: + tests-stability: + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + php: [ 8.0, 8.1 ] + stability: [ prefer-lowest, prefer-stable ] + name: PHP ${{ matrix.php }} - ${{ matrix.stability }} + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Get Composer Cache Directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT + + - uses: actions/cache@v3 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap + coverage: none + + - name: Install dependencies + run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest + + - name: Execute tests + run: vendor/bin/phpunit --verbose tests-80: runs-on: ubuntu-latest strategy: fail-fast: true matrix: - php: [8.0] - laravel: [9.0] + php: [ 8.0 ] + laravel: [ 9.0 ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -45,8 +79,8 @@ jobs: strategy: fail-fast: true matrix: - php: [8.1] - laravel: [9.0, 10.0] + php: [ 8.1 ] + laravel: [ 9.0, 10.0 ] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code From 7655464b93c85965799e539502061884a562c687 Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 18:37:16 +0300 Subject: [PATCH 17/18] SIP-371: update: revert stability tests --- .github/workflows/main.yml | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a08fab4..75e4f15 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,40 +3,6 @@ on: pull_request: push: jobs: - tests-stability: - runs-on: ubuntu-latest - strategy: - fail-fast: true - matrix: - php: [ 8.0, 8.1 ] - stability: [ prefer-lowest, prefer-stable ] - name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Get Composer Cache Directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: ${{ runner.os }}-composer- - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, gd, soap - coverage: none - - - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-suggest - - - name: Execute tests - run: vendor/bin/phpunit --verbose tests-80: runs-on: ubuntu-latest strategy: From c5c58e2dbca900cf4af14e61493154c574edb3df Mon Sep 17 00:00:00 2001 From: Moffat Munene Date: Wed, 1 Mar 2023 19:08:03 +0300 Subject: [PATCH 18/18] SIP-371: update: fix code style on composer json --- composer.json | 94 +++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/composer.json b/composer.json index cbe3b13..dbed7ec 100644 --- a/composer.json +++ b/composer.json @@ -1,50 +1,50 @@ { - "name": "sourcetoad/logger", - "description": "Creating an audit of activity throughout an application.", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "Connor Tumbleson", - "email": "connor@sourcetoad.com" + "name": "sourcetoad/logger", + "description": "Creating an audit of activity throughout an application.", + "type": "library", + "license": "MIT", + "authors": [ + { + "name": "Connor Tumbleson", + "email": "connor@sourcetoad.com" + } + ], + "config": { + "sort-packages": true + }, + "minimum-stability": "stable", + "prefer-stable": true, + "require": { + "ext-json": "*", + "php": "^8.0|^8.1", + "illuminate/auth": "^9.0|^10.0", + "illuminate/config": "^9.0|^10.0", + "illuminate/database": "^9.0|^10.0", + "illuminate/support": "^9.0|^10.0", + "illuminate/translation": "^9.0|^10.0" + }, + "autoload": { + "psr-4": { + "Sourcetoad\\Logger\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Sourcetoad\\Logger\\Test\\": "tests/" + } + }, + "extra": { + "laravel": { + "providers": [ + "Sourcetoad\\Logger\\LoggerServiceProvider" + ], + "aliases": { + "Logger": "Sourcetoad\\Logger\\LoggerFacade" + } + } + }, + "require-dev": { + "squizlabs/php_codesniffer": "^3.7", + "phpunit/phpunit": "^9.5" } - ], - "config": { - "sort-packages": true - }, - "minimum-stability": "stable", - "prefer-stable": true, - "require": { - "ext-json": "*", - "php": "^8.0|^8.1", - "illuminate/auth": "^9.0|^10.0", - "illuminate/config": "^9.0|^10.0", - "illuminate/database": "^9.0|^10.0", - "illuminate/support": "^9.0|^10.0", - "illuminate/translation": "^9.0|^10.0" - }, - "autoload": { - "psr-4": { - "Sourcetoad\\Logger\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "Sourcetoad\\Logger\\Test\\": "tests/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Sourcetoad\\Logger\\LoggerServiceProvider" - ], - "aliases": { - "Logger": "Sourcetoad\\Logger\\LoggerFacade" - } - } - }, - "require-dev": { - "squizlabs/php_codesniffer": "^3.7", - "phpunit/phpunit": "^9.5" - } }