Skip to content

Commit 01ca0e6

Browse files
Use Yii2 22. (#79)
1 parent 35cc075 commit 01ca0e6

12 files changed

+16
-32
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,3 @@ name: build
2424
jobs:
2525
phpunit:
2626
uses: yiisoft/actions/.github/workflows/phpunit.yml@master
27-
with:
28-
composer-command: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi --ignore-platform-req=php+
29-
os: >-
30-
['ubuntu-latest']
31-
php: >-
32-
['8.1', '8.2', '8.3']

.github/workflows/dependency-check.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,3 @@ name: dependency-check
2626
jobs:
2727
composer-require-checker:
2828
uses: yiisoft/actions/.github/workflows/composer-require-checker.yml@master
29-
with:
30-
os: >-
31-
['ubuntu-latest']
32-
php: >-
33-
['8.1']

.github/workflows/mutation.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,3 @@ jobs:
2626
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
2727
with:
2828
extensions: runkit7
29-
os: >-
30-
['ubuntu-latest']
31-
php: >-
32-
['8.1']

composer.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,24 @@
2424
"email": "[email protected]"
2525
}
2626
],
27+
"minimum-stability": "dev",
2728
"require": {
2829
"php": ">=8.1",
2930
"psr/event-dispatcher": "^1.0",
3031
"symfony/mailer": "^6.4 || ^7.0",
3132
"symfony/mime": "^6.4 || ^7.0",
32-
"yiisoft/yii2": ">=2.0.4"
33+
"yiisoft/yii2": "22.0.x-dev"
3334
},
3435
"require-dev": {
3536
"maglnet/composer-require-checker": "^4.7",
3637
"phpunit/phpunit": "^10.5",
37-
"roave/infection-static-analysis-plugin": "^1.34",
38+
"roave/infection-static-analysis-plugin": "^1.35",
3839
"symplify/easy-coding-standard": "^12.1",
39-
"vimeo/psalm": "^5.20"
40+
"vimeo/psalm": "^5.26.1|^6.4.1"
4041
},
4142
"suggest": {
4243
"yiisoft/yii2-psr-log-source": "Allows routing transport logs to your Yii2 logger"
4344
},
44-
"repositories": [
45-
{
46-
"type": "composer",
47-
"url": "https://asset-packagist.org"
48-
}
49-
],
5045
"autoload": {
5146
"psr-4": {
5247
"yii\\symfonymailer\\": "src"
@@ -58,9 +53,6 @@
5853
]
5954
},
6055
"extra": {
61-
"branch-alias": {
62-
"dev-master": "3.0.x-dev"
63-
},
6456
"sort-packages": true
6557
},
6658
"config": {

phpunit.xml.dist

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<phpunit
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
43
bootstrap="./tests/bootstrap.php"
5-
colors="true" stopOnFailure="false"
6-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
74
cacheDirectory=".phpunit.cache"
5+
colors="true"
86
requireCoverageMetadata="true"
7+
stopOnFailure="false"
8+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
910
>
1011
<testsuites>
1112
<testsuite name="Yii2-swiftmailer Test Suite">

src/DkimMessageSigner.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @link https://www.yiiframework.com/
45
* @copyright Copyright (c) 2008 Yii Software LLC

src/Message.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public function attach($fileName, array $options = []): self
244244
$this->email->attachFromPath(
245245
$fileName,
246246
$options['fileName'] ?? $fileName,
247-
$options['contentType'] ?? FileHelper::getMimeType($fileName)
247+
$options['contentType'] ?? FileHelper::getMimeType($fileName),
248248
);
249249
return $this;
250250
}
@@ -272,7 +272,7 @@ public function embed($fileName, array $options = []): string
272272
$this->email->embedFromPath(
273273
$fileName,
274274
$name,
275-
$options['contentType'] ?? FileHelper::getMimeType($fileName)
275+
$options['contentType'] ?? FileHelper::getMimeType($fileName),
276276
);
277277
return 'cid:' . $name;
278278
}

src/MessageEncrypterInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @link https://www.yiiframework.com/
45
* @copyright Copyright (c) 2008 Yii Software LLC

src/MessageSignerInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @link https://www.yiiframework.com/
45
* @copyright Copyright (c) 2008 Yii Software LLC

src/MessageWrapperInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @link https://www.yiiframework.com/
45
* @copyright Copyright (c) 2008 Yii Software LLC

0 commit comments

Comments
 (0)