Nicolas Grekas
134556a24b
Merge branch '2.8' into 3.1
...
* 2.8:
Minor fixes & cleanups
2016-10-06 10:56:36 +02:00
Nicolas Grekas
dcf601f3fa
Minor fixes & cleanups
2016-10-06 10:40:01 +02:00
Fabien Potencier
d9dfed2976
Merge branch '2.8' into 3.1
...
* 2.8:
[DependencyInjection] Add missing PHPDoc type
Correct a typo in the ReflectionExtractor's description
[HttpFoundation] JSONP callback validation
[Console] Improved the explanation of the hasOption() method
Uniformize exception vars according to our CS
add missing use statement
bug #18042 [Security] $attributes can be anything, but RoleVoter assumes strings
2016-10-05 18:44:51 -07:00
Roland Franssen
1159f8bba6
[HttpFoundation] JSONP callback validation
2016-10-05 12:15:52 -07:00
Kévin Dunglas
73ef9957b3
[HttpFoundation] Fix BC break introduced by #17642
2016-03-04 10:04:16 +01:00
Fred Cox
f904a2ba99
Add a Controller function to make it easy to return json
...
If the serializer component is enabled it is used to generate the json
data, if not the standard `json_encode` function is used
2016-03-02 16:31:41 +02:00
Nicolas Grekas
2e11b8b2cb
Merge branch '2.8'
...
* 2.8:
Fix merge
[tests] Use @requires annotation when possible
[tests] Use @requires annotation when possible
[PhpUnitBridge] Add SkippedTestsListener to collect and replay skipped tests
[ci] Enable collecting and replaying skipped tests
[tests] Use @requires annotation when possible
[Process] Workaround buggy PHP warning
[FrameworkBundle] Replace PhpFileCache by FilesystemCache
[FrameworkBundle] composer suggest fix
[Console] Add additional ways to detect OS400 platform
[Yaml] Allow tabs before comments at the end of a line
Added more tests for PropertyAccess
Conflicts:
.travis.yml
src/Symfony/Bridge/Doctrine/composer.json
src/Symfony/Bridge/Monolog/composer.json
src/Symfony/Bridge/ProxyManager/composer.json
src/Symfony/Bridge/Swiftmailer/composer.json
src/Symfony/Bridge/Twig/composer.json
src/Symfony/Bundle/DebugBundle/composer.json
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Bundle/FrameworkBundle/composer.json
src/Symfony/Bundle/SecurityBundle/composer.json
src/Symfony/Bundle/TwigBundle/composer.json
src/Symfony/Bundle/WebProfilerBundle/composer.json
src/Symfony/Component/Asset/composer.json
src/Symfony/Component/BrowserKit/composer.json
src/Symfony/Component/ClassLoader/Tests/ApcClassLoaderTest.php
src/Symfony/Component/ClassLoader/composer.json
src/Symfony/Component/Config/composer.json
src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
src/Symfony/Component/Console/composer.json
src/Symfony/Component/CssSelector/composer.json
src/Symfony/Component/Debug/composer.json
src/Symfony/Component/DependencyInjection/composer.json
src/Symfony/Component/DomCrawler/composer.json
src/Symfony/Component/EventDispatcher/composer.json
src/Symfony/Component/ExpressionLanguage/composer.json
src/Symfony/Component/Filesystem/composer.json
src/Symfony/Component/Finder/composer.json
src/Symfony/Component/Form/Tests/Extension/Csrf/CsrfProvider/LegacyDefaultCsrfProviderTest.php
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
src/Symfony/Component/HttpFoundation/composer.json
src/Symfony/Component/HttpKernel/Tests/Profiler/MongoDbProfilerStorageTest.php
src/Symfony/Component/HttpKernel/Tests/Profiler/SqliteProfilerStorageTest.php
src/Symfony/Component/HttpKernel/composer.json
src/Symfony/Component/Intl/Tests/Data/Bundle/Writer/PhpBundleWriterTest.php
src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
src/Symfony/Component/Intl/composer.json
src/Symfony/Component/Ldap/composer.json
src/Symfony/Component/Locale/composer.json
src/Symfony/Component/Locale/phpunit.xml.dist
src/Symfony/Component/OptionsResolver/composer.json
src/Symfony/Component/Process/composer.json
src/Symfony/Component/PropertyAccess/composer.json
src/Symfony/Component/PropertyInfo/composer.json
src/Symfony/Component/Routing/composer.json
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Guard/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
src/Symfony/Component/Serializer/composer.json
src/Symfony/Component/Stopwatch/composer.json
src/Symfony/Component/Templating/composer.json
src/Symfony/Component/Translation/composer.json
src/Symfony/Component/Validator/Tests/Mapping/Cache/LegacyApcCacheTest.php
src/Symfony/Component/Validator/composer.json
src/Symfony/Component/VarDumper/composer.json
src/Symfony/Component/Yaml/composer.json
2015-10-10 12:22:50 +02:00
Nicolas Grekas
b028aeaa04
[tests] Use @requires annotation when possible
2015-10-10 11:00:45 +02:00
Nicolas Grekas
8a782556eb
[2.6] Towards 100% HHVM compat
2015-07-01 12:03:42 +02:00
Jérôme Tamarelle
6d6a3af4ff
Clear json_last_error
2014-09-22 17:58:58 +02:00
Jerome TAMARELLE
ef91f710e3
Fix JsonSerializable namespace
2014-09-22 17:58:58 +02:00
Jerome TAMARELLE
ddf95c7adc
[HttpFoundation] Silent only JSON errors
2014-09-22 17:58:58 +02:00
Fabien Potencier
cd8927017f
Merge branch '2.4' into 2.5
...
* 2.4:
Remove Spaceless Blocks From Twig Templates
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
Added verbosity methods
Conflicts:
src/Symfony/Component/Form/FormError.php
2014-07-15 16:15:12 +02:00
Andrew Moore
6af3d05b85
[HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671)
2014-07-10 09:27:11 -04:00
Joseph Bielawski
f8bc3b276f
[HttpFoundation] JsonResponse::setEncodingOptions accepts also integer
...
Now you can set encoding options like:
```
$response->setEncodingOptions(JSON_UNESCAPED_UNICODE | $response->getEncodingOptions());
2014-01-07 14:19:33 +01:00
Joseph Bielawski
89f47841fe
[HttpFoundation] Add ability to change JSON encoding options
2014-01-07 13:28:26 +01:00
Joseph Bielawski
38287e76ed
[HttpFoundation] Throw proper exception when invalid data is passed to JsonResponse class
2013-12-31 00:31:44 +01:00
Michal Piotrowski
3036b009a3
JsonResponseTest
2012-09-01 02:56:27 -04:00
Fabien Potencier
b84b46ba1a
[HttpFoundation] added some unit tests (refs #4510 )
2012-06-08 16:22:49 +02: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
