Fabien Potencier
2ba7e4207c
Merge remote branch 'craue/patch-4'
...
* craue/patch-4:
typo
2011-06-13 11:09:38 +02:00
Kris Wallsmith
a3ed5e3f84
[AsseticBundle] changed file resource string value to logical template name
2011-06-12 19:12:22 -07:00
Lee McDermott
49dd558444
Couple more CS fixes
2011-06-13 02:40:21 +01:00
Michael Schneider
fdab1955f8
Fix array access
...
If you provide only one field as string you're not able to access the $constraint->fields as an array. Use $fields instead.
2011-06-12 23:48:17 +02:00
Pascal Borreli
f5eaa404c7
[Tests] Fixed typos
2011-06-12 20:52:53 +00:00
Christian Raue
99eb3a120d
typo
2011-06-12 11:59:47 -07:00
Victor Berchet
dbea68effc
[FrameworkBundle] Fix previous commit
2011-06-12 18:37:54 +02:00
Victor Berchet
acd2cf11d8
[TwigBundle] Optimize the FilesystemLoader
2011-06-12 14:49:18 +02:00
Victor Berchet
b19052f879
[Form][TwigBridge] Improve the cache layer by caching blocks instead of templates
2011-06-12 12:56:25 +02:00
Victor Berchet
9135f963db
[Form][TwigBridge] Make the template cache more efficient
2011-06-12 12:15:48 +02:00
Victor Berchet
8677aa3dce
[Form][TwigBridge] Fix rendering
2011-06-12 11:33:17 +02:00
Peter Zwosta
c0e120e072
[AsseticBundle] fixed ScopeWideningInjectionExc in prod evn using php templates
...
The definition "assetic.helper.static" references the service "templating.helper.assets" which belongs to a narrower scope. Generally, it is safer to either move "assetic.helper.static" to scope "request" or alternatively rely on the provider pattern by injecting the container itself, and requesting the service "templating.helper.assets" each time it is needed. In rare, special cases however that might not be necessary, then you can set the reference to strict=false to get rid of this error.
2011-06-11 19:49:13 +02:00
Kris Wallsmith
5b0f1da074
[HttpKernel] made WebTestCase methods static
2011-06-11 08:50:27 -07:00
Lee McDermott
5a986bfc27
Add $keysCount & minor CS fix
2011-06-11 16:43:28 +01:00
Lee McDermott
91f4097a09
[Routing] Better nesting for RouteCollections in dumped URL matcher classes
...
With this change, a route prefixed with '/blogger' will be nested inside '/blog' (for example)
2011-06-11 16:11:55 +01:00
Fabien Potencier
f1e8c1bce5
fixed autoloader
2011-06-11 13:58:27 +02:00
Alexander
07d823caa8
[HttpKernel] Added tests for non UTF-8 content types.
...
Tests to check that #1281 is fixed and to prevent regression in the
future.
2011-06-11 13:57:43 +02:00
Brikou CARRE
66ae994528
[Form] added phpdoc (inherit) for types
2011-06-11 11:59:28 +02:00
Brikou CARRE
3dff029c37
[Session] added phpdoc about flash messages
2011-06-11 11:44:30 +02:00
Aurélien Fredouelle
6ae2bdeabd
[HttpFoundation] Fixed indentation
2011-06-11 10:24:44 +02:00
Aurélien Fredouelle
1e50a553d2
[HttpFoundation] Fixed charset always being set to UTF-8
...
Fixes #1281
2011-06-11 10:22:26 +02:00
Joseph Bielawski
6bb9075b35
Remove unused code from DateTime constraint
2011-06-11 01:18:16 -07:00
Fabien Potencier
f5de854d69
fixed autoloading for tests
2011-06-11 09:20:01 +02:00
Fabien Potencier
ca013311bd
[TwigBundle] fixed XSD
2011-06-11 08:00:55 +02:00
Fabien Potencier
355f802546
[TwigBundle] fixed tests
2011-06-11 07:54:10 +02:00
Fabien Potencier
96045739b1
[TwigBundle] removed the extensions setting
2011-06-11 07:50:14 +02:00
Fabien Potencier
afa30d9864
Merge remote branch 'theinterned/patch-1'
...
* theinterned/patch-1:
made logoutPath localizable as well
storing localized targetPath in a string as opposed to updating the attribute
In the spirit of 882a8e3f09
allow for localized logout target url
2011-06-11 07:39:04 +02:00
Fabien Potencier
c79e51c9aa
Merge remote branch 'kriswallsmith/form/lazier-csrf-token'
...
* kriswallsmith/form/lazier-csrf-token:
[Form] fixed xpath
[Form] moved csrf listener to its own class
fix issue with csrf token not present on collection fields because of resize listener
2011-06-11 07:36:51 +02:00
Fabien Potencier
8d58826085
[Routing] fixed unit tests for previous commit
2011-06-11 07:33:55 +02:00
Fabien Potencier
96554e645a
Merge remote branch 'lmcd/master'
...
* lmcd/master:
$code referenced but not defined in compileRoute()
[Routing] Optimised the PHP URL matcher dumper The cached URL matcher classes contain some unneeded logic. Consider the following example:
2011-06-11 07:32:22 +02:00
Lee McDermott
2c0efa7488
$code referenced but not defined in compileRoute()
2011-06-11 04:38:11 +01:00
Lee McDermott
10bb4ff25e
[Routing] Optimised the PHP URL matcher dumper
...
The cached URL matcher classes contain some unneeded logic. Consider the following example:
if (0 === strpos($pathinfo, '/Blog')) {
// blog_index
if (0 === strpos($pathinfo, '/Blog') && preg_match('#^/Blog/(?P<slug>[^/]+?)$#x', $pathinfo, $matches)) {
return array_merge($this->mergeDefaults($matches, array ( '_action' => 'index',)), array('_route' => 'blog_index'));
}
}
The 2nd strpos is not required, as we have already satisfied this condition in the parent if statement.
My change will produce the following code for the same routing setup::
if (0 === strpos($pathinfo, '/Blog')) {
// blog_index
if (preg_match('#^/Blog/(?P<slug>[^/]+?)$#x', $pathinfo, $matches)) {
return array_merge($this->mergeDefaults($matches, array ( '_action' => 'index',)), array('_route' => 'blog_index'));
}
}
2011-06-11 01:20:22 +01:00
Ned Schwartz
47df88bfc9
made logoutPath localizable as well
2011-06-10 15:04:50 -07:00
Ned Schwartz
8fd4158468
storing localized targetPath in a string as opposed to updating the attribute
2011-06-10 14:32:10 -07:00
Kris Wallsmith
d26c590021
[Form] fixed xpath
2011-06-10 13:18:09 -07:00
Kris Wallsmith
fe4382eb73
[Form] moved csrf listener to its own class
2011-06-10 13:00:44 -07:00
Ned Schwartz
17b7b558ce
In the spirit of 882a8e3f09
allow for localized logout target url
2011-06-10 12:24:27 -07:00
Bulat Shakirzyanov
cb53414e91
fix issue with csrf token not present on collection fields because of resize listener
2011-06-10 11:12:35 -07:00
Fabien Potencier
2e5ed78095
Merge remote branch 'mridgway/vendorScriptSpaces'
...
* mridgway/vendorScriptSpaces:
Adding more escapes to shell params
Using escapeshellarg() instead of quotes
2011-06-10 19:52:18 +02:00
Fabien Potencier
d67e25c003
Merge remote branch 'richardmiller/fixed_container_debug_command_help'
...
* richardmiller/fixed_container_debug_command_help:
[FrameworkBundle] Added missing word to ContainerDebugCommand help message.
2011-06-10 19:50:58 +02:00
Fabien Potencier
f857ad2a31
Merge remote branch 'stof/monolog_bubbling'
...
* stof/monolog_bubbling:
[MonologBundle] Changed the default bubbling behavior. Fixes #1268
2011-06-10 19:49:41 +02:00
Christophe Coevoet
5458baf465
[MonologBundle] Changed the default bubbling behavior. Fixes #1268
2011-06-10 19:44:10 +02:00
Fabien Potencier
293ba3426a
[DoctrineBridge] fixed guesser
2011-06-10 19:41:49 +02:00
Richard Miller
346cbf352a
[FrameworkBundle] Added missing word to ContainerDebugCommand help message.
2011-06-10 17:56:06 +01:00
djama
96359fb86d
call header() with replace=false, to provide the possibility of sending mutiple headers of the same type.
2011-06-10 09:16:33 -07:00
Michael Ridgway
9fb8b20739
Adding more escapes to shell params
2011-06-10 11:57:54 -04:00
Michael Ridgway
7b02384fb2
Using escapeshellarg() instead of quotes
2011-06-10 10:56:22 -04:00
Fabien Potencier
ce8d6d06e2
Merge remote branch 'mridgway/vendorScriptSpaces'
...
* mridgway/vendorScriptSpaces:
Added quotes around a directory path that was missed in previous commit
2011-06-10 16:33:11 +02:00
Fabien Potencier
4da7909f9a
Merge remote branch 'kriswallsmith/form/is-valid-read-only'
...
* kriswallsmith/form/is-valid-read-only:
[Form] fixed isValid() on readOnly forms that have children
2011-06-10 16:32:50 +02:00
Michael Ridgway
0b7321af78
Added quotes around a directory path that was missed in previous commit
2011-06-10 10:28:36 -04:00