Merge branch '4.4'
* 4.4: [HttpKernel] fix wrong removal of the just generated container dir bug #34024 [Routing] fix route loading with wildcard, but dir or file is empty (gseidel) [Routing] fix route loading with wildcard, but dir or file is empty bump Form component compatibility versions execute all compatible tests across versions [Mailer][MailchimpBridge] Fix NamedAddress obsolete paths
This commit is contained in:
commit
14dda4160e
@ -30,7 +30,7 @@ class EntityTypePerformanceTest extends FormPerformanceTestCase
|
|||||||
*/
|
*/
|
||||||
private $em;
|
private $em;
|
||||||
|
|
||||||
protected static $supportedFeatureSetVersion = 304;
|
protected static $supportedFeatureSetVersion = 404;
|
||||||
|
|
||||||
protected function getExtensions()
|
protected function getExtensions()
|
||||||
{
|
{
|
||||||
|
@ -58,7 +58,7 @@ class EntityTypeTest extends BaseTypeTest
|
|||||||
*/
|
*/
|
||||||
private $emRegistry;
|
private $emRegistry;
|
||||||
|
|
||||||
protected static $supportedFeatureSetVersion = 304;
|
protected static $supportedFeatureSetVersion = 404;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
|
@ -17,7 +17,7 @@ use Symfony\Component\Form\Tests\AbstractLayoutTest;
|
|||||||
|
|
||||||
abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
|
abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
|
||||||
{
|
{
|
||||||
protected static $supportedFeatureSetVersion = 403;
|
protected static $supportedFeatureSetVersion = 404;
|
||||||
|
|
||||||
public function testLabelOnForm()
|
public function testLabelOnForm()
|
||||||
{
|
{
|
||||||
|
@ -13,7 +13,7 @@ namespace Symfony\Component\Form\Tests;
|
|||||||
|
|
||||||
trait VersionAwareTest
|
trait VersionAwareTest
|
||||||
{
|
{
|
||||||
protected static $supportedFeatureSetVersion = 304;
|
protected static $supportedFeatureSetVersion = 404;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param int $requiredFeatureSetVersion
|
* @param int $requiredFeatureSetVersion
|
||||||
|
@ -718,7 +718,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
|
|||||||
$fs->dumpFile($dir.$file, $code);
|
$fs->dumpFile($dir.$file, $code);
|
||||||
@chmod($dir.$file, 0666 & ~umask());
|
@chmod($dir.$file, 0666 & ~umask());
|
||||||
}
|
}
|
||||||
$legacyFile = \dirname($dir.$file).'.legacy';
|
$legacyFile = \dirname($dir.key($content)).'.legacy';
|
||||||
if (file_exists($legacyFile)) {
|
if (file_exists($legacyFile)) {
|
||||||
@unlink($legacyFile);
|
@unlink($legacyFile);
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,6 @@ use Symfony\Component\Mailer\Exception\HttpTransportException;
|
|||||||
use Symfony\Component\Mailer\SentMessage;
|
use Symfony\Component\Mailer\SentMessage;
|
||||||
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
|
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
|
||||||
use Symfony\Component\Mime\Email;
|
use Symfony\Component\Mime\Email;
|
||||||
use Symfony\Component\Mime\NamedAddress;
|
|
||||||
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
|
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
|
||||||
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
use Symfony\Contracts\HttpClient\HttpClientInterface;
|
||||||
use Symfony\Contracts\HttpClient\ResponseInterface;
|
use Symfony\Contracts\HttpClient\ResponseInterface;
|
||||||
@ -76,15 +75,12 @@ class MandrillApiTransport extends AbstractApiTransport
|
|||||||
'html' => $email->getHtmlBody(),
|
'html' => $email->getHtmlBody(),
|
||||||
'text' => $email->getTextBody(),
|
'text' => $email->getTextBody(),
|
||||||
'subject' => $email->getSubject(),
|
'subject' => $email->getSubject(),
|
||||||
|
'from_name' => $envelope->getSender()->getName(),
|
||||||
'from_email' => $envelope->getSender()->getAddress(),
|
'from_email' => $envelope->getSender()->getAddress(),
|
||||||
'to' => $this->getRecipients($email, $envelope),
|
'to' => $this->getRecipients($email, $envelope),
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($envelope->getSender() instanceof NamedAddress) {
|
|
||||||
$payload['message']['from_name'] = $envelope->getSender()->getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($email->getAttachments() as $attachment) {
|
foreach ($email->getAttachments() as $attachment) {
|
||||||
$headers = $attachment->getPreparedHeaders();
|
$headers = $attachment->getPreparedHeaders();
|
||||||
$disposition = $headers->getHeaderBody('Content-Disposition');
|
$disposition = $headers->getHeaderBody('Content-Disposition');
|
||||||
@ -126,13 +122,10 @@ class MandrillApiTransport extends AbstractApiTransport
|
|||||||
|
|
||||||
$recipientPayload = [
|
$recipientPayload = [
|
||||||
'email' => $recipient->getAddress(),
|
'email' => $recipient->getAddress(),
|
||||||
|
'name' => $recipient->getName(),
|
||||||
'type' => $type,
|
'type' => $type,
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($recipient instanceof NamedAddress) {
|
|
||||||
$recipientPayload['name'] = $recipient->getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
$recipients[] = $recipientPayload;
|
$recipients[] = $recipientPayload;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,7 +36,8 @@ class RoutingConfigurator
|
|||||||
final public function import($resource, string $type = null, bool $ignoreErrors = false): ImportConfigurator
|
final public function import($resource, string $type = null, bool $ignoreErrors = false): ImportConfigurator
|
||||||
{
|
{
|
||||||
$this->loader->setCurrentDir(\dirname($this->path));
|
$this->loader->setCurrentDir(\dirname($this->path));
|
||||||
$imported = $this->loader->import($resource, $type, $ignoreErrors, $this->file);
|
$imported = $this->loader->import($resource, $type, $ignoreErrors, $this->file) ?: [];
|
||||||
|
|
||||||
if (!\is_array($imported)) {
|
if (!\is_array($imported)) {
|
||||||
return new ImportConfigurator($this->collection, $imported);
|
return new ImportConfigurator($this->collection, $imported);
|
||||||
}
|
}
|
||||||
|
@ -166,7 +166,7 @@ class XmlFileLoader extends FileLoader
|
|||||||
$this->setCurrentDir(\dirname($path));
|
$this->setCurrentDir(\dirname($path));
|
||||||
|
|
||||||
/** @var RouteCollection[] $imported */
|
/** @var RouteCollection[] $imported */
|
||||||
$imported = $this->import($resource, ('' !== $type ? $type : null), false, $file);
|
$imported = $this->import($resource, ('' !== $type ? $type : null), false, $file) ?: [];
|
||||||
|
|
||||||
if (!\is_array($imported)) {
|
if (!\is_array($imported)) {
|
||||||
$imported = [$imported];
|
$imported = [$imported];
|
||||||
|
@ -185,7 +185,7 @@ class YamlFileLoader extends FileLoader
|
|||||||
|
|
||||||
$this->setCurrentDir(\dirname($path));
|
$this->setCurrentDir(\dirname($path));
|
||||||
|
|
||||||
$imported = $this->import($config['resource'], $type, false, $file);
|
$imported = $this->import($config['resource'], $type, false, $file) ?: [];
|
||||||
|
|
||||||
if (!\is_array($imported)) {
|
if (!\is_array($imported)) {
|
||||||
$imported = [$imported];
|
$imported = [$imported];
|
||||||
|
0
src/Symfony/Component/Routing/Tests/Fixtures/controller/empty_wildcard/.gitignore
vendored
Normal file
0
src/Symfony/Component/Routing/Tests/Fixtures/controller/empty_wildcard/.gitignore
vendored
Normal file
@ -5,3 +5,7 @@ api:
|
|||||||
resource: ../controller/routing.yml
|
resource: ../controller/routing.yml
|
||||||
name_prefix: api_
|
name_prefix: api_
|
||||||
prefix: /api
|
prefix: /api
|
||||||
|
|
||||||
|
empty_wildcard:
|
||||||
|
resource: ../controller/empty_wildcard/*
|
||||||
|
prefix: /empty_wildcard
|
||||||
|
Reference in New Issue
Block a user