mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-20 07:42:17 +02:00
N°5809 Update laminas/laminas-mail from 2.16.0 to 2.22.0
This commit is contained in:
Pierre Goiffon
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"ignore_php_platform_requirements": {
|
||||
"8.1": true
|
||||
}
|
||||
}
|
||||
7
lib/laminas/laminas-mime/.laminas-ci/pre-install.sh
Normal file
7
lib/laminas/laminas-mime/.laminas-ci/pre-install.sh
Normal file
@@ -0,0 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Temporary workaround for cyclic dependencies - can be removed once 3.0 has been released
|
||||
|
||||
echo "Branch as 2.99.x in Pre-Install"
|
||||
|
||||
git checkout -b 2.99.x
|
||||
@@ -1,5 +1,21 @@
|
||||
# laminas-mime
|
||||
|
||||
> ## 🇷🇺 Русским гражданам
|
||||
>
|
||||
> Мы, участники Laminas, родились и живем в разных странах. У многих из нас есть друзья, родственники и коллеги как в России, так и в Украине. Некоторые из нас родились в России. Некоторые из нас живут в России. У некоторых бабушки и дедушки сражались с фашистами во Второй мировой войне. Здесь никто не поддерживает фашизм.
|
||||
>
|
||||
> У одного из нас есть украинская родственница, которая спаслась из дома вместе с сыном. Поезд задержался из-за бомбежки на дороге впереди. У нас есть друзья, которые прячутся в бомбоубежищах. Мы с тревогой ждем весточки от них после воздушных налетов, которые беспорядочно наносят удары и попадают по больницам, школам, детским садам и домам. Мы не берем это из каких-либо СМИ. Мы наблюдаем это напрямую.
|
||||
>
|
||||
> Вы доверяете нам достаточно, чтоб использовать наши программы, и мы просим вас довериться нам вновь. Мы нуждаемся в помощи. Выходите и протестуйте против этой бесполезной войны. Остановите кровопролитие. Скажите "Нет войне!"
|
||||
>
|
||||
> ## 🇺🇸 To Citizens of Russia
|
||||
>
|
||||
> We at Laminas come from all over the world. Many of us have friends, family and colleagues in both Russia and Ukraine. Some of us were born in Russia. Some of us currently live in Russia. Some have grandparents who fought Nazis in World War II. Nobody here supports fascism.
|
||||
>
|
||||
> One team member has a Ukrainian relative who fled her home with her son. The train was delayed due to bombing on the road ahead. We have friends who are hiding in bomb shelters. We anxiously follow up on them after the air raids, which indiscriminately fire at hospitals, schools, kindergartens and houses. We're not taking this from any media. These are our actual experiences.
|
||||
>
|
||||
> You trust us enough to use our software. We ask that you trust us to say the truth on this. We need your help. Go out and protest this unnecessary war. Stop the bloodshed. Say "stop the war!"
|
||||
|
||||
> This package is considered feature-complete, and is now in **security-only** maintenance mode, following a [decision by the Technical Steering Committee](https://github.com/laminas/technical-steering-committee/blob/2b55453e172a1b8c9c4c212be7cf7e7a58b9352c/meetings/minutes/2020-08-03-TSC-Minutes.md#vote-on-components-to-mark-as-security-only).
|
||||
> If you have a security issue, please [follow our security reporting guidelines](https://getlaminas.org/security/).
|
||||
> If you wish to take on the role of maintainer, please [nominate yourself](https://github.com/laminas/technical-steering-committee/issues/new?assignees=&labels=Nomination&template=Maintainer_Nomination.md&title=%5BNOMINATION%5D%5BMAINTAINER%5D%3A+%7Bname+of+person+being+nominated%7D)
|
||||
|
||||
@@ -16,16 +16,19 @@
|
||||
"forum": "https://discourse.laminas.dev"
|
||||
},
|
||||
"config": {
|
||||
"sort-packages": true
|
||||
"sort-packages": true,
|
||||
"allow-plugins": {
|
||||
"dealerdirect/phpcodesniffer-composer-installer": true
|
||||
}
|
||||
},
|
||||
"require": {
|
||||
"php": "^7.3 || ~8.0.0 || ~8.1.0",
|
||||
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
|
||||
"laminas/laminas-stdlib": "^2.7 || ^3.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"laminas/laminas-coding-standard": "~2.2.1",
|
||||
"laminas/laminas-mail": "^2.12",
|
||||
"phpunit/phpunit": "^9.3"
|
||||
"laminas/laminas-coding-standard": "~2.4.0",
|
||||
"laminas/laminas-mail": "^2.19.0",
|
||||
"phpunit/phpunit": "~9.5.25"
|
||||
},
|
||||
"suggest": {
|
||||
"laminas/laminas-mail": "Laminas\\Mail component"
|
||||
|
||||
1223
lib/laminas/laminas-mime/composer.lock
generated
1223
lib/laminas/laminas-mime/composer.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -1,21 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<ruleset
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:noNamespaceSchemaLocation="./vendor/squizlabs/php_codesniffer/phpcs.xsd">
|
||||
|
||||
<arg name="basepath" value="."/>
|
||||
<arg name="cache" value=".phpcs-cache"/>
|
||||
<arg name="colors"/>
|
||||
<arg name="extensions" value="php"/>
|
||||
<arg name="parallel" value="80"/>
|
||||
|
||||
<!-- Show progress -->
|
||||
<arg value="p"/>
|
||||
|
||||
<!-- Paths to check -->
|
||||
<file>src</file>
|
||||
<file>test</file>
|
||||
|
||||
<!-- Include all rules from Laminas Coding Standard -->
|
||||
<rule ref="LaminasCodingStandard"/>
|
||||
</ruleset>
|
||||
@@ -491,17 +491,22 @@ class Mime
|
||||
* Mail headers depend on an extended quoted printable algorithm otherwise
|
||||
* a range of bugs can occur.
|
||||
*
|
||||
* @param string $str
|
||||
* @param string $charset
|
||||
* @param int $lineLength Defaults to {@link LINELENGTH}
|
||||
* @param string $lineEnd Defaults to {@link LINEEND}
|
||||
* @param string $str
|
||||
* @param string $charset
|
||||
* @param int $lineLength Defaults to {@link LINELENGTH}
|
||||
* @param string $lineEnd Defaults to {@link LINEEND}
|
||||
* @param positive-int|0 $headerNameSize When folding a line, it is necessary to calculate
|
||||
* the length of the entire line (together with the header name).
|
||||
* Therefore, you can specify the header name and colon length
|
||||
* in this argument to fold the string properly.
|
||||
* @return string
|
||||
*/
|
||||
public static function encodeQuotedPrintableHeader(
|
||||
$str,
|
||||
$charset,
|
||||
$lineLength = self::LINELENGTH,
|
||||
$lineEnd = self::LINEEND
|
||||
$lineEnd = self::LINEEND,
|
||||
$headerNameSize = 0
|
||||
) {
|
||||
// Reduce line-length by the length of the required delimiter, charsets and encoding
|
||||
$prefix = sprintf('=?%s?Q?', $charset);
|
||||
@@ -527,7 +532,14 @@ class Mime
|
||||
if ($token === '=20') {
|
||||
// only if we have a single char token or space, we can append the
|
||||
// tempstring it to the current line or start a new line if necessary.
|
||||
$lineLimitReached = strlen($lines[$currentLine] . $tmp) > $lineLength;
|
||||
if ($currentLine === 0) {
|
||||
// The size of the first line should be calculated with the header name.
|
||||
$currentLineLength = strlen($lines[$currentLine] . $tmp) + $headerNameSize;
|
||||
} else {
|
||||
$currentLineLength = strlen($lines[$currentLine] . $tmp);
|
||||
}
|
||||
|
||||
$lineLimitReached = $currentLineLength > $lineLength;
|
||||
$noCurrentLine = $lines[$currentLine] === '';
|
||||
if ($noCurrentLine && $lineLimitReached) {
|
||||
$lines[$currentLine] = $tmp;
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
namespace Laminas\Mime;
|
||||
|
||||
use function array_key_exists;
|
||||
use function get_class;
|
||||
use function gettype;
|
||||
use function is_object;
|
||||
use function is_resource;
|
||||
@@ -315,7 +314,7 @@ class Part
|
||||
if (! is_string($content) && ! is_resource($content)) {
|
||||
throw new Exception\InvalidArgumentException(sprintf(
|
||||
'Content must be string or resource; received "%s"',
|
||||
is_object($content) ? get_class($content) : gettype($content)
|
||||
is_object($content) ? $content::class : gettype($content)
|
||||
));
|
||||
}
|
||||
$this->content = $content;
|
||||
|
||||
Reference in New Issue
Block a user