Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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']
5 changes: 0 additions & 5 deletions .github/workflows/dependency-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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']
4 changes: 0 additions & 4 deletions .github/workflows/mutation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,3 @@ jobs:
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
with:
extensions: runkit7
os: >-
['ubuntu-latest']
php: >-
['8.1']
16 changes: 4 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,24 @@
"email": "[email protected]"
}
],
"minimum-stability": "dev",
"require": {
"php": ">=8.1",
"psr/event-dispatcher": "^1.0",
"symfony/mailer": "^6.4 || ^7.0",
"symfony/mime": "^6.4 || ^7.0",
"yiisoft/yii2": ">=2.0.4"
"yiisoft/yii2": "22.0.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"
Expand All @@ -58,9 +53,6 @@
]
},
"extra": {
"branch-alias": {
"dev-master": "3.0.x-dev"
},
"sort-packages": true
},
"config": {
Expand Down
7 changes: 4 additions & 3 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
bootstrap="./tests/bootstrap.php"
colors="true" stopOnFailure="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
cacheDirectory=".phpunit.cache"
colors="true"
requireCoverageMetadata="true"
stopOnFailure="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
>
<testsuites>
<testsuite name="Yii2-swiftmailer Test Suite">
Expand Down
1 change: 1 addition & 0 deletions src/DkimMessageSigner.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
Expand Down
4 changes: 2 additions & 2 deletions src/Message.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ public function attach($fileName, array $options = []): self
$this->email->attachFromPath(
$fileName,
$options['fileName'] ?? $fileName,
$options['contentType'] ?? FileHelper::getMimeType($fileName)
$options['contentType'] ?? FileHelper::getMimeType($fileName),
);
return $this;
}
Expand Down Expand Up @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions src/MessageEncrypterInterface.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
Expand Down
1 change: 1 addition & 0 deletions src/MessageSignerInterface.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
Expand Down
1 change: 1 addition & 0 deletions src/MessageWrapperInterface.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
Expand Down
1 change: 1 addition & 0 deletions src/SMimeMessageEncrypter.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
Expand Down
1 change: 1 addition & 0 deletions src/SMimeMessageSigner.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
Expand Down