Fabien Potencier
c4dc0034e7
Merge branch '2.3' into 2.5
...
* 2.3:
Updated generateSql tool
Fix the implementation of deprecated Locale classes
Fix phpdoc and coding standards
Replace usages of the deprecated TypeTestCase by the new one
Remove usages of deprecated constants
Update functional tests to use the PSR NullLogger
Make fabbot happy
Clean up testing
[DomCrawler] fixed bug #12143
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/DomCrawler/Crawler.php
src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
2014-12-30 10:03:46 +01:00
Christophe Coevoet
8cc3f6aad4
Fix phpdoc and coding standards
...
This removes the unused use statements which were not catched by
PHP-CS-Fixer because of string occurences. It also fixes some invalid
phpdoc (scalar is not recognized as a valid type for instance).
2014-12-29 23:41:34 +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
Fabien Potencier
7e573f4f8a
Merge branch '2.3' into 2.5
...
* 2.3:
Revert "[DependencyInjection] backport perf optim"
[WebProfilerBundle] replaced pattern to path attribute in routes definitions.
[FrameworkBundle][Template name] avoid error message for the shortcut notation.
[DependencyInjection] perf optim: call dirname() at most 5x
[DependencyInjection] backport perf optim
[2.3] Remove possible call_user_func()
Conflicts:
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
2014-12-11 20:53:06 +01:00
Abdellatif Ait boudad
055129c1c2
[FrameworkBundle][Template name] avoid error message for the shortcut notation.
2014-12-08 10:32:45 +00:00
Disquedur
e638ccbe39
Remove aligned '=>' and '='
2014-10-30 21:17:55 +01:00
Fabien Potencier
b91866f6c1
Merge branch '2.4' into 2.5
...
* 2.4:
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/Fixtures/php/full.php
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php
src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php
src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php
src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php
src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
src/Symfony/Component/Validator/Constraints/CollectionValidator.php
src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
src/Symfony/Component/Validator/Tests/ValidationVisitorTest.php
src/Symfony/Component/Yaml/Parser.php
2014-09-22 11:14:18 +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
28a8400867
feature #9251 [WIP] [FrameworkBundle] removed some more dependencies on the request service (fabpot)
...
This PR was merged into the 2.5-dev branch.
Discussion
----------
[WIP] [FrameworkBundle] removed some more dependencies on the request service
| Q | A
| ------------- | ---
| Bug fix? | kinda (see linked tickets)
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #8915 , #9185
| License | MIT
| Doc PR | n/a
/cc @kriswallsmith
Commits
-------
4f3d502
[FrameworkBundle] removed some more dependencies on the request service
2013-12-31 09:04:52 +01:00
Fabien Potencier
4f3d502d6e
[FrameworkBundle] removed some more dependencies on the request service
2013-12-29 19:26:53 +01:00
Hugo Hamon
9c2ce49d92
[FrameworkBundle] use the new request_stack object in the GlobalVariables object
2013-11-20 13:37:49 +01:00
Fabien Potencier
61dd06ea27
fixed CS
2013-10-30 09:30:20 +01:00
Hugo Hamon
eced94b7b9
Removed dead code (unused use statements).
2013-10-16 13:59:56 +02:00
Fabien Potencier
02791be0e6
Revert "fixed a test"
...
This reverts commit 8bee6883b6
.
2013-10-10 08:05:16 +02:00
Fabien Potencier
8bee6883b6
fixed a test
2013-10-09 09:29:29 +02:00
Bernhard Schussek
d4bb5f4e3c
[Security\Csrf] Split CsrfTokenGenerator into CsrfTokenManager and TokenGenerator
2013-10-07 14:50:43 +02:00
Fabien Potencier
abb765f135
minor #8927 [Templating] fix logic regarding template references and many phpdocs (Tobion)
...
This PR was squashed before being merged into the master branch (closes #8927 ).
Discussion
----------
[Templating] fix logic regarding template references and many phpdocs
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets |
| License | MIT
this clarifies the expected types and exceptions by much. and it fixes some logic flaws.
- missing info/methods in interfaces
- respecting Twig_LoaderInterface only accepting strings, not objects
related to fabpot/Twig#1183 but does not depend on it
Commits
-------
f6c12bd
[Templating] fix logic regarding template references and many phpdocs
2013-10-01 14:37:06 +02:00
Tobias Schultze
f6c12bd6de
[Templating] fix logic regarding template references and many phpdocs
2013-10-01 14:37:05 +02:00
Bernhard Schussek
2048cf6d35
[Form] Deprecated the CSRF implementation and added an optional dependency to the Security CSRF sub-component instead
2013-09-27 10:12:40 +02:00
WouterJ
3ee2989287
Added Stopwatch Helper
2013-09-11 22:40:31 +02:00
Fabien Potencier
de50621e8a
removed deps checks in unit tests
...
As Composer is now widely used in the PHP world, having to run composer
install before running the test suite is expected. This also has the
nice benefit of removing a bunch of code, making things easier to
maintain (there is only one place to declare a dev dependency), and
probably more.
2013-08-19 22:44:22 +02:00
Fabien Potencier
99f97e59f1
Merge branch '2.3'
...
* 2.3:
Update JsonResponse.php
[HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124 )
CookieJar remove unneeded var, Client remove unneeded else
[DI] Fixed bug requesting non existing service from dumped frozen container
Update validators.sk.xlf
[WebProfiler] fix content-type parameter
Replace romaji period characters with Japanese style zenkaku period characters
fixed CS
fixed CS
[Console] Avoided an unnecessary check.
Added missing French validator translations
typo first->second
Passed the config when building the Configuration in ConfigurableExtension
removed unused code
Fixed variable name used in translation cache
Conflicts:
src/Symfony/Component/Console/Event/ConsoleCommandEvent.php
2013-07-08 15:37:01 +02:00
Fabien Potencier
4c0bfd3313
fixed CS
2013-07-01 14:24:43 +02:00
Jakub Zalas
a54cbfffc3
[FrameworkBundle] Made DelegatingEngine::getEngine() public.
2013-06-14 13:55:39 +01:00
Jakub Zalas
0a72a995ba
[FrameworkBundle] Added tests for the DelegatingEngine.
2013-06-14 13:42:13 +01:00
Bernhard Schussek
81f8c67566
[Form] Implemented form processors
2013-04-18 11:02:51 +02:00
Jakub Zalas
2170dcb58e
[FrameworkBundle] Added a missing test for TimedPhpEngine.
2013-04-17 22:32:28 +01:00
Dariusz Górecki
7c47e34928
[CS Fix] Consistent coding-style of concatenation operator usage
2013-04-02 10:39:57 +01:00
Colin Frei
ebcb432f07
[Form] [FrameworkBundle] catch deprecation errors in tests
2012-12-14 23:16:06 +01:00
Fabien Potencier
56fe8d1ffd
duplicated the code helper code to the Twig bundle
...
The code has been duplicated and not moved for BC reasons.
This code has been duplicated in the Twig bundle to be able to decouple
the web profiler and the exception templates.
2012-11-12 15:07:56 +01:00
Bernhard Schussek
b982883a85
[Form] Moved FormHelper back to FrameworkBundle
2012-07-31 16:35:46 +02:00
Bernhard Schussek
87ccb6adb9
[Form] Added entry point "Forms" for more convenient usage outside of Symfony
2012-07-30 11:41:38 +02:00
Fabien Potencier
4bafd1d788
[FrameworkBundle] removed temporary XDebug hack as the nesting issue has been resolved now
2012-07-22 10:02:56 +02:00
Bernhard Schussek
dc3a680cd3
[Form] Improved FormRenderer API to reduce the size of the function call stack during rendering
2012-07-22 09:29:35 +02:00
Fabien Potencier
f6815be7f2
[FrameworkBundle] raised the max nesting level for XDebug for tests to pass
2012-07-18 10:19:41 +02:00
Bernhard Schussek
629093ed25
[Form] Extracted common parts of FormHelper and FormExtension into separate classes
2012-07-16 21:39:27 +02:00
Bernhard Schussek
69e5e58629
[Form] Individual rows of CollectionType cannot be styled anymore for performance reasons
2012-07-14 12:10:29 +02:00
Fabien Potencier
878e86db8a
added global variables access in a form theme ( closes #3058 )
2012-07-10 11:44:08 +02:00
Fabien Potencier
d100ffaf76
fixed CS
2012-07-09 14:54:20 +02:00
Victor Berchet
aef7663676
[FrameworkBundle] Create a dedicated template filename parser
2012-07-03 14:58:30 +02:00
Fabien Potencier
741927baf3
[FrameworkBundle] removed unneeded start call
2012-06-30 09:42:40 +02:00
Drak
1fd66f3cdf
[FrameworkBundle] Remove 'auto_start' configuration parameter.
2012-06-29 17:34:28 +01:00
Bernhard Schussek
2e6cdd15c5
[Form] Inverted the logic of "single_control" and renamed it to "compound". The opposite is now "simple".
2012-05-25 12:34:16 +02:00
Bernhard Schussek
d3bb4d085c
[Form] Renamed option 'primitive' to 'single_control'
2012-04-27 10:18:25 +02:00
Bernhard Schussek
eb75ab1b74
[Form] Fixed results of the FieldType+FormType merge.
2012-04-27 09:47:16 +02:00
Bernhard Schussek
fcb2227ac9
[Form] Deprecated FieldType, which has been merged into FormType
2012-04-17 16:44:39 +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
Drak
84c2e3caf7
[HttpFoundation] Allow flash messages to have multiple messages per type.
2012-03-15 11:55:52 +05:45