From faa95c395cb3c742e79921f29546859dacd29fe8 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sat, 10 May 2025 18:08:36 -0400 Subject: [PATCH 1/6] Use Yii2 `2.2`. --- .github/workflows/build.yml | 6 ------ .github/workflows/dependency-check.yml | 5 ----- .github/workflows/mutation.yml | 4 ---- composer.json | 12 +++--------- 4 files changed, 3 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a31b3c0..75eab15 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,9 +24,3 @@ name: build jobs: phpunit: uses: yiisoft/actions/.github/workflows/phpunit.yml@master - with: - composer-command: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi --ignore-platform-req=php+ - os: >- - ['ubuntu-latest'] - php: >- - ['8.1', '8.2', '8.3'] diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml index 59be2fc..5df1d4a 100644 --- a/.github/workflows/dependency-check.yml +++ b/.github/workflows/dependency-check.yml @@ -26,8 +26,3 @@ name: dependency-check jobs: composer-require-checker: uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master - with: - os: >- - ['ubuntu-latest'] - php: >- - ['8.1'] diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 598077b..d821b99 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -26,7 +26,3 @@ jobs: STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }} with: extensions: runkit7 - os: >- - ['ubuntu-latest'] - php: >- - ['8.1'] diff --git a/composer.json b/composer.json index fa04f61..1b2a184 100644 --- a/composer.json +++ b/composer.json @@ -29,24 +29,18 @@ "psr/event-dispatcher": "^1.0", "symfony/mailer": "^6.4 || ^7.0", "symfony/mime": "^6.4 || ^7.0", - "yiisoft/yii2": ">=2.0.4" + "yiisoft/yii2": "2.2.x-dev" }, "require-dev": { "maglnet/composer-require-checker": "^4.7", "phpunit/phpunit": "^10.5", - "roave/infection-static-analysis-plugin": "^1.34", + "roave/infection-static-analysis-plugin": "^1.35", "symplify/easy-coding-standard": "^12.1", - "vimeo/psalm": "^5.20" + "vimeo/psalm": "^5.26.1|^6.4.1" }, "suggest": { "yiisoft/yii2-psr-log-source": "Allows routing transport logs to your Yii2 logger" }, - "repositories": [ - { - "type": "composer", - "url": "https://asset-packagist.org" - } - ], "autoload": { "psr-4": { "yii\\symfonymailer\\": "src" From fe0d111010f7c53f83556475f4ad6878ec8fca23 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sat, 10 May 2025 18:11:00 -0400 Subject: [PATCH 2/6] Fix ecs ci. --- src/DkimMessageSigner.php | 1 + src/Message.php | 4 ++-- src/MessageEncrypterInterface.php | 1 + src/MessageSignerInterface.php | 1 + src/MessageWrapperInterface.php | 1 + src/SMimeMessageEncrypter.php | 1 + src/SMimeMessageSigner.php | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/DkimMessageSigner.php b/src/DkimMessageSigner.php index 3fc7df7..e6b7d26 100644 --- a/src/DkimMessageSigner.php +++ b/src/DkimMessageSigner.php @@ -1,4 +1,5 @@ email->attachFromPath( $fileName, $options['fileName'] ?? $fileName, - $options['contentType'] ?? FileHelper::getMimeType($fileName) + $options['contentType'] ?? FileHelper::getMimeType($fileName), ); return $this; } @@ -272,7 +272,7 @@ public function embed($fileName, array $options = []): string $this->email->embedFromPath( $fileName, $name, - $options['contentType'] ?? FileHelper::getMimeType($fileName) + $options['contentType'] ?? FileHelper::getMimeType($fileName), ); return 'cid:' . $name; } diff --git a/src/MessageEncrypterInterface.php b/src/MessageEncrypterInterface.php index aed824e..8656b94 100644 --- a/src/MessageEncrypterInterface.php +++ b/src/MessageEncrypterInterface.php @@ -1,4 +1,5 @@ Date: Sun, 11 May 2025 09:07:09 -0400 Subject: [PATCH 3/6] Update `composer.json`. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1b2a184..5ca7355 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "email": "archibeardrinker@gmail.com" } ], + "minimum-stability": "dev", "require": { "php": ">=8.1", "psr/event-dispatcher": "^1.0", @@ -53,7 +54,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "22.0.x-dev" }, "sort-packages": true }, From 238de7975444b661460ebffd18a42524879ad892 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sun, 11 May 2025 12:59:40 -0400 Subject: [PATCH 4/6] Update `phpunit.xml.dist`. --- phpunit.xml.dist | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 6e24b41..4b6ced4 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,11 +1,12 @@ From ce188bb6f8cd7c9864dc4e2781b387709678bd3e Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Mon, 12 May 2025 08:37:29 -0400 Subject: [PATCH 5/6] Remove branch alias from `composer.json`. --- composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/composer.json b/composer.json index 5ca7355..6154133 100644 --- a/composer.json +++ b/composer.json @@ -53,9 +53,6 @@ ] }, "extra": { - "branch-alias": { - "dev-master": "22.0.x-dev" - }, "sort-packages": true }, "config": { From e5177b00e3daabf4e006e5993c2500a32497af1f Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Wed, 21 May 2025 18:31:53 -0400 Subject: [PATCH 6/6] Update to version `22.0.x-dev` in `composer.json`. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6154133..958c41f 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "psr/event-dispatcher": "^1.0", "symfony/mailer": "^6.4 || ^7.0", "symfony/mime": "^6.4 || ^7.0", - "yiisoft/yii2": "2.2.x-dev" + "yiisoft/yii2": "22.0.x-dev" }, "require-dev": { "maglnet/composer-require-checker": "^4.7",