From 3ff2bbef9f2dc98578a52bed3fe80a2d21a7723b Mon Sep 17 00:00:00 2001 From: riccardodallavia Date: Mon, 13 Feb 2023 10:39:59 +0100 Subject: [PATCH 1/2] wip --- .github/workflows/run-tests.yml | 9 +++++++-- LICENSE.md | 2 +- composer.json | 16 +++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b522da7..1458f72 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,12 +13,17 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.1, 8.0] - laravel: [9.*] + php: [8.2, 8.1, 8.0] + laravel: [10.*, 9.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 10.* + testbench: 8.* - laravel: 9.* testbench: 7.* + exclude: + - laravel: 10.* + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/LICENSE.md b/LICENSE.md index cf7d937..889c9c3 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2022 MAIZE SRL +Copyright (c) 2023 MAIZE SRL Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/composer.json b/composer.json index 2b7d9b8..1ccf239 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,10 @@ "description": "Laravel Email Domain Rule", "keywords": [ "maize-tech", - "laravel-email-domain-rule" + "laravel", + "email", + "domain", + "rule" ], "homepage": "https://github.com/maize-tech/laravel-email-domain-rule", "license": "MIT", @@ -17,17 +20,16 @@ ], "require": { "php": "^8.0", - "illuminate/contracts": "^9.0", - "illuminate/database": "^9.0", - "illuminate/support": "^9.0", - "spatie/laravel-package-tools": "^1.9.2" + "illuminate/contracts": "^9.0|^10.0", + "illuminate/database": "^9.0|^10.0", + "illuminate/support": "^9.0|^10.0", + "spatie/laravel-package-tools": "^1.14.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.4", "nunomaduro/collision": "^6.0", - "orchestra/testbench": "^7.0", + "orchestra/testbench": "^7.0|^8.0", "phpunit/phpunit": "^9.5", - "spatie/laravel-ray": "^1.26", "vimeo/psalm": "^4.20" }, "autoload": { From d959e11aa71e1c1e70c6cf2414e7186951fa62ca Mon Sep 17 00:00:00 2001 From: riccardodallavia Date: Mon, 13 Feb 2023 10:47:16 +0100 Subject: [PATCH 2/2] wip --- .github/workflows/run-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 1458f72..b264977 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -19,8 +19,10 @@ jobs: include: - laravel: 10.* testbench: 8.* + carbon: ^2.63 - laravel: 9.* testbench: 7.* + carbon: ^2.63 exclude: - laravel: 10.* php: 8.0 @@ -45,7 +47,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests