Fabien Potencier
05815adb22
Merge branch '2.5'
...
* 2.5:
added missing use statements
added missing use statement
added missing use statement
fixed CS
[Process] fixed some volatile tests
[HttpKernel] fixed a volatile test
[HttpFoundation] fixed some volatile tests
[Tests] PHPUnit Optimizations
Use getPathname() instead of string casting to get BinaryFileReponse file path
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/full.php
src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
src/Symfony/Component/Process/Process.php
src/Symfony/Component/Stopwatch/Stopwatch.php
src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php
src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
src/Symfony/Component/Yaml/Parser.php
src/Symfony/Component/Yaml/Tests/InlineTest.php
2014-09-22 13:59:59 +02:00
Fabien Potencier
27e8c654db
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
2014-09-22 10:51:05 +02:00
Fabien Potencier
369aebf431
fixed CS
2014-09-22 10:32:35 +02:00
Fabien Potencier
31d2f6b296
feature #9859 [Translation] added method to expose collected message (Grygir)
...
This PR was merged into the 2.6-dev branch.
Discussion
----------
[Translation] added method to expose collected message
| Q | A
| ------------- | ---
| Bug fix? | no
| New feature? | yes
| BC breaks? | no
| Deprecations? | no
| Tests pass? | no
| Fixed tickets | #2435
| License | MIT
| Doc PR | symfony/symfony-docs#3386
Commits
-------
ef5d7c5
[Translation] added method to expose collected messages
2014-08-27 14:55:31 +02:00
Hryhorii Hrebiniuk
ef5d7c596e
[Translation] added method to expose collected messages
2014-08-18 16:11:02 +03:00
Fabien Potencier
b07a6b6201
Merge branch '2.3' into 2.4
...
* 2.3:
[Translator] Use quote to surround invalid locale
Optimize assertLocale regexp
[Validator] Backported #11410 to 2.3: Object initializers are called only once per object
[Translator][FrameworkBundle] Added @ to the list of allowed chars in Translator
[Process] Reduce I/O load on Windows platform
[Form] Check if IntlDateFormatter constructor returned a valid object before using it
2014-07-24 18:59:59 +02:00
Rafał Muszyński
3176f8bb98
[Translator][FrameworkBundle] Added @ to the list of allowed chars in Translator
2014-07-17 12:20:11 +02:00
Fabien Potencier
84334058b8
fixed typo
2014-07-15 16:22:28 +02:00
Fabien Potencier
56b0139b0d
Merge branch '2.3' into 2.4
...
* 2.3:
Validate locales sets intos translator
Fix UserPassword validator translation
Remove Spaceless Blocks from Twig Form Templates
fixed typo
[HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
added regression test
fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval
[HttpFoundation] Fix wrong assertion in Response test
[Upgrade] Fixed markdown syntax
[2.3][Form] Cleanup & fix phpdocs
Conflicts:
src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
2014-07-15 16:07:10 +02:00
Jérémy Derussé
06a80fbdbe
Validate locales sets intos translator
2014-07-15 15:44:49 +02:00
Fabien Potencier
990267f959
Merge branch '2.3' into 2.4
...
* 2.3:
Fixed mistake in upgrade docu
Container::camelize also takes backslashes into consideration
fixed typos
fixed @expectedException class names
fixed some typos
fixed @expectedException class names
Typo and better wording for german validator translation
2013-11-26 17:40:27 +01:00
Fabien Potencier
e0b751a2d8
Merge branch '2.2' into 2.3
...
* 2.2:
fixed some typos
fixed @expectedException class names
Conflicts:
src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
src/Symfony/Component/Console/Tests/Command/CommandTest.php
src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php
src/Symfony/Component/Locale/Tests/Stub/StubNumberFormatterTest.php
2013-11-25 15:49:41 +01:00
Fabien Potencier
8d69bb5886
fixed @expectedException class names
2013-11-25 09:44:14 +01:00
Tobias Schultze
7cdb26066f
[Translation] make IdentityTranslater consistent with normal translator
2013-11-20 03:31:35 +01:00
Radosław Benkel
fcef02151a
[Translation] Added support for JSON format (both loader and dumper).
2013-09-03 22:32:09 +02:00
Fabien Potencier
4ec3cd03db
Merge branch '2.2' into 2.3
...
* 2.2:
fix typo in test skipped message
[Form] Fixed Form::all() signature for PHP 5.3.3
[Translation] Grammar fix
[Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used
Conflicts:
src/Symfony/Component/Form/Util/VirtualFormAwareIterator.php
2013-08-26 07:49:51 +02:00
Bernhard Schussek
2b3dcb9171
[Translation] Grammar fix
2013-08-24 14:29:44 +02:00
Bernhard Schussek
0951b8de16
[Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used
2013-08-23 17:24:14 +02:00
Fabien Potencier
f43a0eef9d
Merge branch '2.2'
...
* 2.2:
Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
[Translation] fixed a unit test
Conflicts:
src/Symfony/Component/HttpFoundation/Request.php
2013-04-30 19:05:37 +02:00
Fabien Potencier
d1cad7e243
[Translation] fixed a unit test
2013-04-30 11:53:49 +02:00
Fabien Potencier
5f889525f6
Merge branch '2.2'
...
* 2.2:
[BrowserKit] fixed BC break done recently
[Process] Fix #5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled
[Console] find command even if its name is a namespace too (closes #7860 )
Rename misprint property (from warmer to finder)
Reset all catalogues when adding resource to fallback locale (#7715 , #7819 )
Added reloading of fallback catalogues when calling addResource() (#7715 )
Re-added context information to log list
Add This field is missing RU translation
Conflicts:
src/Symfony/Component/Console/Tests/ApplicationTest.php
2013-04-30 09:16:44 +02:00
Andrew Hilobok
3c97004972
Reset all catalogues when adding resource to fallback locale ( #7715 , #7819 )
...
Slightly refactored testAddResourceAfterTrans()
and replaced costly part with reset all catalogues
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7715 , #7819
| License | MIT
| Doc PR |
2013-04-24 11:42:33 +02:00
Andrew Hilobok
0fb35a4a83
Added reloading of fallback catalogues when calling addResource() ( #7715 )
...
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #7715
| License | MIT
| Doc PR |
2013-04-24 11:42:33 +02:00
Fabien Potencier
0ef08f5848
[Translator] fixed inconsistency in Translator
2013-02-19 08:34:16 +01:00
Bernhard Schussek
184c8e586f
Fixed @expectedException definitions to reference absolute exception paths
2013-01-05 18:52:40 +01:00
Fabien Potencier
b43d7bf66b
[Translation] fixed a unit test
2012-12-13 21:23:16 +01:00
umpirsky
219681092c
Added QtTranslationsLoader tests.
2012-12-13 19:47:04 +01:00
umpirsky
201818bd4b
Fixed #5797 .
2012-12-13 18:48:40 +01:00
Fabien Potencier
fea6b79acd
moved component and bridge unit tests to the src/ directory
...
This is the first step to make each Symfony Component and Bridge self-contained.
2012-03-29 08:37:22 +02:00