Fabien Potencier
56a4f0463a
Merge remote branch 'vicb/fix-dbg-evt-mgr'
...
* vicb/fix-dbg-evt-mgr:
[FrameworkBundle] Fix an issue when adding a scoped service as an event listener
2011-04-13 23:24:04 +02:00
Fabien Potencier
d2af468b60
Merge remote branch 'francisbesset/webprofiler_session'
...
* francisbesset/webprofiler_session:
[WebProfilerBundle] Displayed search form even if the session is not configured
[WebProfilerBundle] Cleaned controller
[WebProfilerBundle] Fixed errors on search action
[WebProfilerBundle] Fixed WebDebugToolbarListener
[WebProfilerBundle] Updated return Response
[WebProfilerBundle] Fixed errors if the session is not configured
2011-04-13 23:20:40 +02:00
Fabien Potencier
b32a7e935a
simplified code
2011-04-13 23:18:28 +02:00
Fabien Potencier
ea84bb025b
fixed session management in functional tests
2011-04-13 23:11:25 +02:00
Victor Berchet
3322cdbefc
[FrameworkBundle] Fix an issue when adding a scoped service as an event listener
2011-04-13 23:08:08 +02:00
Fabien Potencier
6957dae4f9
[HttpKernel] added support for cookies in Client
2011-04-13 20:25:35 +02:00
Francis Besset
79cfea20fd
[WebProfilerBundle] Displayed search form even if the session is not configured
2011-04-13 20:17:51 +02:00
Fabien Potencier
e2c9fdf2c7
[HttpFoundation] fixed expiration time for Cookie (PHP wants a Unix timestamp)
2011-04-13 20:12:14 +02:00
Fabien Potencier
66c4bc727c
[HttpFoundation] renamed Cookie::getExpire() to getExpiresTime() to be consistent with the DomCrawler component
2011-04-13 20:10:39 +02:00
Fabien Potencier
84dde4074a
[HttpFoundation] changed default value of Cookie httponly argument to match PHP defaults
2011-04-13 20:07:31 +02:00
Francis Besset
88c35c42e2
[WebProfilerBundle] Cleaned controller
2011-04-13 19:53:57 +02:00
Francis Besset
190ba5979c
[WebProfilerBundle] Fixed errors on search action
2011-04-13 19:53:57 +02:00
Francis Besset
0d9fb8db5f
[WebProfilerBundle] Fixed WebDebugToolbarListener
2011-04-13 19:53:57 +02:00
Francis Besset
713d3405b7
[WebProfilerBundle] Updated return Response
2011-04-13 19:53:57 +02:00
Francis Besset
81939136ad
[WebProfilerBundle] Fixed errors if the session is not configured
2011-04-13 19:53:57 +02:00
Henrik Bjørnskov
3fb0f20f9a
[DoctrineMongoDBBundle] Fixed unit tests for hydrator_dir and proxy_dir
2011-04-13 18:15:11 +02:00
hhamon
053d83f557
[HttpFoundation] force Response to be "public" if setSharedMaxAge() is called.
2011-04-13 15:58:48 +02:00
Bernhard Schussek
8031ad77c8
Merge remote branch 'fabpot/form' into fabpot_merge
2011-04-13 15:58:15 +02:00
Kris Wallsmith
672291087c
removed a lot of special normalization logic in the configuration by using xml values instead of attributes
2011-04-13 05:59:46 -07:00
Fabien Potencier
a6d790f89f
Merge remote branch 'hhamon/http_cache_fix'
...
* hhamon/http_cache_fix:
[HttpKernel] private $traces property was not initialized to an empty array. When using the getLog() method to debug traces, it led to a warning in the apache error log.
2011-04-13 14:38:32 +02:00
Fabien Potencier
fa6961bb91
Revert "Merge remote branch 'lsmith77/prevent_redundant_DI_method_calls'"
...
This reverts commit 0d61ae06b4
, reversing
changes made to 8e3d125902
.
2011-04-13 14:30:06 +02:00
Fabien Potencier
227c87404f
Merge remote branch 'Funsational/master'
...
* Funsational/master:
Update PDO session storage to check if any rows are updated when doing a session write. If no rows are udpated when performing a session write it generally means that we have created a new session id somewhere and we have not inserted into the database. This is the case for when calling regenerate_session_id() from the native session storage class. It will update the session id then call sessionWrite() to save the session but since the new session id does not exist in the DB, no rows are updated and any new session attributes such as security tokens are lost.
2011-04-13 14:27:16 +02:00
hhamon
facb67cbfa
[HttpKernel] private $traces property was not initialized to an empty array. When using the getLog() method to debug traces, it led to a warning in the apache error log.
2011-04-13 14:24:53 +02:00
Fabien Potencier
3d093c161b
Merge remote branch 'kriswallsmith/assetic/config-tweak'
...
* kriswallsmith/assetic/config-tweak:
[AsseticBundle] updated bundle node to match others, cleaned up validation
2011-04-13 14:21:21 +02:00
Fabien Potencier
9162e4c760
Merge remote branch 'weaverryan/controller_not_found_exception'
...
* weaverryan/controller_not_found_exception:
[FrameworkBundle] Adding a shortcut method to the controller for throwing the NotFoundHttpException
2011-04-13 14:20:37 +02:00
Fabien Potencier
0d61ae06b4
Merge remote branch 'lsmith77/prevent_redundant_DI_method_calls'
...
* lsmith77/prevent_redundant_DI_method_calls:
do not add method calls from interface injection if a method call has already been set manually
2011-04-13 14:16:14 +02:00
Kris Wallsmith
bfb0f094f4
[AsseticBundle] updated bundle node to match others, cleaned up validation
2011-04-13 05:13:04 -07:00
Lukas Kahwe Smith
c9be18a79f
do not add method calls from interface injection if a method call has already been set manually
2011-04-13 14:11:56 +02:00
Fabien Potencier
8e3d125902
fixed CS
2011-04-13 14:07:54 +02:00
Fabien Potencier
4e047b5e27
Merge remote branch 'vicb/event_debug'
...
* vicb/event_debug:
[FrameworkBundle] Make some TraceableEventDispacther properties private
[Event] Tweak phpDoc for consistency
[FrameworkBundle] Add error detection to the TraceableEventDispatcher
2011-04-13 14:07:05 +02:00
Fabien Potencier
816759bc27
added missing info when upgrading to PR11
2011-04-13 14:03:09 +02:00
Bernhard Schussek
0b0535d30a
[Form] Fixed fatal error in test
2011-04-13 14:01:25 +02:00
George Giannoulopoulos
81e1d4f11d
Refactoring, replace is_null() wuth null ===
2011-04-13 13:56:15 +02:00
Bernhard Schussek
2a18be1c9f
Merge remote branch 'symfony/master' into experimental
2011-04-13 13:53:20 +02:00
Fabien Potencier
6c8e4a567c
Merge remote branch 'francisbesset/translator_validators_fr'
...
* francisbesset/translator_validators_fr:
[FrameworkBundle] Fixed validators translation french message
2011-04-13 13:49:27 +02:00
Fabien Potencier
9c80e7bcc4
Merge remote branch 'hason/twigtrans'
...
* hason/twigtrans:
[Bridge][Twig] improved behaviour of the transchoice tag (support for variables)
[Bridge][Twig] added transchoice filter
2011-04-13 13:48:20 +02:00
Fabien Potencier
d46732bb48
Merge remote branch 'schmittjoh/addMissingInterface'
...
* schmittjoh/addMissingInterface:
[FrameworkBundle] added ContainerAwareInterface to services.xml
2011-04-13 13:44:57 +02:00
Fabien Potencier
0c93b6bbe4
Merge remote branch 'vicb/locate_template2'
...
* vicb/locate_template2:
[FrameworkBundle] Enforce templates instances of TemplateReferenceInterface
[FrameworkBundle] Add unit tests for the CacheTemplateLocator class
[FrameworkBundle] Add unit tests for the TemplateLocator class
[TwigBundle] Fix the cache warmer
[TwigBundle] Tweak cache warmer configuration
[FrameworkBundle] Fix resource inheritance in the template cache warmer
2011-04-13 13:38:11 +02:00
Fabien Potencier
7913d7978e
[Form] removed DefaultFormFactory as it does not help that much and adds some confusion
2011-04-13 13:24:56 +02:00
Fabien Potencier
92f77cce97
Merge remote branch 'lsmith77/ResolveInvalidReferencesPass'
...
* lsmith77/ResolveInvalidReferencesPass:
updated tests (aka removed exceptions handling)
use synthetic services instead of special exceptions
2011-04-13 11:46:52 +02:00
Lukas Kahwe Smith
0e572c241f
updated tests (aka removed exceptions handling)
2011-04-13 11:36:42 +02:00
Fabien Potencier
49dc836521
[Form] moved the template context creation to the Form class
...
Moving the template context creation makes sense and allows for simpler code for the end user:
Before:
return array('post' => $post, 'form' => $this->get('form.factory')->createTemplateContext($form));
After:
return array('post' => $post, 'form' => $form->getContext());
2011-04-13 09:31:13 +02:00
Fabien Potencier
78bb9b4c08
Merge remote branch 'hidenorigoto/translate-UPDATE-file-10to11'
...
* hidenorigoto/translate-UPDATE-file-10to11:
translated UPDATE.ja.md file (PR10 to PR11)
2011-04-13 09:20:00 +02:00
Fabien Potencier
94eed37a93
Merge remote branch 'schmittjoh/parameterBagEnhancement'
...
* schmittjoh/parameterBagEnhancement:
[HttpFoundation] added some unit tests
[HttpFoundation] allow to retrieve paths of arbitrary depths
2011-04-13 07:58:14 +02:00
Johannes Schmitt
2397bcbe94
[DependencyInjection] better logging
2011-04-13 00:51:32 +02:00
hidenorigoto
562647c499
translated UPDATE.ja.md file (PR10 to PR11)
2011-04-13 06:23:46 +09:00
Fabien Potencier
d873f21f69
[FrameworkBundle] removed links in exceptions when the file does not exist (mostly useful because of shortcut notations for templates)
2011-04-12 15:23:02 +02:00
Fabien Potencier
b68624aa7f
[FrameworkBundle] tweaked regexp
2011-04-12 15:19:57 +02:00
Johannes M. Schmitt
61dba2dd34
[FrameworkBundle] added ContainerAwareInterface to services.xml
2011-04-12 15:10:15 +02:00
Fabien Potencier
d95a743d9f
Merge remote branch 'Brouznouf/master'
...
* Brouznouf/master:
[Serializer] Revert DOMElement to SimpleXmlElement
[Serializer] Using DOMElement instead of SimpleXmlElement in XmlEncoder to permit some behavior
2011-04-12 13:02:35 +02:00