Fabien Potencier
c0e4495b66
fixes CS
2015-08-24 09:13:45 +02:00
Fabien Potencier
618b7dcfb8
Merge branch '2.3' into 2.6
...
* 2.3:
Fix small coding style
[2.3] Static Code Analysis for Components
[Form] fixed phpdoc
CS: Convert double quotes to single quotes
Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
[Validator] added Japanese translation for unmatched charset (id: 80)
[DependencyInjection] Highest precedence for user parameters
[Translation][MoFileLoader] fixed load empty translation.
bumped Symfony version to 2.3.27
updated VERSION for 2.3.26
update CONTRIBUTORS for 2.3.26
updated CHANGELOG for 2.3.26
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Debug/ExceptionHandler.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
src/Symfony/Component/Filesystem/Filesystem.php
src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Translation/PluralizationRules.php
src/Symfony/Component/Validator/Constraints/IssnValidator.php
src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
src/Symfony/Component/Yaml/Tests/InlineTest.php
2015-03-22 17:55:57 +01:00
Dariusz Ruminski
f99c22c08a
CS: Convert double quotes to single quotes
2015-03-21 12:11:30 +01:00
Fabien Potencier
f26c062c00
Merge branch '2.3' into 2.5
...
* 2.3:
[2.3] CS And DocBlock Fixes
[2.3] CS Fixes
Conflicts:
src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
src/Symfony/Component/Form/FormError.php
src/Symfony/Component/HttpFoundation/Request.php
src/Symfony/Component/HttpFoundation/Response.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/Process/ProcessUtils.php
src/Symfony/Component/PropertyAccess/PropertyAccessor.php
src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
src/Symfony/Component/Validator/Constraints/GroupSequence.php
src/Symfony/Component/Validator/Mapping/ClassMetadata.php
src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
src/Symfony/Component/Validator/Mapping/MemberMetadata.php
src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
2014-12-22 17:29:52 +01:00
Graham Campbell
83c15db887
[2.3] CS And DocBlock Fixes
2014-12-22 16:58:09 +01:00
Baptiste Clavié
849703a784
When a process fails, check if the output is enabled
...
With the recent addition of the ability to disable the output, it was
not taken into account within the `ProcessFailedException`.
So, if the output was indeed disabled, and the process returns an
error (i.e via a `mustRun`) we could have another LogicException which
is not expected.
2014-03-25 23:03:32 +01:00
Fabien Potencier
14cb1fa3d0
Merge branch '2.2'
...
* 2.2:
bumped Symfony version to 2.1.11-DEV
updated VERSION for 2.1.10
update CONTRIBUTORS for 2.1.10
updated CHANGELOG for 2.1.10
fixed CS
[Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
[Filesystem] Fix regression introduced in 10dea948
2013-05-06 22:03:44 +02:00
Fabien Potencier
66433c5626
Merge branch '2.1' into 2.2
...
* 2.1:
bumped Symfony version to 2.1.11-DEV
updated VERSION for 2.1.10
update CONTRIBUTORS for 2.1.10
updated CHANGELOG for 2.1.10
fixed CS
[Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
[Filesystem] Fix regression introduced in 10dea948
2013-05-06 22:02:13 +02:00
Joseph Bielawski
05b987f381
[Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
2013-05-06 12:21:56 +02:00
Vitaliy Zakharov
7519fdc10f
[Process] added exit code to ProcessFailedException message
2013-04-11 19:56:25 +06:00
Romain Neutron
c5e7793004
[Process] Normalize exceptions
2012-08-30 21:25:16 +02:00
Sebastian Marek
1c03a167bf
[Process] Fixed ProcessFailedException not populating exception message due to a missing sprintf parameter
2012-04-25 15:42:54 +01:00
