From cc1d15d11807264cb655dd45654160fa3d978090 Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Wed, 8 Oct 2025 14:58:53 +0100 Subject: [PATCH 1/7] Upgrade to lumberjack v8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fddbf19..62d7655 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "rareloop/lumberjack-email", "require": { - "rareloop/lumberjack-core": "^5.0.0||^6.0.0||^7.0.0" + "rareloop/lumberjack-core": "^5.0.0||^6.0.0||^7.0.0||^8.0.0" }, "require-dev": { "phpunit/phpunit": "^6.0", From 466748704d570c0a84db2abb18d039b1ba92b664 Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Tue, 14 Oct 2025 16:22:18 +0100 Subject: [PATCH 2/7] Upgrade codebase --- composer.json | 6 +++--- src/Facades/Email.php | 2 +- tests/Unit/EmailServiceProviderTest.php | 12 +++++------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 62d7655..749a38d 100644 --- a/composer.json +++ b/composer.json @@ -1,13 +1,13 @@ { "name": "rareloop/lumberjack-email", "require": { - "rareloop/lumberjack-core": "^5.0.0||^6.0.0||^7.0.0||^8.0.0" + "rareloop/lumberjack-core": "^8.0.0" }, "require-dev": { - "phpunit/phpunit": "^6.0", + "phpunit/phpunit": "^9.6.29", "mockery/mockery": "^1.0.0", "brain/monkey": "^2.0.2", - "satooshi/php-coveralls": "^1.0", + "php-coveralls/php-coveralls": "^2.8", "squizlabs/php_codesniffer": "^3.2" }, "autoload": { diff --git a/src/Facades/Email.php b/src/Facades/Email.php index c317c80..c5e6092 100644 --- a/src/Facades/Email.php +++ b/src/Facades/Email.php @@ -2,7 +2,7 @@ namespace Rareloop\Lumberjack\Email\Facades; -use Blast\Facades\AbstractFacade; +use Rareloop\Lumberjack\Facades\AbstractFacade; class Email extends AbstractFacade { diff --git a/tests/Unit/EmailServiceProviderTest.php b/tests/Unit/EmailServiceProviderTest.php index b4cc4c3..0dc53ca 100644 --- a/tests/Unit/EmailServiceProviderTest.php +++ b/tests/Unit/EmailServiceProviderTest.php @@ -2,29 +2,27 @@ namespace Rareloop\Lumberjack\Email\Test; -use Blast\Facades\FacadeFactory; +use Mockery; use Brain\Monkey; use Brain\Monkey\Functions; -use Mockery; use PHPUnit\Framework\TestCase; -use Rareloop\Lumberjack\Application; use Rareloop\Lumberjack\Config; +use Rareloop\Lumberjack\Application; use Rareloop\Lumberjack\Email\Email; +use Rareloop\Lumberjack\FacadeFactory; use Rareloop\Lumberjack\Email\EmailServiceProvider; -use Rareloop\Lumberjack\Email\Facades\Email as EmailFacade; -use Rareloop\Lumberjack\Http\Lumberjack; class EmailServiceProviderTest extends TestCase { use \Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration; - public function setUp() + public function setUp(): void { parent::setUp(); Monkey\setUp(); } - public function tearDown() + public function tearDown(): void { parent::tearDown(); Monkey\tearDown(); From 9d8c2e96a4e9d7259448263073320d3ad6e73c84 Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Tue, 14 Oct 2025 16:24:10 +0100 Subject: [PATCH 3/7] Add Github actions --- .github/workflows/ci.yml | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..7208d53 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,46 @@ +name: CI + +on: [push, pull_request] + +jobs: + build-test: + runs-on: ubuntu-latest + strategy: + matrix: + php_version: [8.1, 8.2, 8.3, 8.4] + composer_flags: ['', '--prefer-lowest'] + + steps: + - uses: actions/checkout@v2 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php_version }} + extensions: xdebug + + - name: Install dependencies + uses: php-actions/composer@v5 + with: + php_version: ${{ matrix.php_version }} + args: ${{ matrix.composer_flags }} + command: update + + - name: Run tests + run: ./vendor/bin/phpunit --coverage-clover ./tests/logs/clover.xml + env: + XDEBUG_MODE: coverage + + - name: Run Codesniffer + run: vendor/bin/phpcs --standard=PSR2 ./src + + # - name: Submit coverage to Coveralls + # # We use php-coveralls library for this, as the official Coveralls GitHub Action lacks support for clover reports: + # # https://github.com/coverallsapp/github-action/issues/15 + # env: + # COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # COVERALLS_PARALLEL: true + # COVERALLS_FLAG_NAME: ${{ github.job }}-PHP-${{ matrix.php_version }} ${{ matrix.composer_flags }} + # run: | + # composer global require php-coveralls/php-coveralls + # ~/.composer/vendor/bin/php-coveralls -v From c8bd9504d90ed7045cc9a00a687b750ede48793c Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Wed, 15 Oct 2025 12:12:36 +0100 Subject: [PATCH 4/7] Tweak packages --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 749a38d..0930471 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ }, "require-dev": { "phpunit/phpunit": "^9.6.29", - "mockery/mockery": "^1.0.0", + "mockery/mockery": "^1.6.12", "brain/monkey": "^2.0.2", "php-coveralls/php-coveralls": "^2.8", "squizlabs/php_codesniffer": "^3.2" From a10ceaca5ac39dd3d18c796407ab8c038b3b509d Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Wed, 15 Oct 2025 12:13:42 +0100 Subject: [PATCH 5/7] Add patchwork fix --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0930471..7b7ad52 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,8 @@ "require-dev": { "phpunit/phpunit": "^9.6.29", "mockery/mockery": "^1.6.12", - "brain/monkey": "^2.0.2", + "brain/monkey": "^2.6.2", + "antecedent/patchwork": "^2.2.3", "php-coveralls/php-coveralls": "^2.8", "squizlabs/php_codesniffer": "^3.2" }, From e5eaca27760b79d71956c7eacd7c83b04cbbab8e Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Wed, 15 Oct 2025 12:16:30 +0100 Subject: [PATCH 6/7] Fix PHPCS error --- src/EmailServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EmailServiceProvider.php b/src/EmailServiceProvider.php index d238b32..3aa019c 100644 --- a/src/EmailServiceProvider.php +++ b/src/EmailServiceProvider.php @@ -57,7 +57,7 @@ private function setupSMTP(Config $config) private function addWpMailErrorHandler() { - // add the action + // add the action add_action('wp_mail_failed', function ($error) { Log::error('Error sending email via `wp_mail()`'); Log::error(print_r($error, true)); From 5545a07215887b857a416d1fba3833002616a357 Mon Sep 17 00:00:00 2001 From: Adam Tomat Date: Wed, 15 Oct 2025 12:19:46 +0100 Subject: [PATCH 7/7] Upgrade PHPCS --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b7ad52..0068d3c 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "brain/monkey": "^2.6.2", "antecedent/patchwork": "^2.2.3", "php-coveralls/php-coveralls": "^2.8", - "squizlabs/php_codesniffer": "^3.2" + "squizlabs/php_codesniffer": "^3.13.4" }, "autoload": { "psr-4": {