Merge branch '3.4' into 4.3
* 3.4: [FrameworkBundle] Fix wrong returned status code in ConfigDebugCommand [AnnotationCacheWarmer] add RedirectController to annotation cache
This commit is contained in:
commit
bf62544a0c
@ -109,7 +109,7 @@ EOF
|
||||
} catch (LogicException $e) {
|
||||
$errorIo->error($e->getMessage());
|
||||
|
||||
return;
|
||||
return 1;
|
||||
}
|
||||
|
||||
$io->title(sprintf('Current configuration for "%s.%s"', $extensionAlias, $path));
|
||||
|
@ -36,7 +36,7 @@
|
||||
<service id="annotations.cache_warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer">
|
||||
<argument type="service" id="annotations.reader" />
|
||||
<argument>%kernel.cache_dir%/annotations.php</argument>
|
||||
<argument>#^Symfony\\(?:Component\\HttpKernel\\|Bundle\\FrameworkBundle\\Controller\\(?!AbstractController$|Controller$))#</argument>
|
||||
<argument>#^Symfony\\(?:Component\\HttpKernel\\|Bundle\\FrameworkBundle\\Controller\\(?!.*Controller$))#</argument>
|
||||
<argument>%kernel.debug%</argument>
|
||||
</service>
|
||||
|
||||
|
@ -55,7 +55,7 @@ CSV
|
||||
'true' => '1',
|
||||
'int_one' => '1',
|
||||
'string_one' => '1',
|
||||
], $this->encoder->decode($csv, 'csv'));
|
||||
], $this->encoder->decode($csv, 'csv', [CsvEncoder::AS_COLLECTION_KEY => false]));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user