Commit Graph

2329 Commits

Author SHA1 Message Date
Katsuhiro OGAWA
16a40f6112 [FrameworkBundle] Fixed phpdoc. 2011-06-01 17:45:51 +09:00
Fabien Potencier
481d684973 Merge remote branch 'vslinko/master'
* vslinko/master:
  [AsseticBundle] Fixed typo in use statement
2011-06-01 10:40:16 +02:00
Fabien Potencier
885da2ef87 Merge remote branch 'kriswallsmith/assetic/parameter-replacement'
* kriswallsmith/assetic/parameter-replacement:
  [AsseticBundle] added support for parameter replacement in asset inputs
2011-06-01 10:35:43 +02:00
Fabien Potencier
c8034c04a8 Merge remote branch 'vicb/form-rendering'
* vicb/form-rendering:
  [Form] The variable stack should not persist between section rendering (fixes #1157)
  [Twig][Form] Tweak form extension phpDoc and code
  [Form] Tweak phpDoc
  [FormView] fix phpDoc
  [Form] Some tweaks
2011-06-01 10:32:40 +02:00
stloyd
7b6d921cde [Form] Added tests for previous commit 2011-06-01 10:08:18 +02:00
Fabien Potencier
cf78841111 [WebProfilerController] cleaned up the controller 2011-06-01 07:44:52 +02:00
Kris Wallsmith
3e68eb61a5 [AsseticBundle] added support for parameter replacement in asset inputs
{% javascripts '%kernel.root_dir%/Resources/css/main.css' %}
    ...
    {% endjavascripts %}
2011-05-31 21:35:31 -07:00
stloyd
cb22ccc516 [Form] Added missing feature for adding attributes to an field label 2011-05-31 17:01:28 +02:00
Kris Wallsmith
d9f5c99fab [FrameworkBundle] updated for templating changes, added http/ssl logic 2011-05-31 06:46:30 -07:00
Fabien Potencier
af84cfec33 [DoctrineBundle] fixed doctrine:generate:entity 2011-05-31 15:15:18 +02:00
arjen
df02c05271 Removed plugin from SF 2011-05-31 14:31:23 +02:00
arjen
ed4f659693 [SwiftmailerBundle] Added ImpersonateSenderPlugin 2011-05-31 13:34:06 +02:00
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
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
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
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