Commit Graph

3767 Commits

Author SHA1 Message Date
Fabien Potencier
9a2d4c77c3 Merge remote branch 'Garfield-fr/master'
* Garfield-fr/master:
  [Container] Added function array_unique on getServiceIds to return only one service name
2011-04-21 18:31:55 +02:00
Fabien Potencier
7e33159723 [Routing] the global parameters must not be added in the QS when generating URLs 2011-04-21 09:52:35 +02:00
Fabien Potencier
286c45733e removed the possibility to pass a message to the trans tag
The trans tag should only be used with static texts as automatic output escaping does not occur.
2011-04-21 09:10:47 +02:00
Fabien Potencier
cad6643e77 simplified exceptions as Twig is now smart enough to automatically add line information 2011-04-21 09:03:30 +02:00
Fabien Potencier
54b77d24dd made the %count% variable automatically available when using the transchoice filter (similar to how the tag works) 2011-04-21 09:01:11 +02:00
Bertrand Zuchuat
7ed8ea25d8 [Container] Added function array_unique on getServiceIds to return only one service name 2011-04-20 23:45:36 +02:00
Fabien Potencier
ea021062ba Merge remote branch 'vicb/assetic-cache-warmer'
* vicb/assetic-cache-warmer:
  [AsseticBundle] Update the cache warmer tests
  [AsseticBundle] Fix the cache warmers
2011-04-20 23:31:40 +02:00
Victor Berchet
f7b1839296 [AsseticBundle] Update the cache warmer tests 2011-04-20 23:28:19 +02:00
Fabien Potencier
071caeb0c8 Merge remote branch 'merk/file'
* merk/file:
  [HttpFoundation\File] Removed realpath()
2011-04-20 23:13:55 +02:00
Fabien Potencier
9c2d49e4f5 Merge remote branch 'weaverryan/fixtures_old_xml_namespace'
* weaverryan/fixtures_old_xml_namespace:
  [FrameworkBundle] Upating XML test fixtures for newer namespace
2011-04-20 23:13:20 +02:00
Fabien Potencier
d721cbe1e2 Merge remote branch 'kriswallsmith/http/filesystem-session-fix'
* kriswallsmith/http/filesystem-session-fix:
  [HttpFoundation] fixed FilesystemSessionStorage
2011-04-20 23:09:04 +02:00
Ryan Weaver
a5aba7dbd7 [FrameworkBundle] Upating XML test fixtures for newer namespace
This wasn't actually affecting anything (which is why it wasn't caught), but this is more correct.
2011-04-20 16:08:55 -05:00
Fabien Potencier
ace5e26406 Merge remote branch 'schmittjoh/security'
* schmittjoh/security:
  [Security/Core] force implementations to accept null values
  [Security/Acl] some misc fixes
  [Security/Acl] removed Doctrine dependency from interfaces and moved them to the actual implementation
  [SecurityBundle] changed expected value for token_provider key in the rememberme section
2011-04-20 23:07:33 +02:00
Fabien Potencier
7266b41ade [FrameworkBundle] added the current locale as the default value for _locale when generating routes 2011-04-20 23:03:01 +02:00
Fabien Potencier
c6dcf0f8f3 [Routing] added a way to set default parameters that are applied when generating URLs 2011-04-20 23:01:05 +02:00
Fabien Potencier
f7d44148df [Routing] removed unused defaults variable 2011-04-20 22:55:23 +02:00
Johannes Schmitt
192592ec9b [Security/Core] force implementations to accept null values 2011-04-20 22:38:16 +02:00
Johannes Schmitt
f697fe3b26 [Security/Acl] some misc fixes 2011-04-20 22:35:17 +02:00
Johannes Schmitt
4d6e239f10 [Security/Acl] removed Doctrine dependency from interfaces and moved them to the actual implementation 2011-04-20 22:25:05 +02:00
Johannes Schmitt
8ae7a21e30 [SecurityBundle] changed expected value for token_provider key in the rememberme section 2011-04-20 22:20:55 +02:00
Kris Wallsmith
30511d2965 [HttpFoundation] fixed FilesystemSessionStorage 2011-04-20 13:20:21 -07:00
Victor Berchet
1191e3aa66 [AsseticBundle] Fix the cache warmers 2011-04-20 17:37:21 +02:00
Fabien Potencier
fd1636b324 [Routing] added RedirectableUrlMatcher 2011-04-20 15:54:48 +02:00
Tim Nagel
03bb3580a6 [HttpFoundation\File] Removed realpath() 2011-04-20 23:52:17 +10:00
Fabien Potencier
1df8b2ee37 [FrameworkBundle] fixed methods that have been renamed in the previous commit 2011-04-20 14:31:42 +02:00
Fabien Potencier
9d2ea4ec31 Merge remote branch 'kriswallsmith/dic/method-renames'
* kriswallsmith/dic/method-renames:
  added method renames to UPDATE
  [DependencyInjection] renamed ContainerBuilder::remove() as removeDefinition() to be more consistent with other definition-related methods
  [DependencyInjection] renamed Definition::setArgument() as replaceArgument() to be more specific
2011-04-20 14:28:09 +02:00
Fabien Potencier
477d81f9b1 Merge remote branch 'vicb/service-event-tests'
* vicb/service-event-tests:
  [FrameworkBundle] Added a test for listener services not available in the current scope
  [FrameworkBundle] Add unit tests for ContainerAwareEventDispatcher
  [FrameworkBundle] Initialize the listenerId property in the ContainerAwareEventDispatcher class
2011-04-20 14:25:55 +02:00
Fabien Potencier
0dbfa18c46 [Routing] made a small optimization to the route dumper 2011-04-20 14:19:33 +02:00
Fabien Potencier
117321d3c6 replaced array for request context in Routing by a RequestContext class 2011-04-20 14:19:32 +02:00
Kris Wallsmith
022728fda5 added method renames to UPDATE 2011-04-20 04:48:32 -07:00
Kris Wallsmith
470baaab9f [DependencyInjection] renamed ContainerBuilder::remove() as removeDefinition() to be more consistent with other definition-related methods 2011-04-20 04:48:19 -07:00
Kris Wallsmith
cdf706d357 [DependencyInjection] renamed Definition::setArgument() as replaceArgument() to be more specific 2011-04-20 04:47:44 -07:00
Fabien Potencier
07aae98495 [Routing] added support for _scheme requirement
The _scheme requirement can be used to force routes to always match one given scheme
and to always be generated with the given scheme.

So, if _scheme is set to https, URL generation will force an absolute URL if the
current scheme is http. And if you request the URL with http, you will be redirected
to the https URL.
2011-04-20 10:49:32 +02:00
Fabien Potencier
d993a9160a [HttpFoundation] fixed getScheme() method 2011-04-20 10:49:08 +02:00
Victor Berchet
b4df0ea9ed [FrameworkBundle] Added a test for listener services not available in the current scope 2011-04-20 09:56:44 +02:00
Victor Berchet
a4c41179e0 [FrameworkBundle] Add unit tests for ContainerAwareEventDispatcher 2011-04-20 09:51:38 +02:00
Victor Berchet
b45d117fbf [FrameworkBundle] Initialize the listenerId property in the ContainerAwareEventDispatcher class 2011-04-20 09:51:32 +02:00
Fabien Potencier
eca195c8fe Merge remote branch 'weaverryan/container_debug_simplification'
* weaverryan/container_debug_simplification:
  [FrameworkBundle] Removing unnecessary and buggy functionality from ContainerDebugCommand
2011-04-20 09:18:47 +02:00
Ryan Weaver
6f16820328 [FrameworkBundle] Removing unnecessary and buggy functionality from ContainerDebugCommand 2011-04-19 17:01:22 -05:00
Fabien Potencier
7c54518626 [Routing] refactored some unit tests 2011-04-19 23:21:22 +02:00
Fabien Potencier
91602dfef4 [FrameworkBundle] made possible to interact with the Kernel/Container after a request in functional tests 2011-04-19 22:55:39 +02:00
Fabien Potencier
ba37ea19c6 Merge remote branch 'kriswallsmith/mongodb/validator-annot-alias'
* kriswallsmith/mongodb/validator-annot-alias:
  [DoctrineMongoDBBundle] set annotation constraint namespace alias to assertMongoDB
2011-04-19 19:14:21 +02:00
Fabien Potencier
86be93fbfd Merge remote branch 'kriswallsmith/assetic/use-controller-fix'
* kriswallsmith/assetic/use-controller-fix:
  [AsseticBundle] added factory worker to fix paths when use_controller is on
2011-04-19 19:14:17 +02:00
Kris Wallsmith
5a9a65701b [AsseticBundle] added factory worker to fix paths when use_controller is on 2011-04-19 07:58:04 -07:00
Kris Wallsmith
defb0218fb [DoctrineMongoDBBundle] set annotation constraint namespace alias to assertMongoDB 2011-04-19 07:46:28 -07:00
Fabien Potencier
4724af10f6 [DoctrineMongoDbBundle] fixed data:load command (--append does not need a value) 2011-04-19 15:36:40 +02:00
Fabien Potencier
561a2211af Merge remote branch 'krymen/fixtures_command'
* krymen/fixtures_command:
  [DoctrineBundle] Fix data:load command (--append w/o value)
2011-04-19 15:33:42 +02:00
Fabien Potencier
eb5337ba5e Merge remote branch 'hidenorigoto/translate-UPDATE-file-11to12'
* hidenorigoto/translate-UPDATE-file-11to12:
  updated translation UPDATE.ja file (vPR11 to vPR12)
2011-04-19 15:32:36 +02:00
Fabien Potencier
06c331d049 fixed typo 2011-04-19 15:26:51 +02:00
hidenorigoto
1a07ded639 updated translation UPDATE.ja file (vPR11 to vPR12) 2011-04-19 22:10:11 +09:00