Fabien Potencier
2c85a59599
Merge remote branch 'vicb/form-rendered'
...
* vicb/form-rendered:
[Form] Fix for nested forms getting erroneously set as rendered
2011-05-22 08:16:24 +02:00
Fabien Potencier
5429593459
Merge remote branch 'kertz/datetime_single_text'
...
* kertz/datetime_single_text:
added missing single-text option
2011-05-22 08:14:35 +02:00
Fabien Potencier
b042366353
Merge remote branch 'stfalcon/patch-2'
...
* stfalcon/patch-2:
Small refact. Without this I get a php Notice and Warnig if try getFlash() after clearing the session:
2011-05-22 08:08:28 +02:00
hidenorigoto
c9f188b658
[FrameworkBundle] replaced Util/Mustache to Generator/Generator
2011-05-22 00:10:22 +09:00
Pierre Minnieur
8bc13b9cdd
fixed wrong usage of supportsDenormalization()
(@see NormalizerInterface)
2011-05-21 05:48:27 -07:00
Victor Berchet
eb10c66a55
[Twig][Form] Optimize form rendering
2011-05-20 16:45:57 +02:00
Amal Raghav
517f95d8a4
added missing single-text option
2011-05-20 19:19:23 +05:30
Victor Berchet
e117613550
[Form] Fix for nested forms getting erroneously set as rendered
2011-05-20 15:48:55 +02:00
Victor Berchet
e0ff7d2613
[Form] Tweak the field type
2011-05-20 11:08:48 +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
Fabien Potencier
5ad2ff0595
[Console] added the possibility to pass a default value for DialodHelper::askAndValidate()
2011-05-20 08:24: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
Fabien Potencier
fed6dc9a1e
Merge remote branch 'kriswallsmith/http/session-fixes'
...
* kriswallsmith/http/session-fixes:
[HttpFoundation] updated session to only save on destruct if started
[HttpFoundation] fixed locale accessor after session clear
[HttpFoundation] removed unnecessary method
2011-05-19 21:40:38 +02:00
Kris Wallsmith
fc5992495f
[HttpFoundation] updated session to only save on destruct if started
2011-05-19 11:47:21 -07:00
Kris Wallsmith
ed8ecab7ea
[HttpFoundation] fixed locale accessor after session clear
2011-05-19 11:45:12 -07:00
Kris Wallsmith
a538344b3b
[HttpFoundation] removed unnecessary method
2011-05-19 11:44:15 -07:00
Benjamin Eberlei
ec22b03b1d
[Routing] Remove exception condition in YamlFileLoader::load() as its duplicating a check that is done in parseRoute() anyways. This changes allows to extend the YamlFileLoader without having to duplicate the whole method.
2011-05-19 20:26:26 +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
91b1becc7d
Merge remote branch 'schniper/patch-2'
...
* schniper/patch-2:
Fix process creation under Win7 Ultimate (app/console assetic:dump ./web): - Set the default $env to NULL, thus inheriting the system's environment settings (array() is no good). - Set bypass_shell to false, otherwise process creation will fail (I don't know if this should happen only on Win7)
2011-05-19 17:39:36 +02:00
Fabien Potencier
9714524b39
fixed a unit test and CS
2011-05-19 17:38:16 +02:00
jsor
fd6c254b47
[HttpFoundation] changed checking for deleted cookie to be conform with setcookie()
2011-05-19 17:14:03 +02:00
jsor
fc1a8cac35
[HttpFoundation] allow negative values for cookies expires timestamp
2011-05-19 17:14:02 +02:00
jsor
f9b6c8b74a
[HttpFoundation] included cookie headers in string representation
2011-05-19 17:14:01 +02:00
jsor
e6d929aa71
[HttpFoundation] added __toString() method
2011-05-19 17:13:58 +02:00
Costin Bereveanu
5841f05f04
Fix process creation under Win7 Ultimate (app/console assetic:dump ./web):
...
- Set the default $env to NULL, thus inheriting the system's environment settings (array() is no good).
- Set bypass_shell to false, otherwise process creation will fail (I don't know if this should happen only on Win7)
2011-05-19 07:52:45 -07: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
Fabien Potencier
38baa85d46
Merge remote branch 'AurelC2G/fix-phpdoc'
...
* AurelC2G/fix-phpdoc:
[Config] fixed phpdoc
2011-05-19 15:35:53 +02:00
Fabien Potencier
a75303029d
Merge remote branch 'stealth35/patch-1'
...
* stealth35/patch-1:
checkdnsrr exits for all PHP 5.3 version
2011-05-19 15:35:05 +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
Michel Weimerskirch
fd92105fa0
Fix merge error (function "guess" was in there twice)
2011-05-19 05:45:29 -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
stealth35
61b23a5a68
checkdnsrr exits for all PHP 5.3 version
2011-05-19 05:21:53 -07:00
Miha Vrhovnik
2e286073a4
Removed ability to override method from GET request
2011-05-19 14:08:34 +02:00
Miha Vrhovnik
65ed6f7763
Added support for request method overriding via X-HTTP-Method-Override
...
This type of override is supported by MS MVC3 and is recommended by Google.
Also added ability to override request method via ?_method= when
request is made via GET.
2011-05-19 09:33:08 +02:00
Aurélien Fredouelle
c0e8db18f9
[Config] fixed phpdoc
2011-05-19 08:05:27 +02:00
Bernhard Schussek
dcc61a9a98
Merge remote branch 'shieldo/search_field' into shieldo_merge
2011-05-19 01:41:59 +02:00
Bernhard Schussek
13a964ae6d
[Form] Form::isBound() and Form::isValid() work correctly now for read-only forms
2011-05-19 01:24:28 +02:00
Bernhard Schussek
829aa4dc0b
[Locale] Improved error reporting and added stubs for intl_is_failure(), intl_get_error_code() and intl_get_error_message()
2011-05-19 01:15:37 +02:00
Bernhard Schussek
c3e8569f73
Merge remote branch 'vicb/form-csrf' into vicb_merge
2011-05-18 23:56:11 +02:00
Bernhard Schussek
06f829ace5
[Form] Implemented fix for 361c67f54f
2011-05-18 23:51:39 +02:00
Bernhard Schussek
a7ff4f484a
[Form] Further simplified PropertyPath code
2011-05-18 23:39:49 +02:00
Bernhard Schussek
857042458a
Merge remote branch 'vicb/form-ppath-optim' into vicb_merge
2011-05-18 23:34:53 +02:00
Benjamin Eberlei
a4f1b8a0c1
[Doctrine] Fix default value to null for entity manager to make fluent integration with Doctrine Registry work
2011-05-18 23:26:20 +02:00
Benjamin Eberlei
23cf63d767
[Doctrine] Add fields as default option and allow strings to be passed.
2011-05-18 23:25:16 +02:00
Bernhard Schussek
af66beed76
[Form] Added test for 6c337d1cc0
2011-05-18 23:20:37 +02:00
Bernhard Schussek
a3d84bc681
Merge remote branch 'vicb/form-9731' into vicb_merge
2011-05-18 23:12:27 +02:00
Benjamin Eberlei
86f9b17254
[Doctrine] Add DoctrineBundle integration (DI Container registration) for the UniqueEntityValidator
2011-05-18 23:09:46 +02:00
Benjamin Eberlei
8ff1d09d36
[Doctrine] Implement suggested changes by Stof, added functional test to verify unique validator works.
2011-05-18 22:57:25 +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
520e3761e9
[Form] Removed unused option "pattern" of date and time type
2011-05-18 22:34:34 +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
Bernhard Schussek
b39a21fbaf
[Form] Renamed collection option "type_options" to "options" to be consistent with the repeated type
2011-05-18 21:52:59 +02:00
Bernhard Schussek
2711fbc418
Merge remote branch 'jaugustin/fix_form' into jaugustin_merge
...
Conflicts:
src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php
src/Symfony/Component/Form/Extension/Core/Type/CollectionType.php
2011-05-18 21:40:20 +02:00
Fabien Potencier
82686751dd
[HttpCache] fixed typo
2011-05-18 18:40:36 +02:00
Fabien Potencier
f48699a706
[HttpKernel] reverted some unwanted changes from previous commit
2011-05-18 18:17:14 +02:00
Fabien Potencier
1f0ffca68e
[HttpKernel] fixed empty ETags showing up in requests to the backend when using HttpCache
2011-05-18 17:06:05 +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
bd9bfafd9c
[Security/Http] use deep parameter for CSRF parameter
2011-05-18 13:01:54 +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
Johannes Schmitt
53f5c23c8f
[Security/Acl] small voter refactoring
2011-05-18 12:48:50 +02:00
Victor Berchet
ebb0e83a7e
[Form] CSRF documentation and a few CS changes
2011-05-18 12:45:01 +02:00
Victor Berchet
ba31b5acc5
[Form] Move CSRF options from types to the CSRF extension
2011-05-18 10:37:31 +02:00
Benjamin Eberlei
cfc2471109
[Doctrine] Add Unique Validator
2011-05-17 23:04:13 +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
a965a5ce32
Merge remote branch 'kertz/PdoSessionStorage_mysql'
...
* kertz/PdoSessionStorage_mysql:
[PdoSessionStorage] Added insert... on duplicate
2011-05-17 17:55:41 +02:00
Fabien Potencier
bb0b3efbf0
[Routing] renamed Exception interface to ExceptionInterface to follow CS
2011-05-17 17:04:08 +02:00
Fabien Potencier
0e65bc746e
[DependencyInjection] renamed Exception interface to ExceptionInterface to follow CS
2011-05-17 16:57:31 +02:00
Fabien Potencier
2cd04547fd
[Routing] renamed some exceptions
2011-05-17 16:52:02 +02:00
Fabien Potencier
0168241014
[DependencyInjection] renamed NonExistentParameterException and NonExistentServiceException to ParameterNotFoundException and ServiceNotFoundException
2011-05-17 16:26:08 +02:00
Fabien Potencier
eb202bb7b7
merged kriswallsmith/form/csrf-intention
2011-05-17 15:25:50 +02:00
alexandresalome
1d6b94189b
[Routing] Use routing exceptions in the dumper and add tests.
2011-05-17 11:31:47 +02:00
Fabien Potencier
24d79f680f
[Routing] changed visibility
2011-05-17 10:48:38 +02:00
Martin Hason
b7c417feaa
[Bridge][Twig] removed the possibility to pass a message to the transchoice tag
2011-05-17 10:33:48 +02:00
Fabien Potencier
09cccf60c7
Merge remote branch 'stof/ParameterBagInterface'
...
* stof/ParameterBagInterface:
[DependencyInjection] Removed the public keyword from interface
[DependencyInjection] Added missing methods in the ParameterBagInterface
[DependencyInjection] Fixed phpdoc
2011-05-17 10:29:19 +02:00
Fabien Potencier
b6a8f3a267
[Console] fixed typo
2011-05-17 10:27:02 +02:00
Fabien Potencier
6308f93c64
[Console] added some explanation on how DialogHelper::askAndValidate works
2011-05-17 10:26:33 +02:00
Fabien Potencier
02e77ec4e3
[Routing] moved Matcher exceptions
2011-05-17 10:11:27 +02:00
Fabien Potencier
51eb746925
Merge remote branch 'alexandresalome/feat-routing-exceptions'
...
* alexandresalome/feat-routing-exceptions:
[Routing] Fix the exception inheritance + Add the LICENCE block in new files
[Routing] Change the Exception namespacing + base class for every exception + update PHPDoc
[Routing] Add specific exceptions for the UrlGenerator
2011-05-17 09:52:44 +02:00