Skip to content

Commit 7ea658c

Browse files
committed
Merge branch '2.4'
* 2.4: [Debug] fixed unit tests Avoid notice from being *eaten* by fatal error. Teardown used wrong property Modified guessDefaultEscapingStrategy to not escape txt templates Fix DateType for 32bits computers. Fixed the registration of validation.xml file when the form is disabled fixed lexing expression ending with spaces Fixes #9633, Removed dependency to Symfony\Bundle\FrameworkBundle\Tests\TestCase [Validator] Replaced inexistent interface. [HttpKernel] Fix profiler event-listener usage outside request stack context When getting the session's id, check if the session is not closed Fix undefined offset when formatting namespace suggestions Adjusting CacheClear Warmup method to namespaced kernels
2 parents eb73700 + 59ab64d commit 7ea658c

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

Command/CacheClearCommand.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,9 @@ protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = tr
120120
$warmer->warmUp($warmupDir);
121121

122122
// fix references to the Kernel in .meta files
123-
124123
$safeTempKernel = str_replace('\\', '\\\\', get_class($tempKernel));
125124
$realKernelFQN = get_class($realKernel);
126-
125+
127126
foreach (Finder::create()->files()->name('*.meta')->in($warmupDir) as $file) {
128127
file_put_contents($file, preg_replace(
129128
'/(C\:\d+\:)"'.$safeTempKernel.'"/',

DependencyInjection/FrameworkExtension.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,13 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
671671

672672
private function getValidatorXmlMappingFiles(ContainerBuilder $container)
673673
{
674-
$reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');
675-
$files = array(dirname($reflClass->getFileName()).'/Resources/config/validation.xml');
676-
$container->addResource(new FileResource($files[0]));
674+
$files = array();
675+
676+
if (interface_exists('Symfony\Component\Form\FormInterface')) {
677+
$reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');
678+
$files[] = dirname($reflClass->getFileName()).'/Resources/config/validation.xml';
679+
$container->addResource(new FileResource($files[0]));
680+
}
677681

678682
foreach ($container->getParameter('kernel.bundles') as $bundle) {
679683
$reflection = new \ReflectionClass($bundle);

0 commit comments

Comments
 (0)