8000 Merge branch '4.3' into 4.4 · symfony/symfony@52e9fb9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 52e9fb9

Browse files
fabpotfabpot
committed
Merge branch '4.3' into 4.4
* 4.3: added missing test [Mailer] Allow register mailer configuration in xml format fixed CS [FrameworkBundle] Fix descriptor of routes described as callable array [Debug][DebugClassLoader] Include found files instead of requiring them [HttpKernel] fix tests Adding missing event_dispatcher wiring for messenger.middleware.send_message
2 parents e9ab234 + a0d2c42 commit 52e9fb9

File tree

8 files changed

+40
-4
lines changed

8 files changed

+40
-4
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ private function formatControllerLink($controller, string $anchorText): string
540540

541541
try {
542542
if (\is_array($controller)) {
543-
$r = new \ReflectionMethod($controller);
543+
$r = new \ReflectionMethod($controller[0], $controller[1]);
544544
} elseif ($controller instanceof \Closure) {
545545
$r = new \ReflectionFunction($controller);
546546
} elseif (method_exists($controller, '__invoke')) {

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<service id="messenger.middleware.send_message" class="Symfony\Component\Messenger\Middleware\SendMessageMiddleware">
1616
<tag name="monolog.logger" channel="messenger" />
1717
<argument type="service" id="messenger.senders_locator" />
18+
<argument type="service" id="event_dispatcher" />
1819
<call method="setLogger">
1920
<argument type="service" id="logger" on-invalid="ignore" />
2021
</call>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<xsd:element name="lock" type="lock" minOccurs="0" maxOccurs="1" />
3434
<xsd:element name="messenger" type="messenger" minOccurs="0" maxOccurs="1" />
3535
<xsd:element name="http-client" type="http_client" minOccurs="0" maxOccurs="1" />
36+
<xsd:element name="mailer" type="mailer" minOccurs="0" maxOccurs="1" />
3637
</xsd:choice>
3738

3839
<xsd:attribute name="http-method-override" type="xsd:boolean" />
@@ -552,4 +553,8 @@
552553
<xsd:complexType name="http_header" mixed="true">
553554
<xsd:attribute name="name" type="xsd:string" />
554555
</xsd:complexType>
556+
557+
<xsd:complexType name="mailer">
558+
<xsd:attribute name="dsn" type="xsd:string" />
559+
</xsd:complexType>
555560
</xsd:schema>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/mailer.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'mailer' => [
5+
'dsn' => 'smtp://example.com',
6+
],
7+
]);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/mailer.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xmlns:framework="http://symfony.com/schema/dic/symfony"
6+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
7+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
8+
9+
<framework:config>
10+
<framework:mailer dsn="smtp://example.com" />
11+
</framework:config>
12+
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/mailer.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
framework:
2+
mailer:
3+
dsn: 'smtp://example.com'

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
5858
use Symfony\Component\Validator\Mapping\Loader\PropertyInfoLoader;
5959
use Symfony\Component\Validator\Util\LegacyTranslatorProxy;
60-
use Symfony\Component\Validator\Validation;
6160
use Symfony\Component\Workflow;
6261

6362
abstract class FrameworkExtensionTest extends TestCase
@@ -1582,6 +1581,15 @@ public function testHttpClientFullDefaultOptions()
15821581
], $defaultOptions['peer_fingerprint']);
15831582
}
15841583

1584+
public function testMailer(): void
1585+
{
1586+
$container = $this->createContainerFromFile('mailer');
1587+
1588+
$this->assertTrue($container->hasAlias('mailer'));
1589+
$this->assertTrue($container->hasDefinition('mailer.default_transport'));
1590+
$this->assertSame('smtp://example.com', $container->getDefinition('mailer.default_transport')->getArgument(0));
1591+
}
1592+
15851593
protected function createContainer(array $data = [])
15861594
{
15871595
return new ContainerBuilder(new ParameterBag(array_merge([

‎src/Symfony/Component/Debug/DebugClassLoader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ public function loadClass($class)
153153
if (!$file = $this->classLoader[0]->findFile($class) ?: false) {
154154
// no-op
155155
} elseif (\function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file)) {
156-
require $file;
156+
include $file;
157157

158158
return;
159159
} else {
160-
require $file;
160+
include $file;
161161
}
162162
} else {
163163
($this->classLoader)($class);

0 commit comments

Comments
 (0)
0