diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,601 Commits 24 Branches 563 Tags 228 MiB
adb9aaf47d
Commit Graph

2421 Commits

Author SHA1 Message Date
Fabien Potencier
65200aa86a added missing license headers 2011-05-31 10:57:06 +02:00
Fabien Potencier
839c332438 moved all listener classes under a common EventListener sub-namespace 2011-05-31 10:43:20 +02:00
Johannes Schmitt
bee6a48f97 [FrameworkBundle] add the old method naming convention 2011-05-31 08:58:24 +02:00
Fabien Potencier
02605f3481 merged origin/master 2011-05-31 08:34:05 +02:00
Fabien Potencier
2e56703a32 [SecurityBundle] fixed error_log() being called during functional tests 2011-05-31 08:02:18 +02:00
Katsuhiro OGAWA
57fa3af441 [FrameworkBundle] Fixed signature of the Controller::createForm() to accept string type 2011-05-31 11:02:49 +09:00
Fabien Potencier
988355993a refactored Profiler class 2011-05-30 22:25:25 +02:00
Victor Berchet
b61929bf4a [Form] The variable stack should not persist between section rendering (fixes #1157) 2011-05-30 19:25:02 +02:00
Vyacheslav Slinko
683d452a3a [AsseticBundle] Fixed typo in use statement 2011-05-30 18:50:07 +04:00
Fabien Potencier
57fb1ba399 [FrameworkBundle] fixed typo 2011-05-30 16:27:38 +02:00
Fabien Potencier
5cffd9139b [FrameworkBundle] fixed typo 2011-05-30 16:25:43 +02:00
Fabien Potencier
c8f9904ac8 merged origin/master 2011-05-30 15:00:41 +02:00
Fabien Potencier
6731065626 tweaked priorities 2011-05-30 14:59:32 +02:00
Fabien Potencier
ea848be42f [SecurityBundle] added some cleanup 2011-05-30 14:59:18 +02:00
Fabien Potencier
9181e5dd0c merged origin/master 2011-05-30 14:28:54 +02:00
Fabien Potencier
9698669baa renamed RequestAttributeInitializingListener to RouterListener and 
SessionInitializingListener to SessionListener
 2011-05-30 14:22:13 +02:00
Johannes M. Schmitt
8837ce0e57 Merge branch 'master' of http://github.com/symfony/symfony into security 2011-05-30 10:00:07 +02:00
Fabien Potencier
5059559035 Merge remote branch 'Seldaek/events' into events1 
* Seldaek/events:
  [EventDispatcher] Removed temporary code
  [FrameworkBundle] Improved code readability
  [FrameworkBundle] Clarified code and fixed regression
  Update Core and Security events to latest model
  [EventDispatcher] Allow registration of arbitrary callbacks
  [EventDispatcher] Remove useless code
  [EventDispatcher] Minor memory optimization to getListeners()
  [FrameworkBundle] Small optimization, remove some function calls
 2011-05-30 08:58:49 +02:00
Fabien Potencier
ce6c049d3a Merge remote branch 'weaverryan/controller_form_methods' 
* weaverryan/controller_form_methods:
  [FrameworkBundle] Adding two form-related methods to the base controller
 2011-05-30 07:30:42 +02:00
Ryan Weaver
9f4e88ec17 [FrameworkBundle] Adding two form-related methods to the base controller 
With these two methods, the concept of a "form factory" doesn't need to be understood by a beginner to create forms.
 2011-05-29 23:00:31 -05:00
Pascal Borreli
824e48efa7 [Various] Fixed phpdoc 2011-05-29 23:33:36 +00:00
Pascal Borreli
50d5e3e007 [Various] Fixed typos 2011-05-29 22:24:32 +00:00
Fabien Potencier
6301728383 Merge remote branch 'pborreli/fixed-typos' 
* pborreli/fixed-typos:
  [Various] Fixed typo
  [FrameworkBundle] Fixed css
 2011-05-29 20:54:38 +02:00
Christophe Coevoet
15c5d61af8 Use an alias of translator.real instead of copying the definition 
Copying the definition leads to 2 different services which the same
definition but different instances.
 2011-05-29 18:56:45 +02:00
Pascal Borreli
46cdf02750 [Various] Fixed typo 2011-05-29 14:19:02 +00:00
Pascal Borreli
6b91af976d [FrameworkBundle] Fixed css 2011-05-29 14:18:15 +00:00
GordonsLondon
ef9dc7c623 [HttpFoundation] merge Response::isRedirected() with Response::isRedirect() - Response::isRedirected() has been removed 2011-05-29 15:34:02 +02:00
arjen
59b4b67548 Fixed Configuration 2011-05-29 10:37:24 +02:00
Johannes M. Schmitt
32d8d4547e fixed compiled class map 2011-05-29 09:35:58 +02:00
Fabien Potencier
54329387fd Merge remote branch 'ooflorent/patch-1' 
* ooflorent/patch-1:
  Made the profiler toolbar loading an XML HTTP request.
 2011-05-28 18:10:27 +02:00
Johannes Schmitt
786823151e changed injection type 2011-05-28 18:06:25 +02:00
Fabien Potencier
4054cbae29 Merge remote branch 'craue/patch-2' 
* craue/patch-2:
  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-28 18:02:59 +02:00
Johannes Schmitt
e3ddb81b38 added some tests for security/routing integration 2011-05-28 17:58:44 +02:00
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
f37386e336 Merge branch 'master' of git://github.com/symfony/symfony into security 2011-05-28 17:07:16 +02:00
kaiwa
cdf4b6aa77 Checked log levels 2011-05-27 20:29:51 +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
arjen
9012eacfd7 Fixed indenting 2011-05-27 16:04:32 +02:00
arjen
499282f278 [SwiftmailerBundle] Added support for AntiFloodPlugin 2011-05-27 15:03:46 +02: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
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
da09411e14 [SwiftmailerBundle] optimized code 2011-05-27 07:33:04 +02: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
Fabien Potencier
a0462593eb [DoctrineBundle] extracted code from Doctrine commands 2011-05-26 16:39:36 +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
48d6a95803 [FrameworkBundle] Small optimization, remove some function calls 2011-05-26 11:53:58 +02:00
Kai
a45d3eeeb6 Reverted last commit 2011-05-25 21:15:34 +02:00
Kai
529381b378 ControllerNotFound: Changed log level from info to error. Also moved 
throw exception code block up, to prevent the message from beeing
logged multiple times.
 2011-05-25 21:01:19 +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
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
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
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
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
Kai
7c29e8881f Changed log level of "Matched route ..." message from info to debug 2011-05-24 15:34:35 +02:00
Sven Paulus
4f39b9ae9b fix invalid schema in monolog bundle 2011-05-24 15:11:45 +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
Fabien Potencier
d03961ed03 Merge remote branch 'richardmiller/assetic_jpegtran_options' 
* richardmiller/assetic_jpegtran_options:
  Added call to setOptimize in config for assetic filter jpegtran
 2011-05-23 16:17:47 +02:00
Fabien Potencier
ab4352c5cd [DoctrineBundle] removed the annotation prefix in doctrine:mapping:import (this will work as soon as the EntityGenerator has been updated in Doctrine) 2011-05-23 15:48:29 +02:00
Richard Miller
e9548dc80c Added call to setOptimize in config for assetic filter jpegtran 2011-05-23 13:39:48 +01:00
Fabien Potencier
2636e36bbf [DoctrineBundle] fixed typo 2011-05-23 13:33:37 +02:00
ouardisoft
52c3bce52d Edited src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php via GitHub 2011-05-23 03:16:19 -07:00
Johannes Schmitt
4c245e03ea Merge remote branch 'origin/master' into doctrine 2011-05-23 08:39:01 +02:00
Johannes Schmitt
378c810f81 [DoctrineBundle] fixed regression 2011-05-23 08:38:26 +02:00
Fabien Potencier
9afcaad04a fixed CS 2011-05-23 07:56:15 +02:00
Johannes Schmitt
6c626ef0b9 [DoctrineBundle] fixed tests 2011-05-23 07:35:13 +02:00
Johannes Schmitt
51f1add9b3 Merge remote branch 'origin/master' into doctrine 2011-05-23 07:09:58 +02:00
Fabien Potencier
0d68470638 [FrameworkBundle] made a small cleanup 2011-05-22 08:47:38 +02:00
Fabien Potencier
a2a1a88291 Merge remote branch 'schmittjoh/annotations' 
* schmittjoh/annotations:
  removed obsolete compiler pass
  fixed some more tests
  fixed tests
  removed unused vendor
  some cleanups
  updated to latest changes
  [WebProfilerBundle] removed @ignorePhpDoc annotations
  [FrameworkBundle] fixed default
  [FrameworkBundle] updated configuration
  [Validator] updated fixtures
  updated UPDATE file
  updated Annotations integration
  [Routing] updated to changes
  [FrameworkBundle] added framework-wide annotation reader, updated validator tests
  [WebProfilerBundle] fixed controllers
  fixed unit tests
  added Annotations library
 2011-05-22 08:45:24 +02:00
Fabien Potencier
003fe6743d Merge remote branch 'vicb/form-render' 
* vicb/form-render:
  [Twig][Form] Optimize form rendering
 2011-05-22 08:19:20 +02:00
hidenorigoto
c9f188b658 [FrameworkBundle] replaced Util/Mustache to Generator/Generator 2011-05-22 00:10:22 +09:00
Victor Berchet
eb10c66a55 [Twig][Form] Optimize form rendering 2011-05-20 16:45:57 +02:00
Fabien Potencier
f3b92cb1ad [FrameworkBundle] renamed Mustache to Generator and moved it to a new Generator sub-namespace 2011-05-20 09:32:54 +02:00
Johannes Schmitt
ddc00fa0f6 removed obsolete compiler pass 2011-05-20 06:59:30 +02:00
Johannes Schmitt
98ed7dd030 fixed some more tests 2011-05-19 23:15:41 +02:00
Johannes Schmitt
6c0b0449a6 Merge remote branch 'origin/master' into annotations 
Conflicts:
	UPDATE.md
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
 2011-05-19 22:49:59 +02:00
Johannes Schmitt
42fb34b647 fixed tests 2011-05-19 22:46:34 +02:00
stealth35
286961c47f Removed unnecessary array_push 2011-05-19 18:11:22 +02:00
Johannes Schmitt
b70d7a7462 [DoctrineBundle] added some tests 2011-05-19 18:03:56 +02:00
Fabien Potencier
9fe1c3ae0e Merge remote branch 'bschussek/form' 
* bschussek/form: (22 commits)
  Fix merge error (function "guess" was in there twice)
  [Form] Added test case for bf2f9d2a02
  [Form] Form::isBound() and Form::isValid() work correctly now for read-only forms
  [Locale] Improved error reporting and added stubs for intl_is_failure(), intl_get_error_code() and intl_get_error_message()
  [Form] Implemented fix for 361c67f54f
  [Form] Add test for the handling of array values in the constraint violation
  [Form] Further simplified PropertyPath code
  [Form] Added test for 6c337d1cc0
  [Form] Removed unused option "pattern" of date and time type
  [Form] Renamed view variable "name" to "full_name"
  [Form] Renamed collection option "type_options" to "options" to be consistent with the repeated type
  [Form] CSRF documentation and a few CS changes
  [Form] Move CSRF options from types to the CSRF extension
  [Form] Added a search form field type
  [Form] Optimization of PropertyPath
  [Form] replace assertEquals by assertFalse, assertTrue, assertNull
  [Form] fix file permissions to 644 again ;)
  [Form] add tests for type_options in collectionType
  fix file permissions to 644
  [Form] add type_options for CollectionType to be abble to set options to type
  ...
 2011-05-19 16:25:30 +02:00
Fabien Potencier
75e7a7a76f Merge remote branch 'kriswallsmith/assetic/combine' 
* kriswallsmith/assetic/combine:
  [AsseticBundle] added missing filter to test
  [AsseticBundle] added config for cssimport filter
  [AsseticBundle] added config for packager filter
  [AsseticBundle] removed problematic test
  [AsseticBundle] fixed various bugs in PHP templating, added new "combine" option
 2011-05-19 15:47:35 +02:00
Fabien Potencier
c4232b11fa Merge remote branch 'beberlei/DoctrineUniqueValidator' 
* beberlei/DoctrineUniqueValidator:
  [Doctrine] Fix default value to null for entity manager to make fluent integration with Doctrine Registry work
  [Doctrine] Add fields as default option and allow strings to be passed.
  [Doctrine] Add DoctrineBundle integration (DI Container registration) for the UniqueEntityValidator
  [Doctrine] Implement suggested changes by Stof, added functional test to verify unique validator works.
  [Doctrine] Add Unique Validator
 2011-05-19 15:38:20 +02:00
Kris Wallsmith
4f37b9e9fb [AsseticBundle] added missing filter to test 2011-05-19 05:55:36 -07:00
Kris Wallsmith
fa248e00fb [AsseticBundle] added config for cssimport filter 2011-05-19 05:55:36 -07:00
Kris Wallsmith
e74c6edc34 [AsseticBundle] added config for packager filter 2011-05-19 05:55:36 -07:00
Kris Wallsmith
7ed5518554 [AsseticBundle] removed problematic test 2011-05-19 05:55:35 -07:00
Kris Wallsmith
7eeb945a4c [AsseticBundle] fixed various bugs in PHP templating, added new "combine" option 2011-05-19 05:55:35 -07:00
Johannes Schmitt
dbf577cc2b [DoctrineBundle] use dot instead of slash 2011-05-19 14:44:28 +02:00
Johannes Schmitt
0d16ceed9b [DoctrineBundle] allow entities in sub directories 2011-05-19 14:41:23 +02:00
Johannes Schmitt
5b007e3ae2 Merge remote branch 'origin/master' into doctrine 2011-05-19 14:34:24 +02:00
Bernhard Schussek
dcc61a9a98 Merge remote branch 'shieldo/search_field' into shieldo_merge 2011-05-19 01:41:59 +02:00
Benjamin Eberlei
86f9b17254 [Doctrine] Add DoctrineBundle integration (DI Container registration) for the UniqueEntityValidator 2011-05-18 23:09:46 +02:00
Bernhard Schussek
216d7e415d Merge remote branch 'mweimerskirch/form_pattern_attribute' into mweimerskirch_merge 
Conflicts:
	src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
	src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
	src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
 2011-05-18 22:49:27 +02:00
Bernhard Schussek
f467317bab [Form] Renamed view variable "name" to "full_name" 
The variable "name" now contains the local, short name (equivalent to $form->getName()).
 2011-05-18 22:16:16 +02:00
Fabien Potencier
a15e846568 added a way to disable forms, and force validation to be enabled when forms are enabled (closes #840) 2011-05-18 15:45:34 +02:00
Johannes Schmitt
0eb7564f7d Merge remote branch 'origin/master' into security 
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Listener/RequestAttributeInitializingListener.php
 2011-05-18 12:54:47 +02:00
Fabien Potencier
0687aadad2 fixed form configuration when no session is available (closes #841) 2011-05-18 12:54:16 +02:00
Fabien Potencier
fdbdcbbd0a Merge remote branch 'kriswallsmith/assetic/dump-fixes' 
* kriswallsmith/assetic/dump-fixes:
  [AsseticBundle] fixed command unit test
  [AsseticBundle] added env and debug mode to assetic:dump output
  [AsseticBundle] made --watch sleep period a command option
  [AsseticBundle] added a --force option to assetic:dump --watch
  [AsseticBundle] fixed typo in dump --watch
 2011-05-17 22:06:51 +02:00
Kris Wallsmith
8e85a36e37 [FrameworkBundle] fixed renamed routing exception 2011-05-17 12:55:24 -07:00
Kris Wallsmith
f29aba534c [AsseticBundle] fixed command unit test 2011-05-17 12:27:39 -07:00
Kris Wallsmith
26a31bfc9d [AsseticBundle] added env and debug mode to assetic:dump output 2011-05-17 12:13:17 -07:00
Kris Wallsmith
e65a4535b5 [AsseticBundle] made --watch sleep period a command option 2011-05-17 12:08:14 -07:00
Kris Wallsmith
84d5cbfba8 [AsseticBundle] added a --force option to assetic:dump --watch 2011-05-17 12:05:01 -07:00
Kris Wallsmith
5877b11478 [AsseticBundle] fixed typo in dump --watch 2011-05-17 11:57:44 -07:00
Fabien Potencier
68a0b7aded Merge remote branch 'kriswallsmith/framework/package-config-fix' 
* kriswallsmith/framework/package-config-fix:
  [FrameworkBundle] updated extension to use replaceArgument() rather than a parameter
 2011-05-17 19:04:47 +02:00
Kris Wallsmith
1a49296b59 [FrameworkBundle] updated extension to use replaceArgument() rather than a parameter 2011-05-17 09:53:42 -07:00
Fabien Potencier
7b4c12b7dc Merge remote branch 'ornicar/twigAssetsVersion' 
* ornicar/twigAssetsVersion:
  Add `assets_version` twig function. Also add some phpDoc.
 2011-05-17 18:48:53 +02:00
Fabien Potencier
eb202bb7b7 merged kriswallsmith/form/csrf-intention 2011-05-17 15:25:50 +02:00
Fabien Potencier
02e77ec4e3 [Routing] moved Matcher exceptions 2011-05-17 10:11:27 +02:00
Fabien Potencier
3d85008141 Merge remote branch 'danielholmes/widget_templates' 
* danielholmes/widget_templates:
  [TwigBundle] fixed form templates so divs won't have all the input attributes, some of which are invalid (such as required, maxlength, name, etc)
 2011-05-17 09:19:03 +02:00
Johannes Schmitt
54ae90d36d some cleanups 2011-05-17 07:41:49 +02:00
Johannes Schmitt
44950ddb77 updated to latest changes 2011-05-17 07:24:33 +02:00
Kris Wallsmith
b645278f8b [Security] updated with "intention" 2011-05-16 14:16:30 -07:00
Johannes Schmitt
796d9af0c4 some updates 2011-05-16 22:26:24 +02:00
Kris Wallsmith
663f8a052e [AsseticBundle] added configuration for cssembed filter 2011-05-16 07:05:07 -07:00
Fabien Potencier
122a61b5cc Merge remote branch 'kriswallsmith/assetic/filter-pass-fix' 
* kriswallsmith/assetic/filter-pass-fix:
  [AsseticBundle] fixed previous PR
 2011-05-16 08:22:56 +02:00
Fabien Potencier
3949b8e3f1 [FrameworkBundle] fixed redirect controller when a non-standard port is used (closes #965) 2011-05-16 08:21:58 +02:00
Kris Wallsmith
70bac0ac01 [AsseticBundle] fixed previous PR 2011-05-15 23:17:27 -07:00
Fabien Potencier
1b71e35770 Merge remote branch 'kriswallsmith/assetic/filter-pass-fix' 
* kriswallsmith/assetic/filter-pass-fix:
  [AsseticBundle] fixed compiler pass when closure filter is enabled but no jar registered
 2011-05-16 07:52:14 +02:00
Fabien Potencier
dc0c5de2c0 Merge remote branch 'arnaud-lb/fix-validator-config' 
* arnaud-lb/fix-validator-config:
  defined parameters to avoid unmet dependency
 2011-05-16 07:47:51 +02:00
Fabien Potencier
6a30213f79 Merge remote branch 'weaverryan/doctrine_schema_command_language_update' 
* weaverryan/doctrine_schema_command_language_update:
  [DoctrineBundle] Refactoring doctrine:schema:* command descriptions
 2011-05-16 07:47:08 +02:00
Kris Wallsmith
031bb4f93c [AsseticBundle] fixed compiler pass when closure filter is enabled but no jar registered 2011-05-15 14:46:07 -07:00
Ryan Weaver
336c57d56f [DoctrineBundle] Refactoring doctrine:schema:* command descriptions 
I found the language to be a bit technical, and therefore not totally obvious what these tasks do to the layman.

The language here tries to talk more about "generating/executing SQL" so that people know that these are the commands that handle DB table changes.
 2011-05-15 15:52:19 -05:00
Arnaud Le Blanc
421a05f6b4 defined parameters to avoid unmet dependency 
These parameters are set by the extension; but
validator.mapping.loader.annotation_loader.namespaces is not set when
annotations are disabled
 2011-05-15 21:32:41 +02:00
Henrik Bjørnskov
52f2266bb7 [FrameworkBundle] Empty annotation namespaces parameter because it is referenced in validator.xml 2011-05-15 20:08:48 +02:00
Douglas Greenshields
bf2f9d2a02 [Form] Added a search form field type 2011-05-15 18:31:36 +01:00
Fabien Potencier
fd3a853597 Merge remote branch 'kriswallsmith/assetic/auto-filters' 
* kriswallsmith/assetic/auto-filters:
  [AsseticBundle] parameter cleanup
  [AsseticBundle] updated apply_to configuration to accept an array of patterns
  [AsseticBundle] added configuration for automatically apply filters to assets based on target path
 2011-05-15 19:20:24 +02:00
Kris Wallsmith
09a60c2b32 [AsseticBundle] parameter cleanup 2011-05-15 09:40:45 -07:00
Kris Wallsmith
c0dcb7caad [AsseticBundle] updated apply_to configuration to accept an array of patterns 2011-05-15 09:38:59 -07:00
Johannes Schmitt
8e5b11a226 Merge remote branch 'origin/master' into annotations 2011-05-15 18:35:25 +02:00
Arnaud Le Blanc
e57e5537b6 Fixed validators config causing no validation to happen 
The parameter in <argument type="collection">%parameter...%</argument>
was ignored due to type="collection".
 2011-05-15 16:50:49 +02:00
Johannes Schmitt
913d2b3fae [DoctrineBundle] updated implementation 2011-05-15 11:02:42 +02:00
Johannes Schmitt
ff4a2209e3 [DoctrineBundle] changes the naming convention for YML, and XML metadata files 2011-05-15 11:00:00 +02:00
Kris Wallsmith
4ae40f1ea4 [AsseticBundle] added configuration for automatically apply filters to assets based on target path 2011-05-15 01:48:13 -07:00
Kris Wallsmith
7f7ea42870 [AsseticBundle] added setting asset root when using bundle notation 2011-05-14 22:15:40 -07:00
Kris Wallsmith
b1738845e9 [AsseticBundle] updated for changes in Assetic 2011-05-14 21:51:18 -07:00
Fabien Potencier
9e407d7e91 Merge remote branch 'kriswallsmith/assetic/asset-config' 
* kriswallsmith/assetic/asset-config:
  Revert "[AsseticBundle] updated configuration to assume values with integer keys are inputs"
  [AsseticBundle] updated configuration to assume values with integer keys are inputs
  [AsseticBundle] made test of route loader less brittle
  [AsseticBundle] added the ability to define assets outside of the view layer
  [AsseticBundle] injected container into factory for better stability
 2011-05-14 22:57:26 +02:00
Fabien Potencier
1e7108d624 Merge remote branch 'stloyd/tests_fix' 
* stloyd/tests_fix:
  Skip tests if some vendor are not available (prevents fatal errors)
 2011-05-14 17:27:52 +02:00
Johannes Schmitt
e516b215f8 updated tests 2011-05-14 13:25:04 +02:00
Johannes Schmitt
eb1b7f1e46 fixed namespace + class 2011-05-14 13:25:03 +02:00
Johannes Schmitt
a97e8b82d0 [FrameworkBundle][SecurityBundle] fixes a regression in the listener order 2011-05-14 13:25:02 +02:00
Johannes Schmitt
2d8afd8dd6 Merge remote branch 'origin/master' into annotations 
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
 2011-05-14 12:51:05 +02:00
Johannes Schmitt
5da7896191 [FrameworkBundle] fixes a regression 2011-05-14 12:37:11 +02:00
stloyd
039292bb94 Skip tests if some vendor are not available (prevents fatal errors) 2011-05-14 12:23:40 +02:00
Fabien Potencier
9687d1661b Merge remote branch 'bschussek/form_validator' 
* bschussek/form_validator:
  [Form] Renamed the value "text" of the "widget" option of the "date" type to "single-text"
  [Form] Implemented getAllowedOptionValues() for core types
  [Form] Removed unused option
  [Form] Added FormTypeInterface::getAllowedOptionValues() to better validate passed options
  [Form] Improved test coverage of FormFactory and improved error handling
  [Form] Added getType() to FormFactoryInterface
  [Validator] Refactoring DateTimeValidator and DateValidator
  [Validator] Date: check if the value is a DateTime instance
 2011-05-14 10:59:02 +02:00
Bernhard Schussek
e0ff61949e [Form] Renamed the value "text" of the "widget" option of the "date" type to "single-text" 2011-05-13 19:17:28 +02:00
Fabien Potencier
8dbccc7a8b [WebProfilerBundle] re-introduced parameters in the DIC for better overridability 2011-05-13 14:34:19 +02:00
Fabien Potencier
4525eb9690 [AsseticBundle] re-introduced parameters in the DIC for better overridability 2011-05-13 14:34:18 +02:00
Fabien Potencier
f7aea2a830 [FrameworkBundle] re-introduced parameters in the DIC for better overridability 2011-05-13 14:34:17 +02:00
Fabien Potencier
05a946bf9d [DoctrineBundle] re-introduced parameters in the DIC for better overridability 2011-05-13 14:34:16 +02:00
Fabien Potencier
0de8a55f02 [SecurityBundle] re-introduced parameters in the DIC for better overridability 2011-05-13 14:34:14 +02:00
Fabien Potencier
3a16f3141a Merge remote branch 'lenar/monolog-group-handler' 
* lenar/monolog-group-handler:
  [MonologBundle] Add AbstractProcessingHandler to list of compiled classes
  [MonologBundle] Fix schema XML (_ -> -)
  [MonologBundle] Fix config definitions, remove now-redundant tests
  [MonologBundle] Add missing GroupHandler schema definitions
  [MonologBundle] Add missing MailHandler schema definitions
  [MonologBundle] Add support for GroupHandler
 2011-05-12 14:40:28 +02:00
lenar
0985f16030 [MonologBundle] Add AbstractProcessingHandler to list of compiled classes 2011-05-12 12:18:56 +03:00
lenar
d6d3516d84 [MonologBundle] Fix schema XML (_ -> -) 2011-05-12 12:02:03 +03:00
lenar
b734a63b81 [MonologBundle] Fix config definitions, remove now-redundant tests 2011-05-12 11:31:53 +03:00
lenar
b8f57c4bcd [MonologBundle] Add missing GroupHandler schema definitions 2011-05-12 10:52:47 +03:00
lenar
20c77ac400 [MonologBundle] Add missing MailHandler schema definitions 2011-05-12 10:50:32 +03:00
Fabien Potencier
0bad012290 [FrameworkBundle] changed template string by TemplateReference instances in ExceptionController 2011-05-11 18:33:59 +02:00
Fabien Potencier
514b47c6d4 [FrameworkBundle] added a simple way to customize errors according to the HTTP status code 2011-05-11 18:02:50 +02:00
lenar
40795fcc5d [MonologBundle] Add support for GroupHandler 2011-05-11 12:17:04 +03:00
Fabien Potencier
7941ff61f0 [FrameworkBundle] added a note 2011-05-11 11:05:57 +02:00
Fabien Potencier
09de9fe85f Merge remote branch 'danielholmes/client_kernel_shutdown' 
* danielholmes/client_kernel_shutdown:
  [FrameworkBundle] added a check in Client to only shutdown the kernel if a previous request has been made
 2011-05-11 11:04:14 +02:00
Fabien Potencier
e2df25b43a made a slight change to the previous merge 2011-05-11 10:45:23 +02:00
Fabien Potencier
b7d64c5304 Merge remote branch 'danielholmes/functional_test_changes' 
* danielholmes/functional_test_changes:
  [FrameworkBundle] fixed CS
  [FrameworkBundle][HttpKernel] added a default tearDown on the WebTestCase which will shut down the currently used kernel (if there is one) in Web functional tests
 2011-05-11 10:33:23 +02:00
Fabien Potencier
2d1113ea8d Merge remote branch 'Seldaek/doctrine_fix' 
* Seldaek/doctrine_fix:
  [DoctrineBundle] Do not try to fetch doctrine listeners if doctrine is not enabled
 2011-05-11 10:01:12 +02:00
Martin Hason
7f95ea69aa [FrameworkBundle] Validator messages: added Czech translation 2011-05-10 14:18:57 +02:00
Jordi Boggiano
c2a8ca782b [DoctrineBundle] Do not try to fetch doctrine listeners if doctrine is not enabled 2011-05-10 14:10:24 +02:00
Fabien Potencier
3854d34c14 [DoctrineBundle] fixed doctrine:generate:entity command when the entity to generate has sub-namespaces 2011-05-10 08:20:57 +02:00
Kris Wallsmith
b25750daa9 Revert "[AsseticBundle] updated configuration to assume values with integer keys are inputs" 
This reverts commit fb104cedf8.
 2011-05-09 14:58:30 -07:00
Kris Wallsmith
fb104cedf8 [AsseticBundle] updated configuration to assume values with integer keys are inputs 2011-05-09 08:14:00 -07:00
lenar
7cc2a7918c fixes monolog+swiftmailer 2011-05-09 18:03:38 +03:00
Christophe Coevoet
193c6acfc0 [MonologBundle] Fixed SwiftMailerHandler by using the mailer as message factory 2011-05-09 16:35:02 +02:00