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

4385 Commits

Author SHA1 Message Date
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
Victor Berchet
2db53b5e28 [Form] Order method according to their visibility to respect the CS 2011-05-11 11:00:32 +02:00
Victor Berchet
5536d41906 [Form] Add phpDoc for form builder and fix method declaration order to conform to the CS 2011-05-11 11:00:32 +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
1ae5ef6849 Merge remote branch 'vicb/form-padded-choice-list' 
* vicb/form-padded-choice-list:
  [Form] Allow for arbitrary keys in PaddedChoiceList
 2011-05-11 10:18:30 +02:00
Fabien Potencier
9abd53c2b4 merged Seldaek/serializer_fix 2011-05-11 10:16:15 +02:00
Fabien Potencier
a05b8fbb19 Merge remote branch 'schmittjoh/security' 
* schmittjoh/security:
  [HttpFoundation] fixed php doc
  updated UPDATE file
  [Security] use deep flag when retrieving username + password
  [HttpFoundation] added $deep flag to Request::get()
  [HttpFoundation] removed getDeep(), added a boolean flag to get() instead
 2011-05-11 10:14:15 +02:00
Fabien Potencier
b62cd109f0 Merge remote branch 'vicb/form-fixes' 
* vicb/form-fixes:
  [Form] Make the PropertyPathMapper class use the UnexpectedTypeException
  [Form] Fix adding transformers in the FormBuilder
  [Form] Fix the ReversedTransform class
 2011-05-11 10:13:24 +02:00
Fabien Potencier
9651175914 Merge remote branch 'vicb/form-transformers' 
* vicb/form-transformers:
  [Form] Add argument type checking in BaseDateTimeTransformer
  [Form] Catch exceptions in DataTransformers
 2011-05-11 10:12:23 +02:00
Fabien Potencier
723a8f2bf3 [Form] fixed CS 2011-05-11 10:09:27 +02:00
Fabien Potencier
534cf8fce7 Merge remote branch 'vicb/form-tz-choice-list' 
* vicb/form-tz-choice-list:
  [Form] Make TimezoneChoiceList implement ChoiceListInterface rather than extend ArrayChoiceList
 2011-05-11 10:07:35 +02:00
Fabien Potencier
74adb80cb8 Merge remote branch 'kertz/sqlite3_timeout' 
* kertz/sqlite3_timeout:
  added busyTimeout
 2011-05-11 10:06:25 +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
Victor Berchet
adef14f687 [Form] Make the PropertyPathMapper class use the UnexpectedTypeException 2011-05-10 20:25:46 +02:00
Victor Berchet
daccf9bc17 [Form] Fix adding transformers in the FormBuilder 2011-05-10 20:25:30 +02:00
Victor Berchet
486294b50b [Form] Fix the ReversedTransform class 2011-05-10 20:25:22 +02:00
Johannes Schmitt
7a6638ff8f [HttpFoundation] fixed php doc 2011-05-10 20:24:58 +02:00
Victor Berchet
2e68801ff3 [Form] Add argument type checking in BaseDateTimeTransformer 2011-05-10 20:21:02 +02:00
Victor Berchet
dac798c791 [Form] Catch exceptions in DataTransformers 2011-05-10 20:21:02 +02:00
Victor Berchet
aa71d16812 [Form] Make TimezoneChoiceList implement ChoiceListInterface rather than extend ArrayChoiceList 2011-05-10 20:14:11 +02:00
Amal Raghav
acb657b82c added busyTimeout 2011-05-10 23:43:11 +05:30
Fabien Potencier
9cc7aacf76 Merge remote branch 'usefulthink/phpdoc-containeraware' 
* usefulthink/phpdoc-containeraware:
  removed obsolete use-statement
  [DependencyInjection] added phpdoc for property $container in ContainerAware
 2011-05-10 19:09:55 +02:00
Fabien Potencier
f9fefd306d Merge remote branch 'vicb/form-phpdoc' 
* vicb/form-phpdoc:
  [Form] Fix some phpDoc
  [Form] fix and add some phpDoc
 2011-05-10 19:08:53 +02:00
Fabien Potencier
579db9a9d5 Merge remote branch 'hason/czechmessages' 
* hason/czechmessages:
  [FrameworkBundle] Validator messages: added Czech translation
 2011-05-10 19:02:34 +02:00
Victor Berchet
2d62dfdf83 [Form] Fix some phpDoc 2011-05-10 16:55:05 +02:00
Martin Schuhfuss
9112d8c2d3 removed obsolete use-statement 2011-05-10 16:34:44 +02:00
Martin Schuhfuss
5387532ff2 [DependencyInjection] added phpdoc for property $container in ContainerAware 
This should ease code-completion a little bit...
 2011-05-10 16:30:58 +02:00
Victor Berchet
2a8f2d2bfa [Form] fix and add some phpDoc 2011-05-10 15:33:02 +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
John Wards
d96e2c5d79 [Validator] Adding support for Closure in CallbackValidator 
Usage:
$formBuilder = $this->get('form.factory')
            ->createBuilder('form');
$formBuilder->setAttribute('validation_constraint', new Callback(array("methods"=>array(
    'validate' => function ($data, $context) use ($elements) {
       // logic to add violations depending on the elements
    }
))));
 2011-05-10 12:12:18 +01:00
Johannes Schmitt
9408ab3010 [Security] use deep flag when retrieving username + password 2011-05-10 11:22:28 +02:00
Johannes Schmitt
411659bc07 [HttpFoundation] added $deep flag to Request::get() 2011-05-10 11:19:22 +02:00
Johannes Schmitt
89f60e04d1 [HttpFoundation] removed getDeep(), added a boolean flag to get() instead 2011-05-10 11:16:25 +02:00
Jordi Boggiano
9e19e772bc [Serializer] Restored docblocks from the deleted methods on SerializerInterface 2011-05-10 09:27:20 +02:00
Jordi Boggiano
457dc105bc [Serializer] minor optimization 2011-05-10 09:19:55 +02:00
Jordi Boggiano
99c67134fe [Serializer] Split decoder/encoder maps 2011-05-10 09:17:33 +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
Fabien Potencier
9844685a40 [HttpKernel] tweaked the default ESI cache strategy 2011-05-09 19:28:36 +02:00
Fabien Potencier
80a5074746 [Form] tweaked code (closes #855) 2011-05-09 17:53:18 +02:00
Jordi Boggiano
e6a02482c7 [Serializer] Cleaned up SerializerAwareInterface 2011-05-09 17:43:50 +02: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
Kris Wallsmith
94bd1c4655 [AsseticBundle] made test of route loader less brittle 2011-05-09 06:32:06 -07:00
Fabien Potencier
05e75e2712 [Finder] made the Custom filter accept all PHP callbacks 2011-05-09 15:30:41 +02:00
Victor Berchet
e0f03471ae Merge branch 'master' into form-padded-choice-list 2011-05-09 15:30:04 +02:00
Fabien Potencier
e1c52764ce [Finder] refactored SortableIterator 2011-05-09 15:14:42 +02:00
Kris Wallsmith
e8e87e65f7 [AsseticBundle] added the ability to define assets outside of the view layer 
In config.yml:

    assetic:
        assets:
            jquery: js/jquery.js
            plugin1:
                - @jquery
                - js/jquery.plugin1.js
            all_js:
                - @plugin1
                filters: ?yui_js
            all_css:
				- css/*.scss
                filters: [ scss, ?yui_css ]
        filters:
            yui_css:
                jar: %kernel.root_dir%/Resources/java/yui.jar
            yui_js:
                jar: %kernel.root_dir%/Resources/java/yui.jar
            scss: ~

In Twig:

    {% javascripts '@all_js' %}
    <script src="{{ asset_url }}"></script>
    {% endjavascripts %}

    {% stylesheets '@all_css' %}
    <link href="{{ asset_url }}" type="text/css" rel="stylesheet" />
    {% endstylesheets %}
 2011-05-09 05:40:14 -07:00
Fabien Potencier
50c1cce014 Merge remote branch 'schmittjoh/security' 
* schmittjoh/security:
  [HttpFoundation] added unit test
  [Security][HttpFoundation] splits Request::hasSession() into hasSession(), and hasPreviousSession()
  [SecurityBundle] added some tests
  add provider to configuration
  update DI to handle change in config and another provider
  separate dbal specific acl config
  add provider to configuration
  update DI to handle change in config and another provider
  separate dbal specific acl config
 2011-05-09 14:26:36 +02:00
Kris Wallsmith
57251712e8 [AsseticBundle] injected container into factory for better stability 2011-05-09 05:24:47 -07:00
Fabien Potencier
4bb82451df Merge remote branch 'Seldaek/session_warn' 
* Seldaek/session_warn:
  [HttpFoundation] Remove warnings when session id isn't given
 2011-05-09 14:14:17 +02:00
Fabien Potencier
b1f91f8ddc Merge remote branch 'Seldaek/session_storage' 
* Seldaek/session_storage:
  [FrameworkBundle] Do not override the session storage for test
 2011-05-09 14:13:19 +02:00
Jordi Boggiano
f8447aa74c [Serializer] NormalizableInterface now takes a Serializer and make sure the is always optional 2011-05-09 13:59:54 +02:00
Fabien Potencier
757dcb3b4c Merge remote branch 'stof/monolog_compiled_classes' 
* stof/monolog_compiled_classes:
  [MonologBundle] Fixed compiled classes
 2011-05-09 13:54:08 +02:00
Fabien Potencier
7dab0e1190 Merge remote branch 'yethee/form_fixes' 
* yethee/form_fixes:
  [Form] Added missing import statement of namespaces.
 2011-05-09 13:53:50 +02:00
Fabien Potencier
0c46797a35 fixed CS 2011-05-09 13:52:49 +02:00
Fabien Potencier
9286f78116 Merge remote branch 'usefulthink/windows-symlink-errormessage' 
* usefulthink/windows-symlink-errormessage:
  [FrameworkBundle] added errormessage for windows in AssetsInstallCommand
 2011-05-09 13:52:05 +02:00
jsor
e4c87cf558 Corrected german spelling of email (See: http://de.wikipedia.org/wiki/E-Mail#Artikel_und_Schreibweise) 2011-05-09 13:47:57 +02:00
Christophe Coevoet
47a2e25bfa [MonologBundle] Fixed compiled classes 2011-05-09 13:07:45 +02:00
Deni
a15abc09bd [Form] Added missing import statement of namespaces. 2011-05-09 14:30:04 +04:00
Martin Schuhfuss
ad41d21675 [FrameworkBundle] added errormessage for windows in AssetsInstallCommand 
As it has recently been discussed [on the mailing-list][1], windows doesn't
support symlinks for the assets:install command. In order to avoid a 'call to
undefined-function'-message in this case, this patch adds an exception which
will be thrown when the symlink-funktion isn't present and the
`--symlink`-Option was specified.

[1]: https://groups.google.com/group/symfony-devs/browse_thread/thread/4b8ad9634bdab155
 2011-05-09 12:11:54 +02:00
Fabien Potencier
e1e365d75a Merge remote branch 'udat/translator-typo' 
* udat/translator-typo:
  [FrameworkBundle] Fixed typo
 2011-05-09 09:01:26 +02:00
Fabien Potencier
d7a97f441c Merge remote branch 'maoueh/acl_security_config_fix' 
* maoueh/acl_security_config_fix:
  [Security\Acl] Fixed hardcoded table names  * Replaced hardcoded table names by acl configuration options
 2011-05-09 08:59:43 +02:00
Fabien Potencier
cde14d181a Merge remote branch 'stof/profiler' 
* stof/profiler:
  [FrameworkBundle] Changed the priority of the ProfilerListener
 2011-05-09 08:58:06 +02:00
Fabien Potencier
7a509cd199 Merge remote branch 'pborreli/toString-fix' 
* pborreli/toString-fix:
  [Validator] Fixing method_exists
 2011-05-09 08:57:41 +02:00
Fabien Potencier
5d55b231bb merged monolog 2011-05-09 08:56:30 +02:00
Fabien Potencier
a756553dd5 Merge remote branch 'lsmith77/get_set_normalizer_typo_fix' 
* lsmith77/get_set_normalizer_typo_fix:
  typo fix
 2011-05-09 08:51:57 +02:00
Fabien Potencier
b99b1e1e59 Merge remote branch 'kriswallsmith/assetic/dump-fix' 
* kriswallsmith/assetic/dump-fix:
  [AsseticBundle] made some methods private
  [AsseticBundle] added a test of dumping in debug mode
  [AsseticBundle] added test of dumping one asset
  [AsseticBundle] added the beginnings of a test class for the assetic:dump command
  [AsseticBundle] updated dump command to dump leaf assets per debug mode
  [AsseticBundle] rearranged execute() method
  [AsseticBundle] moved debug flag to object property
  [AsseticBundle] moved asset manager to object property
  [AsseticBundle] moved base path to object property
 2011-05-09 08:51:39 +02:00
Christophe Coevoet
d8e6ab7f7a [MonologBundle] Added the support of SwiftMailerHandler and NativeMailerHandler 2011-05-08 21:07:00 +02:00
Artur Kotyrba
1985333583 [FrameworkBundle] Fixed typo 2011-05-08 21:02:16 +02:00
Christophe Coevoet
a4a40f57cd [MonologBundle] Moved default values to the Configuration class 2011-05-08 19:52:38 +02:00
Jordi Boggiano
3b88608d85 [Serializer] Fixed typo 2011-05-08 18:34:06 +02:00
Jordi Boggiano
9311b0a7e5 [Serializer] Removed properties argument 2011-05-08 18:32:22 +02:00
Jordi Boggiano
89e056bb8b [Serializer] Renamed AbstractEncoder/Normalizer to SerializerAwareEncoder/Normalizer 2011-05-08 18:20:53 +02:00
Jordi Boggiano
1f8defaeeb [Serializer] JsonEncoder doesn't need SerializerAware anymore 2011-05-08 18:17:42 +02:00
Jordi Boggiano
24dcfef33f [Serializer] Added NormalizationAwareInterface 2011-05-08 18:16:53 +02:00
Jordi Boggiano
c20b4a3950 [Serializer] Cleaned up NormalizerInterface 2011-05-08 18:15:00 +02:00
Jordi Boggiano
4104c7b073 [Serializer] Inlined back the logic from isStructuredType and removed the method 2011-05-08 18:14:44 +02:00
Jordi Boggiano
3ecc9602e4 [Serializer] Add checks for SerializerAwareInterface 2011-05-08 17:54:55 +02:00
Jordi Boggiano
01a104916b [Serializer] Implement SerializerAwareInterface 2011-05-08 17:53:37 +02:00
Jordi Boggiano
8263b09b5c [Serializer] Properly check for the DecoderInterface 2011-05-08 17:52:25 +02:00
Jordi Boggiano
fe7119da8a [Serializer] serialize shouldn't normalize since it's the encoder's job to do that when they require it 2011-05-08 15:17:42 +02:00
Matthieu Vachon
0da289cfbc [Security\Acl] Fixed hardcoded table names 
* Replaced hardcoded table names by acl configuration options
 2011-05-07 20:56:22 -04:00
Pascal Borreli
e60a68f2c6 [Validator] Fixing method_exists 
see dea5b26c3f
 2011-05-07 19:08:30 +00:00
Christophe Coevoet
87391119be [FrameworkBundle] Changed the priority of the ProfilerListener 
Running it before other onCoreResponse listeners avoids seeing them
as called listeners in the event panel. The priority is set to -100
because it has to be called before the WebProfilerListener (-128) so
that the token is set.
 2011-05-07 20:40:30 +02:00
Christophe Coevoet
eab8ffc5ef [MonologBundle] Added a proper exception when the handler type is invalid 2011-05-07 17:54:14 +02:00
Kris Wallsmith
545a7fdcb9 [AsseticBundle] made some methods private 2011-05-07 08:06:48 -07:00
Lukas Kahwe Smith
9f32345887 typo fix 2011-05-07 17:02:06 +02:00
Kris Wallsmith
539ae49f62 [AsseticBundle] added a test of dumping in debug mode 2011-05-07 07:58:29 -07:00
Kris Wallsmith
520941d60d [AsseticBundle] added test of dumping one asset 2011-05-07 07:57:38 -07:00
Kris Wallsmith
6f03a08714 [AsseticBundle] added the beginnings of a test class for the assetic:dump command 2011-05-07 07:32:13 -07:00
Kris Wallsmith
f78be41355 [AsseticBundle] updated dump command to dump leaf assets per debug mode 2011-05-07 07:32:12 -07:00
Christophe Coevoet
c90c79472c [MonologBridge] Removed useless method 2011-05-07 10:38:06 +02:00
Christophe Coevoet
0ed6d04a5f [MonologBundle] Moved the handlers to the Bridge namespace 2011-05-07 10:35:19 +02:00
Kris Wallsmith
9e19cac3c0 [AsseticBundle] rearranged execute() method 2011-05-06 19:16:32 -07:00
Kris Wallsmith
547610a631 [AsseticBundle] moved debug flag to object property 2011-05-06 19:13:07 -07:00
Kris Wallsmith
918ece8baf [AsseticBundle] moved asset manager to object property 2011-05-06 19:11:56 -07:00
Kris Wallsmith
a11f18687b [AsseticBundle] moved base path to object property 2011-05-06 17:23:13 -07:00
Kris Wallsmith
f3b077a0dd [Form] removed a bunch of unused use statements 2011-05-06 14:07:16 -07:00
Drew Butler
dea5b26c3f Method exists does not work if you append the () to the method name, thus this never words for objects that actually have the __toString method. Removed the erroneous () so that this works as it appears to have been intended. 2011-05-06 13:20:29 -07:00
Fabien Potencier
d1c6e44082 Merge remote branch 'stof/firephp' 
* stof/firephp:
  [MonologBundle] Fixed CS
  [MonologBundle] Fixed the handling of subrequests in FirePHPHandler
 2011-05-06 22:14:25 +02:00
Fabien Potencier
c98bf4ff94 Merge remote branch 'Seldaek/serializer' 
* Seldaek/serializer:
  [Serializer] CS fixes
  [Serializer] Split supports in supportsNormalization and supportsDenormalization
  [Serializer] Add support for Traversable objects
  Fixed docs typo
  [Serializer] updated SerializerInterface
 2011-05-06 22:13:18 +02:00
Fabien Potencier
8043230bd6 Merge remote branch 'stof/doctrine_mapping' 
* stof/doctrine_mapping:
  [DoctrineBundle] Removed orm reference in DoctrineAbstractBundle
 2011-05-06 22:12:30 +02:00
Christophe Coevoet
e3ae374b47 [DoctrineBundle] Removed orm reference in DoctrineAbstractBundle 2011-05-06 21:53:40 +02:00
Jordi Boggiano
b9a2eb66e9 [Serializer] CS fixes 2011-05-06 19:37:13 +02:00
Jordi Boggiano
ded30a2937 [Serializer] Split supports in supportsNormalization and supportsDenormalization 2011-05-06 19:36:56 +02:00
Jordi Boggiano
919f16a7d6 [Serializer] Add support for Traversable objects 2011-05-06 19:04:39 +02:00
Jordi Boggiano
7a06421cb1 Fixed docs typo 2011-05-06 19:04:22 +02:00
Jordi Boggiano
d6afe63d2a Merge branch 'serializerLight' of http://github.com/schmittjoh/symfony into serializer 2011-05-06 18:39:02 +02:00
Christophe Coevoet
0704bc348b [MonologBundle] Fixed CS 2011-05-06 18:02:32 +02:00
Christophe Coevoet
5afe7d20a6 [MonologBundle] Fixed the handling of subrequests in FirePHPHandler 2011-05-06 18:01:38 +02:00
Jordi Boggiano
43484c21a6 [FrameworkBundle] Do not override the session storage for test 2011-05-06 17:04:37 +02:00
Jordi Boggiano
36aa7b0d70 [HttpFoundation] Remove warnings when session id isn't given 2011-05-06 16:25:44 +02:00
Fabien Potencier
f1f379b031 [Finder] simplified code 2011-05-06 14:16:23 +02:00
Johannes Schmitt
ec1199eda7 [Serializer] updated SerializerInterface 2011-05-06 13:01:19 +02:00
Fabien Potencier
3e21e07570 Merge remote branch 'schmittjoh/config' 
* schmittjoh/config:
  [Config] some exception improvements
 2011-05-06 12:38:12 +02:00
Fabien Potencier
62c0b10b88 [FrameworkBundle] prevented search engine indexing on exception pages 2011-05-06 12:33:37 +02:00
Fabien Potencier
f23044f63b Merge remote branch 'ptheg/master' 
* ptheg/master:
  Search engines should not indexing Profiler
 2011-05-06 12:31:49 +02:00
Fabien Potencier
dfd5b653cb [DoctrineBundle] changed mapping file suffix from .orm.dcm.yml to .orm.yml 2011-05-06 11:23:00 +02:00
Fabien Potencier
0cdd6ca4e2 [DoctrineBundle] added --path option to doctrine:generate:entities 2011-05-06 11:19:19 +02:00
Victor Berchet
68b3d0d5ac [Form] Allow for arbitrary keys in PaddedChoiceList 2011-05-06 10:31:51 +02:00
Geyer Pierre
daeedb5705 Search engines should not indexing Profiler 2011-05-06 07:58:35 +02:00
Johannes Schmitt
486ecdc6a6 [Config] some exception improvements 2011-05-05 19:43:08 +02:00
Fabien Potencier
d9299e930b [DoctrineBundle] changed mapping directory 
From Resources/config/ to Resources/config/doctrine
From doctrine.orm.dcm.xml to mapping.orm.dcm.xml
 2011-05-05 18:12:21 +02:00
Fabien Potencier
3f69333acb [HttpKernel] refactored the ErrorHandler class 2011-05-05 08:53:16 +02:00
Fabien Potencier
ca3c5e652e moved ErrorHandler management to the distributions 2011-05-05 08:53:13 +02:00
Fabien Potencier
0f0e5817b1 [HttpKernel] added a Kernel::init() method 2011-05-05 08:44:36 +02:00
Johannes Schmitt
362b7264d1 [Security][HttpFoundation] splits Request::hasSession() into hasSession(), and hasPreviousSession() 
This closes #774, and fixes #772.
 2011-05-05 08:38:07 +02:00
Fabien Potencier
aba8f1e180 [ClassLoader] added a debug class loader 2011-05-05 08:28:12 +02:00
Johannes Schmitt
c3084050a0 [SecurityBundle] added some tests 2011-05-05 08:20:35 +02:00
Johannes Schmitt
f787a2a748 Merge branch 'acl' of https://github.com/IamPersistent/symfony into security 2011-05-05 08:06:31 +02:00
Fabien Potencier
fe9ef5c68b [Routing] fixed deep nested route collections (closes #770) 2011-05-04 23:29:47 +02:00
Fabien Potencier
36bcfcc5ee Merge remote branch 'bschussek/form' 
* bschussek/form:
  [Form] CSRF fields are not included in the children of a FormView anymore if the view is not the root
  [Form] FormView::offsetUnset() is now supported. It was possible anyway using getChildren() and setChildren().
  [Form] Split the option "modifiable" of the "collection" type into "allow_add" and "allow_delete"
  [Form] Added test for last commit by kriswallsmith and improved dealing with original names
  [Form] Fixed variable scope when entering nested form helpers
  [Form] Added tests for blocks/templates in the format _<ID>_(widget|row|label|...)
  [Form] updated listener to check that data is an array
 2011-05-04 22:13:33 +02:00
Fabien Potencier
b7c8442068 [DoctrineBundle] made Doctrine metadata configuration easier 
You can now configure your Doctrine metadata in one single file named 'doctrine':

  Resources/config/doctrine.orm.dcm.yml
  Resources/config/doctirne.orm.dcm.xml

You can still use one file per entity, but the directory has changed (see the UPDATE file)
 2011-05-04 19:58:48 +02:00
Fabien Potencier
ec226cd4bc [DoctrineBundle] fixed doctrine:generate:entities 2011-05-04 19:38:36 +02:00
Fabien Potencier
c200b42e89 Merge remote branch 'kriswallsmith/http/forwarded-secure' 
* kriswallsmith/http/forwarded-secure:
  [HttpFoundation] added support for X-Forwarded-Port request header
 2011-05-04 19:12:32 +02:00
Kris Wallsmith
ae46150bc8 [HttpFoundation] added support for X-Forwarded-Port request header 2011-05-04 09:56:34 -07:00
Fabien Potencier
e150ffd699 Merge remote branch 'Bart00/patch-1' 
* Bart00/patch-1:
  Change "zou moeten" to "moet", ("zou moeten" implies that the problem is not so severe and was translated from english too literally) Also  fixes some typo's
 2011-05-04 18:51:26 +02:00
Bernhard Schussek
74cca63938 [Form] CSRF fields are not included in the children of a FormView anymore if the view is not the root 2011-05-04 18:27:20 +02:00
Bernhard Schussek
173beeba74 [Form] FormView::offsetUnset() is now supported. It was possible anyway using getChildren() and setChildren(). 2011-05-04 18:21:49 +02:00
Bernhard Schussek
3cc5d9f4cd [Form] Split the option "modifiable" of the "collection" type into "allow_add" and "allow_delete" 2011-05-04 17:29:59 +02:00
Bernhard Schussek
bf1dfbbe99 [Form] Added test for last commit by kriswallsmith and improved dealing with original names 
The form component should now guarantee to always pass an UploadedFile object to your model. There you can call getOriginalName() to retrieve the original name of the uploaded file. For security reasons, the real file name is a generated hash value.
 2011-05-04 17:04:44 +02:00
Fabien Potencier
86d0ddb4e3 [DoctrineBundle] split Registry::getEntityManager() in two methods 
Resetting an entity manager has a lot of consequences and the developer should
be aware of that. So, instead of implicitly reset an entity manager when it is
closed, the developer should reset it by hand if he thinks that this is
possible:

    $em = $this->get('registry')->getEntityManager();
    $em->getConnection()->beginTransaction(); // suspend auto-commit
    try {
        //... do some work
    } catch (Exception $e) {
        $em->getConnection()->rollback();
        $em->close();

        $this->get('registry')->resetEntityManager();
    }

    // you will get a new one
    $em = $this->get('registry')->getEntityManager();
 2011-05-04 16:23:47 +02:00
Bernhard Schussek
4c6f26f008 Merge remote branch 'kriswallsmith/form/fix-upload-fix' into kris_merge 2011-05-04 15:51:20 +02:00
Bernhard Schussek
eb50d766da [Form] Fixed variable scope when entering nested form helpers 
The consequence of this commit is that variables are accessible that have been passed to a surrounding form helper.

Example template:

{% block my_widget_label %}
    <label>{{ label }}
{% endblock %}

{% block my_widget_row %}
    {# It is not necessary to explicitely pass through the label variable #}
    {{ form_label(form) }}
    {{ form_widget(form) }}
{% endblock %}

Example usage:

{{ form_row(form.mywidget, { 'label': 'My Widget' }) }}
 2011-05-04 15:40:15 +02:00
Bernhard Schussek
38098604af [Form] Added tests for blocks/templates in the format _<ID>_(widget|row|label|...) 2011-05-04 15:33:51 +02:00