Commit Graph

3378 Commits

Author SHA1 Message Date
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
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
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
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