diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.3

Browse Source 
* 3.4:
  [FrameworkBundle] Fix wrong returned status code in ConfigDebugCommand
  [AnnotationCacheWarmer] add RedirectController to annotation cache
This commit is contained in:
Nicolas Grekas 2019-10-02 16:34:29 +02:00
commit bf62544a0c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
View File

@ -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));

2
src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml
View File

@ -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>

2
src/Symfony/Component/Serializer/Tests/Encoder/CsvEncoderTest.php
View File

@ -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]));
}
/**