Commit Graph

3689 Commits

Author SHA1 Message Date
Fabien Potencier
ea1a16b99f Merge remote branch 'henrikbjorn/doctrine-mongodb-hydrator-dir'
* henrikbjorn/doctrine-mongodb-hydrator-dir:
  [DoctrineMongoDBBundle] Fixed unit tests for hydrator_dir and proxy_dir
  [DoctrineMongoDBBundle] Made hydrator_dir and proxy_dir configurable. Moved default values for the params to Configuration class
2011-04-13 23:32:32 +02:00
Fabien Potencier
5316decd8c Merge remote branch 'hhamon/shared_maxage_fix'
* hhamon/shared_maxage_fix:
  [HttpFoundation] force Response to be "public" if setSharedMaxAge() is called.
2011-04-13 23:24:31 +02:00
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
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
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
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
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
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
Fabien Potencier
55a8f8d098 extracted common layout for internal/core pages
CSS styles should probably be renamed at some point.
2011-04-12 12:32:59 +02:00
Fabien Potencier
e6fd8deb00 [Security] tweaked some exception messages 2011-04-12 11:41:39 +02:00
Brouznouf
86343b43ec [Serializer] Revert DOMElement to SimpleXmlElement 2011-04-12 11:18:17 +02:00
Brouznouf
b02c1d9f32 Merge remote branch 'upstream/master' 2011-04-12 11:17:09 +02:00
Martin Hason
d39ea6ae79 [Bridge][Twig] improved behaviour of the transchoice tag (support for variables) 2011-04-12 11:15:19 +02:00
Martin Hason
d300b94745 [Bridge][Twig] added transchoice filter 2011-04-12 11:10:55 +02:00
Fabien Potencier
41a1a75b92 [Process] made default options overridable 2011-04-12 11:04:35 +02:00
Fabien Potencier
7f911642e1 Merge remote branch 'pborreli/windows-process-fix'
* pborreli/windows-process-fix:
  [Process][Windows] Don't use cmd for launching process (fixing Sismo git.exe calling)
2011-04-12 11:04:02 +02:00
Fabien Potencier
57f814b2e3 Merge remote branch 'beberlei/YamlValidatorFix'
* beberlei/YamlValidatorFix:
  [FrameworkBundle][Validation] Fix bug where YAML Validation files are not detected.
2011-04-12 10:59:56 +02:00
Fabien Potencier
d163a60f54 [Security] fixed URL 2011-04-12 10:49:22 +02:00
Lukas Kahwe Smith
a4b04c4add use synthetic services instead of special exceptions 2011-04-12 10:07:46 +02:00
Pascal Borreli
3e8874df75 Merge remote-tracking branch 'upstream/master' into windows-process-fix 2011-04-12 01:05:46 +00:00
Brouznouf
8e6233e9c2 [Serializer] Using DOMElement instead of SimpleXmlElement in XmlEncoder to permit some behavior 2011-04-12 00:58:21 +02:00
Benjamin Eberlei
d27dc86c25 [FrameworkBundle][Validation] Fix bug where YAML Validation files are not detected. 2011-04-11 23:26:11 +02:00
Fabien Potencier
27d2b049f8 Merge remote branch 'Seldaek/init_bundle'
* Seldaek/init_bundle:
  [FrameworkBundle] Allow init:bundle to be called with / as namespace separator
2011-04-11 18:39:36 +02:00
Fabien Potencier
92c8edc2b5 Merge remote branch 'weaverryan/router_debug_format_tweak'
* weaverryan/router_debug_format_tweak:
  [FrameworkBundle] router:debug - better string dumping to avoid namespace escaping
2011-04-11 18:39:04 +02:00
Fabien Potencier
2be704e212 Merge remote branch 'weaverryan/request_listener_log_change'
* weaverryan/request_listener_log_change:
  [FrameworkBundle] Tweak to how the routing parameters are output
2011-04-11 18:38:39 +02:00
Fabien Potencier
78c5a0ac90 Merge remote branch 'weaverryan/assets_install_command_mods'
* weaverryan/assets_install_command_mods:
  [FrameworkBundle] Improving the output and help messages in the task (no behavioral change)
2011-04-11 18:37:00 +02:00
Fabien Potencier
aa26624161 Merge remote branch 'vicb/template_logical_name'
* vicb/template_logical_name:
  Display template logical names in exception messages
2011-04-11 18:35:51 +02:00
Kris Wallsmith
c5fe4c390d [Templating] cleaned up some anomalies in the engine 2011-04-11 09:20:47 -07:00
Fabien Potencier
7f2294395c [Form] reverted the templating part to be similar to what we have today 2011-04-11 16:42:51 +02:00
Francis Besset
b4d8091cdc [FrameworkBundle] Fixed validators translation french message 2011-04-10 19:02:03 +02:00
Jordi Boggiano
7d61c003da [FrameworkBundle] Allow init:bundle to be called with / as namespace separator 2011-04-10 12:22:25 +02:00
Ryan Weaver
409df12a36 [FrameworkBundle] router:debug - better string dumping to avoid namespace escaping
Before this change, the var_export causes namespaces to be escaped:

Before: 'Symfony\\Component\\...'
After:  Symfony\Component\...
2011-04-09 17:53:33 -05:00
Ryan Weaver
3e41bef1e8 [FrameworkBundle] Tweak to how the routing parameters are output
The json_encode is actually really nice, except that it results in the "escaped" namesapces (e.g. Symfony\\Component\\...).
2011-04-09 17:35:31 -05:00
Pascal Borreli
46b4098907 [Process][Windows] Don't use cmd for launching process (fixing Sismo git.exe calling) 2011-04-09 17:31:26 +00:00
Ryan Weaver
91df6d9f5c [FrameworkBundle] Improving the output and help messages in the task (no behavioral change) 2011-04-09 09:13:24 -05:00
Victor Berchet
e254ff8cc6 Display template logical names in exception messages 2011-04-08 19:56:12 +02:00
Victor Berchet
e80a693cfe [FrameworkBundle] Enforce templates instances of TemplateReferenceInterface 2011-04-08 18:54:19 +02:00
Victor Berchet
c45d5c89cc [FrameworkBundle] Add unit tests for the CacheTemplateLocator class 2011-04-08 18:54:19 +02:00
Victor Berchet
27a327e0de [FrameworkBundle] Add unit tests for the TemplateLocator class 2011-04-08 18:54:19 +02:00
Victor Berchet
87000a163b [TwigBundle] Fix the cache warmer 2011-04-08 18:54:19 +02:00
Victor Berchet
e1ab14ba08 [TwigBundle] Tweak cache warmer configuration 2011-04-08 18:54:19 +02:00
Victor Berchet
7cc51d8596 [FrameworkBundle] Fix resource inheritance in the template cache warmer 2011-04-08 18:54:19 +02:00
Fabien Potencier
d91a0747ec [WebProfilerBundle] fixed button names to be more consistent with others 2011-04-08 17:56:08 +02:00
Fabien Potencier
1e03ff0632 Merge remote branch 'schmittjoh/cssfix'
* schmittjoh/cssfix:
  [FrameworkBundle] made css rule a bit more conservative
2011-04-08 17:54:29 +02:00
Fabien Potencier
9ceec87eb8 [DomCrawler] fixed various bug with URIs 2011-04-08 17:52:43 +02:00
Johannes M. Schmitt
6408d5fc03 [FrameworkBundle] made css rule a bit more conservative 2011-04-08 17:49:56 +02:00
Fabien Potencier
a230090537 removed some json_encode() calls to use the new getLogicalName() method instead 2011-04-08 17:28:27 +02:00
Fabien Potencier
5558ee24c7 Merge remote branch 'hason/logicalname'
* hason/logicalname:
  [Templating] changed __toString method (synonym for getLogicalName method)
  [Templating] fixed phpdoc a test
  [FrameworkBundle] added getLogicalName() method to TemplateReference
  [Templating] added method to return the template logical name, added test
2011-04-08 17:22:11 +02:00
Fabien Potencier
7018335ae8 Merge remote branch 'stof/monolog'
* stof/monolog:
  [MonologBundle][BC break] Renamed the type to fingers_crossed and rotating_file
  [MonologBundle] Refactored the configuration to allow adding handlers
2011-04-08 16:56:56 +02:00
Martin Hason
185144bc46 [Templating] changed __toString method (synonym for getLogicalName method) 2011-04-08 11:33:35 +02:00
Martin Hason
20c5db2197 [Templating] fixed phpdoc a test 2011-04-08 11:24:28 +02:00
Martin Hason
6c4801945e [FrameworkBundle] added getLogicalName() method to TemplateReference 2011-04-08 10:32:46 +02:00
Martin Hason
6b5d991685 [Templating] added method to return the template logical name, added test 2011-04-08 10:31:47 +02:00
Victor Berchet
ceb2c976de [HttpKernel] Fix the case where no resource is found 2011-04-08 08:52:03 +02:00
Fabien Potencier
a46c2aa68c Merge remote branch 'kriswallsmith/mongodb/logger-null-fix'
* kriswallsmith/mongodb/logger-null-fix:
  [DoctrineMongoDBBundle] fixed logging of null values
2011-04-08 07:31:47 +02:00
Fabien Potencier
0abeaf1a38 Merge remote branch 'weaverryan/template_locator_better_exception'
* weaverryan/template_locator_better_exception:
  [FrameworkBundle] Taking advantage of the known type of $template to render meaningfull information about the template
2011-04-08 07:31:33 +02:00
Johannes Schmitt
5a4ffcd8b6 [Security] re-added some parameters 2011-04-08 07:24:42 +02:00
Ryan Weaver
5ecf1cd1d1 [FrameworkBundle] Taking advantage of the known type of $template to render meaningfull information about the template
The $template variable is not type-hinted, but this is just because the `locate` method must follow the signature of the interface.
According to the PHPDoc, the $template variable is in fact an instance of TemplateReferenceInterface, meaning we can call getPath()
on it. The previous method of json_encode just returned two empty braces, at least in my experience.
2011-04-07 18:29:34 -05:00
Kris Wallsmith
e4d3045925 [DoctrineMongoDBBundle] fixed logging of null values 2011-04-07 13:51:25 -07:00
Christophe Coevoet
723f7d46b7 [MonologBundle][BC break] Renamed the type to fingers_crossed and rotating_file 2011-04-07 15:57:47 +02:00
Christophe Coevoet
4949e0d1ed [MonologBundle] Refactored the configuration to allow adding handlers
A subsequent config file does not overwrite the whole stack anymore. An
handler can now be redefined using the same name and will keep its place
in the stack. A new handler will be added at the bottom of the stack due
to the way the config are merged.

Handlers of the stack now have a priority (defaulting to 0) which is used
to allow to reorder them. This allow to add an handler at the top of the
stack by giving it a higher priority. Handlers with the same priority stay
in the order where they are defined in the config files.
As the merging strategy of the Config component could change it is
recommended to use the priority when adding a new handler in a subsequent
file even to put it at the bottom.

The support of the new BufferHandler (type: buffer) and RotatingFileHandler
(type: rotatingfile) was also added.
2011-04-07 13:20:13 +02:00
Fabien Potencier
dfa1da0416 [Form] removed unused use statement and fixed phpdoc 2011-04-07 09:00:01 +02:00
michaelwilliams
c4660418d2 Merge remote-tracking branch 'upstream/master' 2011-04-06 17:42:32 -07:00