Johannes Schmitt
439699daeb
Merge branch 'functionalTests' into security
2011-05-28 17:17:00 +02:00
Johannes Schmitt
5cda240c6f
refactored functional tests a bit
2011-05-28 17:16:55 +02:00
Johannes Schmitt
edbf4ea691
Merge branch 'security' of github.com:schmittjoh/symfony into security
2011-05-28 17:09:32 +02:00
Johannes Schmitt
f37386e336
Merge branch 'master' of git://github.com/symfony/symfony into security
2011-05-28 17:07:16 +02:00
Arnout Boks
a0397f99f5
[DependencyInjection] Fixed bug where anonymous services from two different xml-files (with the same basename) could collide
2011-05-28 10:29:32 +02:00
Miha Vrhovnik
b8144c62ad
DateType single-text should be single_text
2011-05-27 16:23:59 +02:00
Christian Raue
f29a2b9b72
The toolbar wraps to a 2nd line for long route names which makes it hiding page content, thus better show more white space instead of overlaying content with the toolbar.
2011-05-27 07:17:39 -07:00
Fabien Potencier
af2f9207be
[Console] fixed typo
2011-05-27 15:34:13 +02:00
Joseph Bielawski
4b476ad267
[Form] Force hidden fields to not have "required" attribute ( #1091 )
2011-05-27 04:48:14 -07:00
Florent Cailhol
f052d2d439
Made the profiler toolbar loading an XML HTTP request.
2011-05-27 02:14:03 -07:00
Fabien Potencier
923c234160
fixed form_rest() for embedded forms (refs #1051 , #1115 )
2011-05-27 08:12:39 +02:00
Fabien Potencier
4de930b000
[HttpFoundation] added some phpdoc
2011-05-27 07:55:37 +02:00
Fabien Potencier
610583899d
Merge remote branch 'CodeMeme/889-EntityChoiceField-grouped-choices'
...
* CodeMeme/889-EntityChoiceField-grouped-choices:
Whitespace cleanup
Fixed EntityChoiceList to support grouped entities Refs #889
Added test for grouped entity choice list Refs #889
2011-05-27 07:44:35 +02:00
Johannes Schmitt
746151c783
added another test case
2011-05-27 07:37:54 +02:00
Fabien Potencier
32ac29a73d
Merge remote branch 'schmittjoh/functionalTests'
...
* schmittjoh/functionalTests:
[SecurityBundle] bootstrapped functional test suite
2011-05-27 07:35:13 +02:00
Fabien Potencier
614ebe3a39
Merge remote branch 'weaverryan/security_context_missing_logging'
...
* weaverryan/security_context_missing_logging:
[Security] Removing test per @schmittjoh as this area is better functionally-tested
[Security] Adding tests and then fixing bug where ContextListener did no logging
2011-05-27 07:34:51 +02:00
Fabien Potencier
da09411e14
[SwiftmailerBundle] optimized code
2011-05-27 07:33:04 +02:00
Eric Clemmons
fb9d951b1d
Fixed EntityChoiceList to support grouped entities
...
Refs #889
2011-05-26 18:59:21 -07:00
Johannes Schmitt
1ca4dcad91
[SecurityBundle] bootstrapped functional test suite
2011-05-27 01:07:04 +02:00
Fabien Potencier
5ed136b3f1
[SwiftMailer] optimized configuration
...
* Removed the requirement of the init.php file when getting the Swift_Mailer object (must now be done via autoloading -- see Symfony SE)
* Changed the data collector to avoid loading Swiftmailer when no email has been send
2011-05-26 22:29:28 +02:00
Ryan Weaver
bad1cb61d0
[Security] Adding tests and then fixing bug where ContextListener did no logging
2011-05-26 15:08:19 -05:00
Fabien Potencier
9aa8083cb4
[Routing] fixed previous merge
2011-05-26 18:28:42 +02:00
Fabien Potencier
5911fb946d
[Routing] fixed CS
2011-05-26 18:27:18 +02:00
Fabien Potencier
1c0dfad979
Merge remote branch 'Chekote/xmlfileloader_overload_refactor'
...
* Chekote/xmlfileloader_overload_refactor:
Refactored the processing of each individual node into it's own method, enabling easier overloading of behavior for Bundles such as FriendsOfSymfony/RestBundle
2011-05-26 18:25:53 +02:00
Fabien Potencier
6507eeff3c
Merge remote branch 'CodeMeme/1058-fix-radio-input-listener'
...
* CodeMeme/1058-fix-radio-input-listener:
Fix for RadioInputListener's empty value erroneously becoming extra data Refs #1058
Added test for RadioInputListener bug treating no data as extra data
2011-05-26 17:31:09 +02:00
Fabien Potencier
1a109c8bcd
[BrowserKit] fixed CS
2011-05-26 17:07:51 +02:00
Fabien Potencier
eb90427e92
Merge remote branch 'danielholmes/cookie_fixes'
...
* danielholmes/cookie_fixes:
[BrowserKit] fixed explicit cookie params being overriden by url
2011-05-26 17:07:13 +02:00
Fabien Potencier
a0462593eb
[DoctrineBundle] extracted code from Doctrine commands
2011-05-26 16:39:36 +02:00
Fabien Potencier
c19d6c07d2
[HttpFoundation] simplified code
2011-05-26 15:02:40 +02:00
Fabien Potencier
1f369ed1ed
Merge remote branch 'zerosanity/master'
...
* zerosanity/master:
Added missing space.
Fixed broken logic in Request::getHttpHost(). It was ignoring HTTP_HOST completely.
2011-05-26 15:01:53 +02:00
Fabien Potencier
699ecfcf90
Merge remote branch 'stloyd/validators_refactoring'
...
* stloyd/validators_refactoring:
Refactor validators constraints: - remove need for defining "getTargets()" method as 95% of validators use same one - replace abstract "Constraint::getTargets()" with one that use 95% of validators - add additional tests for "Constraint::getTargets()" method - remove unused "use" statement in Constraint\Valid
2011-05-26 14:58:24 +02:00
Fabien Potencier
43817de633
Merge remote branch 'maoueh/date_type_dead_code'
...
* maoueh/date_type_dead_code:
[Form] Removed dead code in the buildForm method of DateType.php * With the introduction of the getAllowedOptionValues mechanics, the check is performed prior to the buildForm call. There is no more needs to check it again in DateType.
2011-05-26 14:57:54 +02:00
Fabien Potencier
67118f7878
Merge remote branch 'sonata-project/change_self_to_static'
...
* sonata-project/change_self_to_static:
change self to static so the parent class can have access to the child constant
2011-05-26 12:55:15 +02:00
Fabien Potencier
be95bff7ca
[Routing] tweaked error messages
2011-05-26 12:54:21 +02:00
Fabien Potencier
5b6f15b661
Merge remote branch 'gimler/master'
...
* gimler/master:
use param names in exception not the index
2011-05-26 12:53:26 +02:00
Fabien Potencier
3bdb7c2b57
[DependencyInjection] fixed regression when a parameter contains an escaped %
...
Notice that this is still not perfect, but I don't see how to fix the remaining
potential problems.
2011-05-26 12:47:50 +02:00
Jordi Boggiano
ba8758b4c2
[EventDispatcher] Removed temporary code
2011-05-26 11:56:59 +02:00
Jordi Boggiano
3f6407ccd1
[FrameworkBundle] Improved code readability
2011-05-26 11:55:11 +02:00
Jordi Boggiano
8a2d5496c9
[FrameworkBundle] Clarified code and fixed regression
2011-05-26 11:55:09 +02:00
Jordi Boggiano
af0bd8a136
Update Core and Security events to latest model
...
The main benefit is that in XML/YML files we have common syntax (i.e. core.controller, form.pre_bind) that properly namespaces event names (before: onCoreController was ok, preBind was not).
On the other hand in PHP land we also have namespaced events, CoreEvents::controller, FormEvents::preBind, before it was Events::onCoreController, Events::onPreBind, we now have more context.
2011-05-26 11:55:07 +02:00
Jordi Boggiano
1246503e55
[EventDispatcher] Allow registration of arbitrary callbacks
...
This in effect removes the direct link between event name and the method name on the handler.
Any callback can be given as a handler and the event name becomes an arbitrary string. Allowing for easier namespacing (see next commit)
2011-05-26 11:54:06 +02:00
Jordi Boggiano
000229dbd0
[EventDispatcher] Remove useless code
2011-05-26 11:54:02 +02:00
Jordi Boggiano
9816b6adc3
[EventDispatcher] Minor memory optimization to getListeners()
2011-05-26 11:54:00 +02:00
Jordi Boggiano
48d6a95803
[FrameworkBundle] Small optimization, remove some function calls
2011-05-26 11:53:58 +02:00
Fabien Potencier
ce79fa9ba2
[DependencyInjection] fixed typo
2011-05-26 08:22:16 +02:00
Daniel Holmes
3c372d3773
[BrowserKit] fixed explicit cookie params being overriden by url
2011-05-26 15:28:51 +10:00
Eric Clemmons
c06a157759
Fix for RadioInputListener's empty value erroneously becoming extra data
...
Refs #1058
2011-05-25 22:24:49 -07:00
Joshua Nye
3832a7a33d
Added missing space.
2011-05-25 17:22:32 -04:00
Joshua Nye
f019541716
Fixed broken logic in Request::getHttpHost(). It was ignoring HTTP_HOST completely.
2011-05-25 16:02:16 -04:00
Gordon Franke
60527574d9
use param names in exception not the index
2011-05-25 21:02:01 +02:00
Fabien Potencier
0b9f3d8eb6
[DoctrineBundle] made a temporary fix to force Doctrine annotations to be loaded ( closes #1077 )
2011-05-25 20:40:34 +02:00
Fabien Potencier
ce19cc0698
Merge remote branch 'Seldaek/domcrawler'
...
* Seldaek/domcrawler:
[DomCrawler] Uppercase http methods
2011-05-25 18:27:12 +02:00
Jordi Boggiano
08e7629fb4
[DomCrawler] Uppercase http methods
2011-05-25 15:45:23 +02:00
stealth35
956f58733c
SQLite -> SQLite3
2011-05-25 05:51:48 -07:00
Fabien Potencier
66064cc8fc
fixed CS
2011-05-25 11:35:29 +02:00
Fabien Potencier
9f76d3452d
Merge remote branch 'stloyd/regexp_validator'
...
* stloyd/regexp_validator:
Simplify RegexValidator
2011-05-25 11:35:07 +02:00
Fabien Potencier
dcd490e03f
[Twig] added a way to use % in a trans string ( closes #981 )
2011-05-25 11:29:23 +02:00
stloyd
db28beb395
Simplify RegexValidator
2011-05-25 11:08:13 +02:00
stloyd
3ea2a32c53
Refactor validators constraints:
...
- remove need for defining "getTargets()" method as 95% of validators use same one
- replace abstract "Constraint::getTargets()" with one that use 95% of validators
- add additional tests for "Constraint::getTargets()" method
- remove unused "use" statement in Constraint\Valid
2011-05-25 10:51:35 +02:00
Fabien Potencier
be046bcb44
Merge remote branch 'mcbennn/master'
...
* mcbennn/master:
'annotate' option is useless
no-backup option instead of force, cleaned comparison operator
Implements some options that already exist on other doctrine-related commands
2011-05-25 10:06:30 +02:00
Fabien Potencier
462f222319
[DependencyInjection] changed \LogicException to RuntimeException to be more consistent
2011-05-25 09:59:38 +02:00
Fabien Potencier
2438a73c7b
[DependencyInjection] added a check for circular references in parameter definitions
2011-05-25 09:57:38 +02:00
mcben
946f68e029
'annotate' option is useless
2011-05-25 09:54:13 +02:00
mcben
512eb5378a
no-backup option instead of force, cleaned comparison operator
2011-05-25 09:54:13 +02:00
mcben
650479735b
Implements some options that already exist on other doctrine-related commands
2011-05-25 09:54:13 +02:00
Fabien Potencier
456eb53eb8
[DependencyInjection] renamed CircularReferenceException to ServiceCircularReferenceException
2011-05-25 09:48:49 +02:00
Fabien Potencier
6c409cac84
[DependencyInjection] refactored parameter bag parameter replacements (removed duplicated code)
2011-05-25 09:35:51 +02:00
Fabien Potencier
179864414e
[Form] fixed CS
2011-05-25 08:03:21 +02:00
Fabien Potencier
9e632b9135
Merge remote branch 'hlecorche/master'
...
* hlecorche/master:
IntegerToLocalizedStringTransformer must return "null" if input value is null
2011-05-25 08:02:35 +02:00
hlecorche
cc49cd9498
Merge remote-tracking branch 'remotes/symfony/master'
2011-05-24 23:25:58 +02:00
Joseph Bielawski
e29e12473c
[Tests] Skip test if Doctrine Common is not available.
2011-05-24 14:18:17 -07:00
Joseph Bielawski
46e58206a3
[Tests] Skip test if Doctrine Common is not available.
2011-05-24 14:16:10 -07:00
Fabien Potencier
05778c719f
[BrowserKit] fixed CS
2011-05-24 20:37:52 +02:00
Fabien Potencier
e0bf310b55
Merge remote branch 'hnw/cookie-raw-value'
...
* hnw/cookie-raw-value:
added test for Cookie#getRawValue and CookieJar#AllRawValues
fixed doc comment
[BrowserKit] dealing with raw value for cookies
2011-05-24 20:20:57 +02:00
Fabien Potencier
aa356e7288
[BrowserKit] fixed cookie management (see RFC 2109)
2011-05-24 20:08:11 +02:00
Fabien Potencier
4f47fc708e
Merge remote branch 'weaverryan/security_factories_delegating_loader'
...
* weaverryan/security_factories_delegating_loader:
[SecurityBundle] Using a DelegatingLoader so that security factories can be in any config format
2011-05-24 19:44:15 +02:00
Fabien Potencier
a8a94dc631
Merge remote branch 'schmittjoh/doctrine'
...
* schmittjoh/doctrine:
updated to latest changes in Doctrine
2011-05-24 18:52:49 +02:00
Ryan Weaver
afe6005f49
[SecurityBundle] Using a DelegatingLoader so that security factories can be in any config format
2011-05-24 11:35:49 -05:00
Thomas Rabaix
be2c427053
change self to static so the parent class can have access to the child constant
2011-05-24 18:25:28 +02:00
Fabien Potencier
38ea3f4f3a
Merge remote branch 'kriswallsmith/twig/lazy-helpers'
...
* kriswallsmith/twig/lazy-helpers:
[TwigBundle] reverted to lazy-loading of templating helpers (fixes #1066 )
2011-05-24 18:15:14 +02:00
Kris Wallsmith
4018040bbb
[TwigBundle] reverted to lazy-loading of templating helpers ( fixes #1066 )
2011-05-24 09:09:47 -07:00
Fabien Potencier
37ada8e382
Merge remote branch 'richardmiller/assetic_filter_options'
...
* richardmiller/assetic_filter_options:
Added calling methods for options to assetic filter configs
2011-05-24 17:47:45 +02:00
Fabien Potencier
c1cd66c9f9
[DoctrineBundle] fixed CS
2011-05-24 17:39:06 +02:00
Fabien Potencier
3d7d84726b
Merge remote branch 'pkruithof/master'
...
* pkruithof/master:
Global mapping file is not seen as class name anymore
Global mapping file is not seen as class name anymore
2011-05-24 17:37:45 +02:00
Sven Paulus
4f39b9ae9b
fix invalid schema in monolog bundle
2011-05-24 15:11:45 +02:00
Johannes M. Schmitt
decac13331
added a few finals
2011-05-24 15:08:22 +02:00
Johannes M. Schmitt
0f9767a49e
Merge remote branch 'origin/master' into security
2011-05-24 14:58:41 +02:00
Peter Kruithof
0ca6f7966e
Global mapping file is not seen as class name anymore
2011-05-24 05:14:38 -07:00
Peter Kruithof
e655858498
Global mapping file is not seen as class name anymore
2011-05-24 05:13:27 -07:00
Johannes Schmitt
9c0db88851
updated to latest changes in Doctrine
2011-05-24 13:29:44 +02:00
Richard Miller
1744c86c18
Added calling methods for options to assetic filter configs
2011-05-24 10:49:49 +01:00
Fabien Potencier
5e1710f136
Merge remote branch 'alexandresalome/twig-bundle-extensions-cleanup'
...
* alexandresalome/twig-bundle-extensions-cleanup:
[TwigBundle] Remove authoring
[TwigBundle] Remove use ContainerInterface - not used
[TwigBundle] Move all class names to parameters of DIC
[TwigBundle] Rename TemplatingExtension to AssetsExtension
[TwigBundle] Move the code filters to a dedicated extensions
[TwigBundle] Change the dependency of ActionsExtension to the actions helper
[TwigBundle] Move the {% render ... %} node to a dedicated extension + Remove service container
2011-05-24 10:57:29 +02:00
alexandresalome
b1a26b8829
[TwigBundle] Remove authoring
2011-05-24 10:56:45 +02:00
alexandresalome
98755bc8a5
[TwigBundle] Remove use ContainerInterface - not used
2011-05-24 10:56:45 +02:00
alexandresalome
dfdd26d6c4
[TwigBundle] Move all class names to parameters of DIC
2011-05-24 10:56:45 +02:00
alexandresalome
f13798fa5e
[TwigBundle] Rename TemplatingExtension to AssetsExtension
...
This extension now only contains assets functions
2011-05-24 10:56:45 +02:00
alexandresalome
f83c1376a1
[TwigBundle] Move the code filters to a dedicated extensions
...
A dedicated extension now exists for the code-related filters for Twig.
The dependency to service_container was also removed, to use CodeHelper, instead
2011-05-24 10:56:45 +02:00
alexandresalome
73bd9c72af
[TwigBundle] Change the dependency of ActionsExtension to the actions helper
...
The logical of moving $attributes to a value of $options is already present
in the PHP templating helper.
2011-05-24 10:56:45 +02:00
alexandresalome
3cdf371c2b
[TwigBundle] Move the {% render ... %} node to a dedicated extension + Remove service container
...
The purpose of the TemplatingExtension is ambigous. This first step move the actions logical
to a dedicated extension and reduce the dependency to the HTTP Kernel.
2011-05-24 10:56:45 +02:00
hlecorche
400de9c541
IntegerToLocalizedStringTransformer must return "null" if input value is null
2011-05-24 10:52:28 +02:00