Merge branch '4.4'
* 4.4: Fix name of logical classes [Mailer] made the message logger permanent
This commit is contained in:
commit
b3c9b59222
@ -19,7 +19,6 @@ if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Ve
|
|||||||
'PHPUnit_Framework_BaseTestListener', // override PhpUnit's ForwardCompat child class
|
'PHPUnit_Framework_BaseTestListener', // override PhpUnit's ForwardCompat child class
|
||||||
|
|
||||||
'PHPUnit_Framework_Constraint',
|
'PHPUnit_Framework_Constraint',
|
||||||
'PHPUnit_Framework_Constraint_And',
|
|
||||||
'PHPUnit_Framework_Constraint_ArrayHasKey',
|
'PHPUnit_Framework_Constraint_ArrayHasKey',
|
||||||
'PHPUnit_Framework_Constraint_ArraySubset',
|
'PHPUnit_Framework_Constraint_ArraySubset',
|
||||||
'PHPUnit_Framework_Constraint_Attribute',
|
'PHPUnit_Framework_Constraint_Attribute',
|
||||||
@ -47,9 +46,7 @@ if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Ve
|
|||||||
'PHPUnit_Framework_Constraint_JsonMatches',
|
'PHPUnit_Framework_Constraint_JsonMatches',
|
||||||
'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider',
|
'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider',
|
||||||
'PHPUnit_Framework_Constraint_LessThan',
|
'PHPUnit_Framework_Constraint_LessThan',
|
||||||
'PHPUnit_Framework_Constraint_Not',
|
|
||||||
'PHPUnit_Framework_Constraint_ObjectHasAttribute',
|
'PHPUnit_Framework_Constraint_ObjectHasAttribute',
|
||||||
'PHPUnit_Framework_Constraint_Or',
|
|
||||||
'PHPUnit_Framework_Constraint_PCREMatch',
|
'PHPUnit_Framework_Constraint_PCREMatch',
|
||||||
'PHPUnit_Framework_Constraint_SameSize',
|
'PHPUnit_Framework_Constraint_SameSize',
|
||||||
'PHPUnit_Framework_Constraint_StringContains',
|
'PHPUnit_Framework_Constraint_StringContains',
|
||||||
@ -58,7 +55,6 @@ if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Ve
|
|||||||
'PHPUnit_Framework_Constraint_StringStartsWith',
|
'PHPUnit_Framework_Constraint_StringStartsWith',
|
||||||
'PHPUnit_Framework_Constraint_TraversableContains',
|
'PHPUnit_Framework_Constraint_TraversableContains',
|
||||||
'PHPUnit_Framework_Constraint_TraversableContainsOnly',
|
'PHPUnit_Framework_Constraint_TraversableContainsOnly',
|
||||||
'PHPUnit_Framework_Constraint_Xor',
|
|
||||||
|
|
||||||
'PHPUnit_Framework_Error',
|
'PHPUnit_Framework_Error',
|
||||||
'PHPUnit_Framework_Error_Deprecated',
|
'PHPUnit_Framework_Error_Deprecated',
|
||||||
@ -97,8 +93,13 @@ if (class_exists('PHPUnit_Runner_Version') && version_compare(\PHPUnit_Runner_Ve
|
|||||||
'PHPUnit_Util_XML',
|
'PHPUnit_Util_XML',
|
||||||
];
|
];
|
||||||
foreach ($classes as $class) {
|
foreach ($classes as $class) {
|
||||||
class_alias($class, '\\'.strtr($class, '_', '\\'), true);
|
class_alias($class, '\\'.strtr($class, '_', '\\'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class_alias('PHPUnit_Framework_Constraint_And', 'PHPUnit\Framework\Constraint\LogicalAnd');
|
||||||
|
class_alias('PHPUnit_Framework_Constraint_Not', 'PHPUnit\Framework\Constraint\LogicalNot');
|
||||||
|
class_alias('PHPUnit_Framework_Constraint_Or', 'PHPUnit\Framework\Constraint\LogicalOr');
|
||||||
|
class_alias('PHPUnit_Framework_Constraint_Xor', 'PHPUnit\Framework\Constraint\LogicalXor');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detect if we need to serialize deprecations to a file.
|
// Detect if we need to serialize deprecations to a file.
|
||||||
|
@ -139,6 +139,7 @@ class FrameworkExtension extends Extension
|
|||||||
private $annotationsConfigEnabled = false;
|
private $annotationsConfigEnabled = false;
|
||||||
private $validatorConfigEnabled = false;
|
private $validatorConfigEnabled = false;
|
||||||
private $messengerConfigEnabled = false;
|
private $messengerConfigEnabled = false;
|
||||||
|
private $mailerConfigEnabled = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Responds to the app.config configuration parameter.
|
* Responds to the app.config configuration parameter.
|
||||||
@ -321,7 +322,7 @@ class FrameworkExtension extends Extension
|
|||||||
$this->registerHttpClientConfiguration($config['http_client'], $container, $loader);
|
$this->registerHttpClientConfiguration($config['http_client'], $container, $loader);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->isConfigEnabled($container, $config['mailer'])) {
|
if ($this->mailerConfigEnabled = $this->isConfigEnabled($container, $config['mailer'])) {
|
||||||
$this->registerMailerConfiguration($config['mailer'], $container, $loader);
|
$this->registerMailerConfiguration($config['mailer'], $container, $loader);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -528,6 +529,10 @@ class FrameworkExtension extends Extension
|
|||||||
$loader->load('messenger_debug.xml');
|
$loader->load('messenger_debug.xml');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($this->mailerConfigEnabled) {
|
||||||
|
$loader->load('mailer_debug.xml');
|
||||||
|
}
|
||||||
|
|
||||||
$container->setParameter('profiler_listener.only_exceptions', $config['only_exceptions']);
|
$container->setParameter('profiler_listener.only_exceptions', $config['only_exceptions']);
|
||||||
$container->setParameter('profiler_listener.only_master_requests', $config['only_master_requests']);
|
$container->setParameter('profiler_listener.only_master_requests', $config['only_master_requests']);
|
||||||
|
|
||||||
@ -1806,9 +1811,6 @@ class FrameworkExtension extends Extension
|
|||||||
}
|
}
|
||||||
|
|
||||||
$loader->load('mailer.xml');
|
$loader->load('mailer.xml');
|
||||||
if ($container->getParameter('kernel.debug')) {
|
|
||||||
$loader->load('mailer_debug.xml');
|
|
||||||
}
|
|
||||||
$loader->load('mailer_transports.xml');
|
$loader->load('mailer_transports.xml');
|
||||||
$container->getDefinition('mailer.default_transport')->setArgument(0, $config['dsn']);
|
$container->getDefinition('mailer.default_transport')->setArgument(0, $config['dsn']);
|
||||||
|
|
||||||
|
@ -33,5 +33,9 @@
|
|||||||
<argument /> <!-- recipients -->
|
<argument /> <!-- recipients -->
|
||||||
<tag name="kernel.event_subscriber"/>
|
<tag name="kernel.event_subscriber"/>
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
|
<service id="mailer.logger_message_listener" class="Symfony\Component\Mailer\EventListener\MessageLoggerListener">
|
||||||
|
<tag name="kernel.event_subscriber"/>
|
||||||
|
</service>
|
||||||
</services>
|
</services>
|
||||||
</container>
|
</container>
|
||||||
|
@ -5,10 +5,6 @@
|
|||||||
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
|
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
|
||||||
|
|
||||||
<services>
|
<services>
|
||||||
<service id="mailer.logger_message_listener" class="Symfony\Component\Mailer\EventListener\MessageLoggerListener">
|
|
||||||
<tag name="kernel.event_subscriber"/>
|
|
||||||
</service>
|
|
||||||
|
|
||||||
<service id="mailer.data_collector" class="Symfony\Component\Mailer\DataCollector\MessageDataCollector">
|
<service id="mailer.data_collector" class="Symfony\Component\Mailer\DataCollector\MessageDataCollector">
|
||||||
<argument type="service" id="mailer.logger_message_listener" />
|
<argument type="service" id="mailer.logger_message_listener" />
|
||||||
<tag name="data_collector" template="@WebProfiler/Collector/mailer.html.twig" id="mailer" />
|
<tag name="data_collector" template="@WebProfiler/Collector/mailer.html.twig" id="mailer" />
|
||||||
|
Reference in New Issue
Block a user