diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-09-22 10:51:05 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-09-22 10:51:05 +0200 |
| commit | 78ebbab243651e31b940cb1330b06361dbd3c37b (patch) | |
| tree | 04369a088ecc49592c4702ab86fc937f80b19e1b /Core/Util | |
| parent | 9aefee358bddb7baf5ae57607f4af2e721397f58 (diff) | |
| parent | 2d2a3fa99c5d006c67dcaed702ac9a306ebe9c41 (diff) | |
| download | symfony-security-78ebbab243651e31b940cb1330b06361dbd3c37b.zip symfony-security-78ebbab243651e31b940cb1330b06361dbd3c37b.tar.gz symfony-security-78ebbab243651e31b940cb1330b06361dbd3c37b.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3:
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/Console/Tests/ApplicationTest.php
src/Symfony/Component/Filesystem/Exception/IOException.php
src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/Mock/RedisMock.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Validator/Constraints/CollectionValidator.php
src/Symfony/Component/Validator/Tests/ExecutionContextTest.php
Diffstat (limited to 'Core/Util')
| -rw-r--r-- | Core/Util/ClassUtils.php | 4 | ||||
| -rw-r--r-- | Core/Util/StringUtils.php | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php index 26bf1a1..1d40c8d 100644 --- a/Core/Util/ClassUtils.php +++ b/Core/Util/ClassUtils.php @@ -39,7 +39,9 @@ class ClassUtils /** * This class should not be instantiated */ - private function __construct() {} + private function __construct() + { + } /** * Gets the real class name of a class name that could be a proxy. diff --git a/Core/Util/StringUtils.php b/Core/Util/StringUtils.php index acf8e9e..01441cb 100644 --- a/Core/Util/StringUtils.php +++ b/Core/Util/StringUtils.php @@ -21,7 +21,9 @@ class StringUtils /** * This class should not be instantiated */ - private function __construct() {} + private function __construct() + { + } /** * Compares two strings. |