Commit Graph

3828 Commits

Author SHA1 Message Date
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
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
Johannes Schmitt
2397bcbe94 [DependencyInjection] better logging 2011-04-13 00:51:32 +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
Pascal Borreli
3dfbc08d73 [HttpKernel][Windows] Removed useless DIRECTORY_SEPARATOR conversion 2011-04-06 17:30:32 +00:00
Bernhard Schussek
67582c9a5c Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php
2011-04-06 16:06:26 +02:00
Bernhard Schussek
3482ff73b7 [Form] Fixed empty value in choice fields 2011-04-06 15:59:09 +02:00
Bernhard Schussek
e476231e8a [Form] Removed invalid tests, cleaned up some tests, added test coverage 2011-04-06 15:58:53 +02:00
Kris Wallsmith
3ff157c8a5 [Validator] switched to apc_exists() 2011-04-06 04:12:29 -07:00
Kris Wallsmith
d0f45fd3b6 [FrameworkBundle] added configuration for caching validator metadata 2011-04-06 04:07:38 -07:00
Kris Wallsmith
9ff2ca7f1d [Validator] fixed apc cache 2011-04-06 04:07:37 -07:00
Fabien Potencier
ae218d202e Merge remote branch 'vicb/bundle_inheritance'
* vicb/bundle_inheritance:
  [Kernel] Fix bundle inheritance
2011-04-06 11:29:05 +02:00
Fabien Potencier
f17a588c8f Merge remote branch 'schmittjoh/security'
* schmittjoh/security:
  [Security] added another example to update file
  [Security] Remove unneeded and invalid use statement
2011-04-06 11:17:39 +02:00
Victor Berchet
f331a7f8f9 [FrameworkBundle] Make some TraceableEventDispacther properties private 2011-04-06 09:42:48 +02:00
Victor Berchet
745d144e79 [Event] Tweak phpDoc for consistency 2011-04-06 09:42:48 +02:00
Victor Berchet
a6c3b4bfa2 [FrameworkBundle] Add error detection to the TraceableEventDispatcher 2011-04-06 09:42:38 +02:00
Victor Berchet
7707c0f251 [Kernel] Fix bundle inheritance 2011-04-06 07:46:08 +02:00
Kris Wallsmith
eca0243d3e [FrameworkBundle] added condition so invalid session config isn't created 2011-04-05 15:42:43 -07:00
Jordi Boggiano
e697224efa [Security] Remove unneeded and invalid use statement 2011-04-05 18:42:00 +02:00
Fabien Potencier
839782b6e4 [FrameworkBundle] added support for routing redirection 2011-04-05 15:21:32 +02:00
Fabien Potencier
e3679ef44f [Routing] decoupled Routing from FrameworkBundle 2011-04-05 15:21:32 +02:00
Henrik Bjørnskov
d3baba8a35 [DoctrineMongoDBBundle] Made hydrator_dir and proxy_dir configurable. Moved default values for the params to Configuration class 2011-04-05 13:29:51 +02:00
Fabien Potencier
00c9539aaa Merge remote branch 'vicb/config_base'
* vicb/config_base:
  [Config] Add a note about the ConfigurationInterface interface in UPDATE.md
  [MonologBundle] Make The Configuration class implements the ConfigurationInterface
  [Config] Introduction of an ConfigurationInterface
2011-04-05 12:32:58 +02:00
Johannes Schmitt
6d4814c115 Merge branch 'acl-fix' of https://github.com/comfortablynumb/symfony into security 2011-04-05 12:25:24 +02:00
Gustavo Adrian
2e96f2c63d Fixed exception that was thrown while updating a field ACE 2011-04-05 13:05:20 -03:00
Fabien Potencier
372907ead1 [Routing] fixed CS 2011-04-05 12:13:47 +02:00
Fabien Potencier
7c0a39c353 [Routing] optimized the output of the PHP matcher dumper 2011-04-05 11:58:56 +02:00
Victor Berchet
0973d37202 [MonologBundle] Make The Configuration class implements the ConfigurationInterface 2011-04-05 11:31:38 +02:00
Victor Berchet
b640fcb0f0 [Config] Introduction of an ConfigurationInterface 2011-04-05 11:26:28 +02:00
Fabien Potencier
e6e8d9b03d [MonologBundle] fixed typo 2011-04-05 10:54:33 +02:00
Fabien Potencier
dfbc0a899d Merge remote branch 'vicb/link_format'
* vicb/link_format:
  [Templating] Fix for getting the file link format from XDebug settings
2011-04-05 10:52:50 +02:00
Victor Berchet
170375a946 [Templating] Fix for getting the file link format from XDebug settings 2011-04-05 10:36:11 +02:00
Johannes Schmitt
1ed73fb6e6 [HttpFoundation] allow to retrieve paths of arbitrary depths 2011-04-05 10:17:31 +02:00
Fabien Potencier
6daf09a61d Merge remote branch 'subsven/master'
* subsven/master:
  Add (Boolean) cast to constructor arguments
  Add a configuration option to restrict profiler storage to the master request
2011-04-05 10:03:58 +02:00
Fabien Potencier
6faacdec27 [HttpKernel] fixed CS 2011-04-05 09:48:36 +02:00
Fabien Potencier
9bcd49683e Merge remote branch 'vicb/resource_path'
* vicb/resource_path:
  Update for Bundle names long again (= include the 'Bundle' suffix)
  [Kernel] Make locateResource() throws an exception when a resource from a Bundle hides a custom resource
  [Kernel] Make resources overriding consistent across bundle directories and resource directories
  [Kernel] Improve test semantic
  [Kernel] Update tests with shorter bundle names
  [Kernel] Restore the tests for the locateResource method
  Resource paths should use the full bundle name (with the 'Bundle' postfix)
2011-04-05 09:42:47 +02:00
Fabien Potencier
68acb02486 Merge remote branch 'vicb/wdtb_css'
* vicb/wdtb_css:
  [WebProfilerBundle] Tweak the wdtb css
2011-04-05 08:29:24 +02:00
Fabien Potencier
b126c50aea [FrameworkBundle] fixed CS 2011-04-05 08:24:46 +02:00
Fabien Potencier
9ff8080d9f Merge remote branch 'danielholmes/phpunit_xml_dir'
* danielholmes/phpunit_xml_dir:
  [FrameworkBundle] removed function for checking for phpunit.xml in cwd
  [FrameworkBundle] fixed error with arg reversing from previous changes
  [FrameworkBundle] refactored getPhpUnitXmlDir in to separate parts and added support for --confguration=... style phpunit flag
  [FrameworkBundle] fixed getPhpUnitXmlDir to work with directory paths with spaces in them
2011-04-05 08:16:53 +02:00
Fabien Potencier
ea7a87a1b7 [FrameworkBundle] simplified code 2011-04-05 08:10:17 +02:00
Fabien Potencier
515b6e48a0 merged vicb/event_dispatcher 2011-04-05 08:08:57 +02:00
Victor Berchet
6164054972 [WebProfilerBundle] Tweak the wdtb css 2011-04-05 08:05:59 +02:00
Fabien Potencier
9e4ebc951c Merge remote branch 'kriswallsmith/assetic/filter-file'
* kriswallsmith/assetic/filter-file:
  [AsseticBundle] added easy way to add a file to a filter definition
2011-04-05 08:04:11 +02:00
Fabien Potencier
747c98f178 [FrameworkBundle] removed the debug.file_link_format parameter 2011-04-05 08:03:29 +02:00
Fabien Potencier
4d4876d9ba Merge remote branch 'vicb/file_link_format'
* vicb/file_link_format:
  [FrameworkBundle] Make specifying a custom file_link_format easier
  [FrameworkBundle] Fix for getting the file link format fallback to XDebug configuration
2011-04-05 07:57:07 +02:00
Fabien Potencier
87f808757d [WebProfileBundle] replaced an inclusion with a macro 2011-04-05 07:54:07 +02:00
Fabien Potencier
c2880378b9 Revert "[WebProfilerBundle] Tweak html markup and css"
This reverts commit 60b96e7c57.

I want to be able to display several toolbars on the same page
2011-04-05 07:51:32 +02:00
Fabien Potencier
d61a685786 Merge remote branch 'vicb/wdtb_and_events'
* vicb/wdtb_and_events:
  [WebProfilerBundle] Event panel: details & links to the listener method when applicable
  [WebProfilerBundle] Tweak html markup and css
  [WebProfilerBundle] Update the event panel layout
  [WebProfilerBundle] Style abbr elements
2011-04-05 07:46:34 +02:00
Ryan Weaver
22beeb2549 [TwigBundle] Cleaning up several portions of the exception message received when a template cannot be loaded
* The quotations are redundant when the template is a string - json_encode() adds the quotes
 * The exception should not end in a period, as the exception class may add a line number (not in this case, but generall)
 * Made the line number -1, so that no line number was displayed in the message (error at line 0 looks worse than nothing at all)
2011-04-04 21:35:00 -05:00
Victor Berchet
b5f3d14714 [WebProfilerBundle] Event panel: details & links to the listener method when applicable 2011-04-05 01:23:31 +02:00
Victor Berchet
5a1d5e5082 [FrameworkBundle] Make specifying a custom file_link_format easier 2011-04-05 01:15:21 +02:00
Victor Berchet
9998ab18e9 [FrameworkBundle] Fix for getting the file link format fallback to XDebug configuration 2011-04-04 23:39:37 +02:00
Victor Berchet
60b96e7c57 [WebProfilerBundle] Tweak html markup and css 2011-04-04 23:09:43 +02:00
Kris Wallsmith
4e5c0b1da9 [AsseticBundle] added easy way to add a file to a filter definition 2011-04-04 13:47:32 -07:00
Victor Berchet
1f1ee3cb01 [WebProfilerBundle] Update the event panel layout 2011-04-04 20:15:39 +02:00
Victor Berchet
b95295caac [FrameworkBundle] A listener is always an object 2011-04-04 19:51:14 +02:00
Victor Berchet
f58658f929 [WebProfilerBundle] Style abbr elements 2011-04-04 19:28:09 +02:00
Victor Berchet
46480b7e89 [FrameworkBundle] Fix the traceable event dispatcher 2011-04-04 19:22:55 +02:00
Fabien Potencier
dd150fc478 Merge remote branch 'vicb/twig_warmer'
* vicb/twig_warmer:
  [TwigBundle] Update the cache warmer
2011-04-04 18:52:56 +02:00
Fabien Potencier
fe43e1b759 Merge remote branch 'lsmith77/default_namespace2'
* lsmith77/default_namespace2:
  added default implementation for getNamespace()
2011-04-04 18:46:30 +02:00
Fabien Potencier
dbfe73bef4 Merge remote branch 'vicb/gitkeep'
* vicb/gitkeep:
  [FrameworkBundle] Delete .gitkeep files
2011-04-04 18:45:25 +02:00
Fabien Potencier
ae2629ce30 merged vicb/profiler_verbose 2011-04-04 18:43:33 +02:00
Fabien Potencier
60dd810e3f [DoctrineBundle] fixed unit tests 2011-04-04 18:35:29 +02:00
Fabien Potencier
b1e0403c96 Merge remote branch 'francisbesset/doctrine_orm_custom_hydrator'
* francisbesset/doctrine_orm_custom_hydrator:
  [DoctrineBundle] Added tests for add custom hydration mode
  Updated XSD schema
  Moved hydrators configuration in entity manager
  [DoctrineBundle] Added custom hydrator for the EntityManager from configuration
2011-04-04 18:31:55 +02:00
Victor Berchet
852d5c37df [FrameworkBundle] Delete .gitkeep files 2011-04-04 17:40:18 +02:00
Bernhard Schussek
bfa3c71140 [Form] Added Bundle suffixes again 2011-04-04 15:33:21 +02:00
Bernhard Schussek
0cf8cc762a Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
2011-04-04 15:16:08 +02:00
Fabien Potencier
9fe9d80371 [MonologBundle] fixed typo 2011-04-04 14:56:42 +02:00
Fabien Potencier
117b6997b4 [WebProfilerBundle] removed redundant info 2011-04-04 12:45:25 +02:00
Fabien Potencier
5bd2b53cb8 [ZendBundle] removed the bundle 2011-04-04 12:41:27 +02:00
Fabien Potencier
01ee1bfed1 merged stof/monolog 2011-04-04 12:29:15 +02:00
Fabien Potencier
f4276a88f6 Merge remote branch 'schmittjoh/parameterCleanup'
* schmittjoh/parameterCleanup:
  [SecurityBundle] inline parameters which are only used in one place
  [SecurityBundle] moved all non-class parameters to the Configuration file
2011-04-04 11:57:31 +02:00
Fabien Potencier
1cb03b1448 [FrameworkBundle] removed templating.loader.cache.path parameter 2011-04-04 11:56:41 +02:00
Fabien Potencier
1fd44ea736 Merge remote branch 'vicb/cache_template'
* vicb/cache_template:
  [FrameworkBundle] Fix the cache template loader
2011-04-04 11:49:13 +02:00
Fabien Potencier
49a7f525b9 Revert "[FrameworkBundle] Updated the files generated by init:bundle to use the new bundle logical names"
This reverts commit d0e2b5b611.
2011-04-04 11:42:52 +02:00
Victor Berchet
5317c96fef Update for Bundle names long again (= include the 'Bundle' suffix) 2011-04-04 11:39:41 +02:00
Victor Berchet
7ed18bf829 [Kernel] Make locateResource() throws an exception when a resource from a Bundle hides a custom resource 2011-04-04 11:24:51 +02:00
Victor Berchet
3cd3dd39ba [Kernel] Make resources overriding consistent across bundle directories and resource directories 2011-04-04 11:24:51 +02:00
Victor Berchet
8b7c857ef3 Resource paths should use the full bundle name (with the 'Bundle' postfix) 2011-04-04 11:24:51 +02:00
Fabien Potencier
f232b3cdda reverted Merge remote branch 'kriswallsmith/kernel/shorter-bundle-names' 2011-04-04 11:10:56 +02:00
Fabien Potencier
743592d81e Revert "fixed remaining Bundle suffixes"
This reverts commit 315147c6c8.
2011-04-04 11:08:56 +02:00
Fabien Potencier
c80ade9dc7 Revert "[DoctrineBundle] updated tests with shorter bundle names"
This reverts commit 082fd73b3c.
2011-04-04 11:08:50 +02:00
Fabien Potencier
c1715ef376 Revert "[DoctrineMongoDBBundle] updated tests with shorter bundle names"
This reverts commit 751ba4db5e.
2011-04-04 11:08:43 +02:00
Fabien Potencier
6c2954a2d5 Revert "[FrameworkBundle] fixed shorter bundle name in test"
This reverts commit d1f3852868.
2011-04-04 11:08:30 +02:00
Fabien Potencier
06c1e02bed Merge remote branch 'Seldaek/serializer'
* Seldaek/serializer:
  [Serializer] Some more privates
  [Serializer] Move private methods below protected ones
  [Serializer] Added @api annotations
  [Serializer] Added docblocks for NormalizableInterface
  [Serializer] add methods to the SerializerInterface
  [Serializer] Added docblock
  [Serializer] Switched most protected to private or final
2011-04-04 11:01:41 +02:00
Fabien Potencier
9b16287bcd Merge remote branch 'Seldaek/ajax_redir'
* Seldaek/ajax_redir:
  [WebProfilerBundle] Prevent redirects to be intercepted in XHRs
2011-04-04 11:01:12 +02:00
Eriksen Costa
bc52107d07 [Locale] fixed method signature, removed default value for the $locale arg 2011-04-03 22:57:50 -03:00
Francis Besset
d9b3643d47 [DoctrineBundle] Added tests for add custom hydration mode 2011-04-04 00:07:23 +02:00
Fabien Potencier
514133a6bb [Console] made ApplicationTester::getDisplay() work even in case of an error during execution and changed returned value of ApplicationTester to the command exit code 2011-04-03 23:46:08 +02:00
Fabien Potencier
dd158a2c99 [Console] made CommandTester::getDispaly() work even in case of an error during execution 2011-04-03 23:25:59 +02:00
Francis Besset
97729e6c61 Updated XSD schema 2011-04-03 23:08:56 +02:00
Francis Besset
9b093d53ae Moved hydrators configuration in entity manager 2011-04-03 23:08:18 +02:00
Francis Besset
daa138ffc8 [DoctrineBundle] Added custom hydrator for the EntityManager from configuration 2011-04-03 22:39:35 +02:00
Fabien Potencier
ad4a0bda1c [Console] changed returned value of CommandTester to the command exit code 2011-04-03 22:30:40 +02:00
Fabien Potencier
91a2f36850 [DomCrawler] fixed typo in phpdoc 2011-04-03 22:23:52 +02:00
Jordi Boggiano
21b3ee6783 [WebProfilerBundle] Prevent redirects to be intercepted in XHRs 2011-04-03 21:21:23 +02:00
Jordi Boggiano
a16f1865b5 [WebProfilerBundle] Display errors logged by monolog properly in logger panel 2011-04-03 16:36:04 +02:00
Jordi Boggiano
7132f81d14 [Serializer] Some more privates 2011-04-03 16:24:25 +02:00
Jordi Boggiano
47733d08a1 [Serializer] Move private methods below protected ones 2011-04-03 16:21:53 +02:00
Jordi Boggiano
54ffb1fbc0 [Serializer] Added @api annotations 2011-04-03 15:49:40 +02:00
Jordi Boggiano
507f6269b5 [Serializer] Added docblocks for NormalizableInterface 2011-04-03 15:44:09 +02:00
Jordi Boggiano
76cab7deb9 [Serializer] add methods to the SerializerInterface 2011-04-03 15:15:53 +02:00
Jordi Boggiano
cb727dbde3 [Serializer] Added docblock 2011-04-03 15:14:07 +02:00
Jordi Boggiano
424a1dad27 [Serializer] Switched most protected to private or final 2011-04-03 15:13:21 +02:00
Victor Berchet
788ed5126b [FrameworkBundle] Fix the cache template loader 2011-04-02 19:18:32 +02:00
Fabien Potencier
5d143c4aac Merge remote branch 'weaverryan/prevent_exception_on_handle_exception'
* weaverryan/prevent_exception_on_handle_exception:
  [HttpKernel] Wrapping the end of handleException() in a try-catch to prevent response listeners from throwing another exception
2011-04-02 18:40:34 +02:00
Fabien Potencier
53274512e2 Merge remote branch 'weaverryan/better_import_exception_and_bug_fix'
* weaverryan/better_import_exception_and_bug_fix:
  [Config] Improving the exception when a resource cannot be imported
  [DependencyInjection] Fixing a bug where "ignore_errors" doesn't work in YAML and XML
2011-04-02 18:37:51 +02:00
Fabien Potencier
e92ac9eeef Merge remote branch 'weaverryan/exception_page_changes'
* weaverryan/exception_page_changes:
  [FrameworkBundle] When there are multiple nested exceptions, this hides the stacktrace from all exceptions by default
  [FrameworkBundle] Fixing small bug on exception page where the +/- icons didn't toggle correctly
2011-04-02 18:33:55 +02:00
Bernhard Schussek
72a41f8c94 [Form] Fixed: Booleans can be used as choice keys now 2011-04-02 18:26:28 +02:00
Fabien Potencier
1cd9b5bb49 Merge remote branch 'kriswallsmith/assetic/updates'
* kriswallsmith/assetic/updates:
  [AsseticBundle] added twig support for asset packages
  [AsseticBundle] cleaned up php templating support
  [FrameworkBundle] fixed interface and usage in RouterHelper
  [AsseticBundle] fixed twig classes for api changes in assetic
2011-04-02 18:15:45 +02:00
Fabien Potencier
0667e706fe Merge remote branch 'kriswallsmith/assetic/config-fixes'
* kriswallsmith/assetic/config-fixes:
  [AsseticBundle] moved some parameter defaults to Configuration
  [AsseticBundle] fixed definition of filter configs
2011-04-02 18:15:43 +02:00
Fabien Potencier
336a184bb4 Merge remote branch 'kriswallsmith/assetic/coalesce-dirs'
* kriswallsmith/assetic/coalesce-dirs:
  [AsseticBundle] added coalescing directory resources that check the kernel for bundle templates
2011-04-02 18:15:41 +02:00
Bernhard Schussek
a5d0b3aea6 [Form] Changed FormBuilder::set(Client|Norm)Transformer to FormBuilder::prepend(Client|Norm)Transformer and FormBuilder::append(Client|Norm)Transformer to facilitate extension of types 2011-04-02 16:39:19 +02:00
Victor Berchet
5e141402e1 [WebProfilerBundle] Fix the intercept_redirects option 2011-04-02 16:13:08 +02:00
Victor Berchet
ac03440d7a [WebProfilerBundle] Make wdtb verbosity configurable 2011-04-02 16:13:08 +02:00
Victor Berchet
b2be041475 [WebProfilerBundle] Remove the format and content type from the wdtb 2011-04-02 16:13:07 +02:00
Bernhard Schussek
be9ef42af9 [Form] Renamed choice transformers for better clarity 2011-04-02 16:11:20 +02:00
Bernhard Schussek
fc59936740 [Form] Fixed: ThemeRenderer::isChoiceSelected() works correctly for boolean choices 2011-04-02 16:00:46 +02:00
Bernhard Schussek
a4bbc40ac6 [Form] Cleaned up ChoiceListInterface 2011-04-02 15:41:43 +02:00
Bernhard Schussek
d3b7c4e8c1 [Form] Moved getLabel(), isChoiceSelected() and isChoiceGroup() from ChoiceListInterface to ThemeRenderer 2011-04-02 14:14:18 +02:00
Bernhard Schussek
d3c8647f49 [Form] Fixed EntitiesToArrayTransformer::reverseTransform() to accept NULL values 2011-04-02 14:13:16 +02:00
Ryan Weaver
39f81753ce [FrameworkBundle] When there are multiple nested exceptions, this hides the stacktrace from all exceptions by default
This addresses the potential issue where a user doesn't realize that there are multiple exception messages because the
full stack trace of the first exception is displayed (pushing the others far far down the page). This hides the stacktrace
of all exceptions (when there are more than one) by default, making each exception message easily viewable.
2011-04-02 06:25:34 -05:00
Ryan Weaver
a166b8de64 [FrameworkBundle] Fixing small bug on exception page where the +/- icons didn't toggle correctly 2011-04-02 06:24:00 -05:00
Bernhard Schussek
94f2baa895 [Form] Fixed BooleanToStringTransformer::reverseTransform() to accept NULL values. Fixes ChoiceTypeTest 2011-04-02 13:00:19 +02:00
Bernhard Schussek
37e8e1270c [Form][FrameworkBundle][TwigBundle] Renamed view variable 'disabled' to 'read_only' to match with the according FormInterface methods 2011-04-02 12:18:43 +02:00
Bernhard Schussek
39b0aafc00 Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
2011-04-02 12:08:27 +02:00
Bernhard Schussek
35d9b7f800 [Form] Improved test coverage of Form. The emptyValue closure now receives the Form instance to use form data when constructing new objects 2011-04-02 12:00:19 +02:00
Bernhard Schussek
4f39234741 [Form] bind() is ignored if a form is read-only 2011-04-02 11:39:15 +02:00
Bernhard Schussek
ca20aef379 [Form] Improved test coverage of DelegatingValidator and fixed validation group inheritance 2011-04-02 11:35:58 +02:00
Bernhard Schussek
33b0011f86 [Form] Improved test coverage of Form 2011-04-02 11:22:29 +02:00
Fabien Potencier
1d4024c654 [Process] added some missing accessors/mutators 2011-04-02 10:08:01 +02:00
Kris Wallsmith
06074c367d [AsseticBundle] added twig support for asset packages 2011-04-01 20:59:24 -07:00
Kris Wallsmith
e6d4734d4e [AsseticBundle] cleaned up php templating support 2011-04-01 20:59:24 -07:00
Kris Wallsmith
6c3f50a585 [FrameworkBundle] fixed interface and usage in RouterHelper 2011-04-01 20:58:17 -07:00
michaelwilliams
46b711c4a8 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.
See http://www.php.net/manual/en/function.session-set-save-handler.php#103055 for more details
2011-04-01 18:14:27 -07:00
Ryan Weaver
b9883a3bad [Config] Improving the exception when a resource cannot be imported
This improves, for example, the exception one would receive if they tried to import a resource from a bundle that doesn't exist.
Previously, the deep "bundle is not activated" exception would be thrown. That has value, however there is no indication of where
the exception is actually occurring.

In this new implementation, we throw an exception that explains exactly which resource, and from which source resource, cannot be
loaded. The deeper exception is still thrown as a nested exception.

Two caveats:

  * The `HttpKernel::varToString` method was replicated
  * This introduces a new `Exception` class, which allows us to prevent lot's of exceptions from nesting into each other in the case
    that some deeply imported resource cannot be imported (each upstream import that fails doesn't add its own exception).
2011-04-01 18:59:54 -05:00
Ryan Weaver
65ac5ec7c0 [DependencyInjection] Fixing a bug where "ignore_errors" doesn't work in YAML and XML
Tests added, the arguments were simply mismatched.
2011-04-01 18:59:45 -05:00
Ryan Weaver
083b25b68c [HttpKernel] Wrapping the end of handleException() in a try-catch to prevent response listeners from throwing another exception 2011-04-01 18:01:36 -05:00
Kris Wallsmith
98b3a2d9eb [AsseticBundle] fixed twig classes for api changes in assetic 2011-04-01 11:33:34 -07:00
Kris Wallsmith
2bc8c5f796 [AsseticBundle] moved some parameter defaults to Configuration 2011-04-01 09:54:49 -07:00
Fabien Potencier
54655104ca [Process] changed run() behavior to always populate getOutput() and getErrorOutput() 2011-04-01 18:08:54 +02:00
Kris Wallsmith
347b66a2b6 [AsseticBundle] fixed definition of filter configs 2011-04-01 08:06:42 -07:00
Kris Wallsmith
e2f317c0bb [AsseticBundle] added coalescing directory resources that check the kernel for bundle templates 2011-04-01 07:12:30 -07:00
Fabien Potencier
10297d4eb5 Merge remote branch 'hason/frameworkbundle'
* hason/frameworkbundle:
  [HttpKernel] removed unused class
  [FrameworkBundle] fixed bugs
  [FrameworkBundle] fixed test on windows
  [FrameworkBundle] fixed CS
2011-04-01 15:45:13 +02:00
Kris Wallsmith
daccbf45bf [Routing] updated for DirectoryResource changes 2011-04-01 04:57:10 -07:00
Kris Wallsmith
c51b716180 [Config] simplified DirectoryResource to only allow one regex 2011-04-01 04:56:50 -07:00
Johannes Schmitt
4776f9523b [SecurityBundle] inline parameters which are only used in one place 2011-04-01 12:40:44 +02:00
Martin Hason
e43b53fea3 [HttpKernel] removed unused class 2011-04-01 10:50:12 +02:00
Martin Hason
57b1b4992b [FrameworkBundle] fixed bugs
- not existing service in DI container
- called invalid method
2011-04-01 10:34:13 +02:00
Martin Hason
c045f2896b [FrameworkBundle] fixed test on windows 2011-04-01 10:31:43 +02:00
Martin Hason
3baebe4e3b [FrameworkBundle] fixed CS 2011-04-01 10:28:09 +02:00
Fabien Potencier
c9c66db108 Merge remote branch 'kadeer/master'
* kadeer/master:
  [DoctrineBundle] fixes issues with $this->container->get('form.context') when the value of default_connection key of doctrine.dbal is changed from default in config.yml
2011-04-01 09:48:52 +02:00
Johannes Schmitt
e0c745757d [SecurityBundle] moved all non-class parameters to the Configuration file 2011-04-01 09:09:17 +02:00
Fabien Potencier
046e3637db [FrameworkBundle] removed unused parameters 2011-04-01 08:32:31 +02:00
Fabien Potencier
46dc196288 [DoctrineMongoDBBundle] added a FIXME not for non-working code 2011-04-01 08:31:05 +02:00
Fabien Potencier
eb21f5b76e [FrameworkBundle] moved some validation related services to the XML services file 2011-04-01 08:26:19 +02:00
Fabien Potencier
33add37f7c [FrameworkBundle] removed the validator.annotations.namespaces parameter
The parameter has been removed and the service moved to the XML file (for consistency).
The behavior is still the same as before as any non-public service
which is not referenced anywhere will be automatically removed by a
compiler pass.
2011-04-01 08:15:38 +02:00
Fabien Potencier
fe19646470 [HttpKernel] made the _route request attribute _internal for embedded controller renderings 2011-04-01 07:39:12 +02:00
Fabien Potencier
a9160eee70 [Validator] made fields the default option for Collection constraint 2011-03-31 15:36:04 +02:00
Bernhard Schussek
c864d7fae1 [Form] Improved test coverage of Form class 2011-03-31 15:23:33 +02:00
Fabien Potencier
16a98cf104 [Validator] added a Metadata factory that can be used with ValidatorInterface::validateValue() 2011-03-31 15:05:18 +02:00
Lukas Kahwe Smith
ab93d40855 added default implementation for getNamespace() 2011-03-31 14:21:44 +02:00
Martin Hason
e21591e16e [Validator] fixed CS 2011-03-31 14:02:00 +02:00
Bernhard Schussek
1ef18360fa [Form] Made name immutable in FormBuilder to avoid synchronization problems with name and property path 2011-03-31 13:48:06 +02:00
Bernhard Schussek
bbeddf7789 Merge remote branch 'symfony/master' into experimental 2011-03-31 12:32:20 +02:00
Abdulkadir N. A.
8931096449 [DoctrineBundle] fixes issues with $this->container->get('form.context')
when the value of default_connection key of doctrine.dbal is changed
from default in config.yml
2011-03-30 23:51:17 -07:00