Commit Graph

1344 Commits

Author SHA1 Message Date
Victor Berchet
ceb2c976de [HttpKernel] Fix the case where no resource is found 2011-04-08 08:52:03 +02: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
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
Victor Berchet
7707c0f251 [Kernel] Fix bundle inheritance 2011-04-06 07:46:08 +02:00
Jordi Boggiano
e697224efa [Security] Remove unneeded and invalid use statement 2011-04-05 18:42:00 +02:00
Fabien Potencier
e3679ef44f [Routing] decoupled Routing from FrameworkBundle 2011-04-05 15:21:32 +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
b640fcb0f0 [Config] Introduction of an ConfigurationInterface 2011-04-05 11:26:28 +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
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
1fd44ea736 Merge remote branch 'vicb/cache_template'
* vicb/cache_template:
  [FrameworkBundle] Fix the cache template loader
2011-04-04 11:49:13 +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
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
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
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
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
1d4024c654 [Process] added some missing accessors/mutators 2011-04-02 10:08:01 +02: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
Fabien Potencier
54655104ca [Process] changed run() behavior to always populate getOutput() and getErrorOutput() 2011-04-01 18:08:54 +02: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
Martin Hason
e43b53fea3 [HttpKernel] removed unused class 2011-04-01 10:50:12 +02:00
Fabien Potencier
a9160eee70 [Validator] made fields the default option for Collection constraint 2011-03-31 15:36:04 +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