Fabien Potencier
754a0771f3
Merge remote branch 'everzet/builder-private-services-fix'
...
* everzet/builder-private-services-fix:
[DependencyInjection] create inlined private service from it's definition
[DependencyInjection] added failing private service user test-case
2011-05-24 10:32:48 +02:00
Fabien Potencier
0dab2de6da
Merge remote branch 'craue/patch-1'
...
* craue/patch-1:
removed unnecessary semicolon
2011-05-24 09:57:41 +02:00
Fabien Potencier
68aa0f46a4
Merge remote branch 'jdhoek/master'
...
* jdhoek/master:
Add missing {} around @inheritDoc to fix this class in SF beta2.
Add missing {} around @inheritDoc to fix this class in SF beta2.
2011-05-24 09:53:18 +02:00
Fabien Potencier
674ec1a476
Merge remote branch 'jdhoek/patch-4'
...
* jdhoek/patch-4:
Add missing {} around @inheritDoc to fix this class in SF beta2.
2011-05-24 09:53:14 +02:00
Fabien Potencier
465be3d94c
Merge remote branch 'jdhoek/patch-3'
...
* jdhoek/patch-3:
Add {} around @inheritDoc.
2011-05-24 09:53:10 +02:00
Fabien Potencier
d2570b18f8
Merge remote branch 'jdhoek/patch-2'
...
* jdhoek/patch-2:
Add {} around @inheritDoc
2011-05-24 09:53:04 +02:00
jdhoek
cc5a100418
Add missing {} around @inheritDoc to fix this class in SF beta2.
2011-05-24 00:41:35 -07:00
jdhoek
67cace5d21
Add missing {} around @inheritDoc to fix this class in SF beta2.
2011-05-24 00:40:39 -07:00
jdhoek
7e4419368e
Add missing {} around @inheritDoc to fix this class in SF beta2.
2011-05-24 00:38:15 -07:00
jdhoek
42d33489c5
Add {} around @inheritDoc.
2011-05-24 00:36:03 -07:00
jdhoek
cda87bef23
Add {} around @inheritDoc
2011-05-24 00:33:56 -07:00
jdhoek
c6172e0f96
Add {} around @inheritDoc annotation to fix this class in SF beta2
2011-05-24 00:29:42 -07:00
Christian Raue
0306be6888
removed unnecessary semicolon
2011-05-23 14:39:25 -07:00
everzet
b6ce137e2d
[DependencyInjection] create inlined private service from it's definition
2011-05-23 23:00:38 +03:00
Fabien Potencier
15bede5a63
[Console] refactored style management
...
The current code was broken when a style was defined inline:
<bg=black>Foo</bg=black>
When creatin a new style formatter, it's better to let the formatter
apply the style to the text.
2011-05-23 16:54:36 +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
Fabien Potencier
07401615a9
Merge remote branch 'schmittjoh/doctrine'
...
* schmittjoh/doctrine:
[DoctrineBundle] fixed regression
2011-05-23 11:08:15 +02:00
Fabien Potencier
7ab3fdeb83
[Finder] added a way to ignore all 'hidden' files
2011-05-23 11:05:58 +02:00
Fabien Potencier
d88f6b9c24
Merge remote branch 'brikou/phpdoc_request'
...
* brikou/phpdoc_request:
removed docblock for isNoCache
fixed the description of isNoCache method
fixed description for isNoCache method
added missing method's docblock
2011-05-23 10:39:34 +02:00
Brikou CARRE
9908d51da8
removed docblock for isNoCache
2011-05-23 01:37:10 -07:00
Brikou CARRE
2648ff273e
fixed the description of isNoCache method
2011-05-23 09:35:41 +02:00
Brikou CARRE
12bf94c7ff
fixed description for isNoCache method
2011-05-23 08:44:08 +02: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
60b811947b
[Form] fixed error message ( closes #1034 )
2011-05-23 08:06:43 +02:00
Fabien Potencier
4a801b5cd5
Merge remote branch 'pborreli/process-typo'
...
* pborreli/process-typo:
[Process] Fixed namespace typo and windows test
2011-05-23 07:57:42 +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
Yoshio HANAWA
120898f81a
fixed doc comment
2011-05-23 05:43:45 +09:00
Yoshio HANAWA
2cecc95d9e
[BrowserKit] dealing with raw value for cookies
2011-05-23 04:49:01 +09:00
Matthieu Vachon
87176e39d1
[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-22 13:51:00 -04:00
Pascal Borreli
7f089c0b05
[Process] Fixed namespace typo and windows test
2011-05-22 14:57:37 +00:00
Brikou CARRE
e018e6ce44
added missing method's docblock
2011-05-22 09:13:03 +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
ac1bde9003
Merge remote branch 'beberlei/YamlRoutingLoader'
...
* beberlei/YamlRoutingLoader:
[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-22 08:32:12 +02:00
Fabien Potencier
2d2de7e8b0
Merge remote branch 'vicb/form-field'
...
* vicb/form-field:
[Form] Tweak the field type
2011-05-22 08:29:54 +02:00
Fabien Potencier
17d9c97a77
Merge remote branch 'pminnieur/patch-1'
...
* pminnieur/patch-1:
fixed wrong usage of `supportsDenormalization()` (@see NormalizerInterface)
2011-05-22 08:22:25 +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
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
Fabien Potencier
75f0ab5d40
Merge remote branch 'vicb/form-fluid'
...
* vicb/form-fluid:
[Form] Fix the Form fluid interface
[Form] Fix the fluid interface of FormBuilder
[Form] Fix the fluid interface of FormBuilder
2011-05-17 09:45:29 +02:00
Fabien Potencier
1394183a68
Merge remote branch 'stloyd/patch-3'
...
* stloyd/patch-3:
Fix for bug when using APC in version 3.1.4
2011-05-17 09:41:45 +02:00
Fabien Potencier
86a2d27da9
Merge remote branch 'stloyd/ipvalidator_fix'
...
* stloyd/ipvalidator_fix:
Better comment about no test IP6 addresses for "FILTER_FLAG_NO_RES_RANGE"
Refactoring of IpValidator to use native php filter extension, also adding additional flag support and test cover.
2011-05-17 09:25:04 +02:00
Fabien Potencier
d118e32783
Merge remote branch 'vicb/924-cosmetic'
...
* vicb/924-cosmetic:
[Form] CS related changes
2011-05-17 09:19:41 +02:00
Fabien Potencier
d0b403b7e4
Merge remote branch 'vicb/924-real'
...
* vicb/924-real:
[Form] Implement a fluid interface FormView
2011-05-17 09:19:39 +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
Fabien Potencier
a76c65e163
Merge remote branch 'kreischweide/master'
...
* kreischweide/master:
[Process] Workaround for windows based stderr bug
[Process] Wrong descriptor mode for stderr
Fixed wrong descriptor mode for stderr
2011-05-17 09:14:50 +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
Kris Wallsmith
914620f948
[Form] renamed CSRF page_id to intention
2011-05-16 14:16:29 -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
e7e5304876
forced all responses to have a Date header (RFC2616 - 14.18)
2011-05-16 08:46:36 +02: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
Fabien Potencier
5a38886b1d
[HttpFoundation] fixed Request::getHttpHost()
2011-05-16 08:20:17 +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
Fabien Potencier
28f9b4f13e
[HttpFoundation] force headers to be sorted in HeaderBag::__toString()
2011-05-15 22:40:14 +02:00
Victor Berchet
42698608cb
[Form] CS related changes
2011-05-15 21:39:22 +02:00
Victor Berchet
39efc49da0
[Form] Implement a fluid interface FormView
2011-05-15 21:38:12 +02: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
Fabien Potencier
260af82300
Merge remote branch 'henrikbjorn/validation-configuration'
...
* henrikbjorn/validation-configuration:
[FrameworkBundle] Empty annotation namespaces parameter because it is referenced in validator.xml
2011-05-15 20:29:44 +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
Fabien Potencier
4c7adc2f12
[HttpFoundation] fixed a warning
2011-05-15 19:44:34 +02:00
Douglas Greenshields
bf2f9d2a02
[Form] Added a search form field type
2011-05-15 18:31:36 +01:00
Fabien Potencier
c1c9ad72f2
Merge remote branch 'vicb/form-phpdoc-2'
...
* vicb/form-phpdoc-2:
[Form] phpDoc
2011-05-15 19:28:39 +02:00
Victor Berchet
971aad0593
Merge branch 'master' into form-phpdoc-2
2011-05-15 19:24:09 +02: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
Fabien Potencier
30b6e62ce4
Merge remote branch 'arnaud-lb/fix-validator-config'
...
* arnaud-lb/fix-validator-config:
Fixed validators config causing no validation to happen
2011-05-15 19:19:49 +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
Fabien Potencier
11fa8d8698
[HttpFoundation] tweaked HeaderBag::__toString() to ease debugging
2011-05-15 12:43:05 +02:00
Fabien Potencier
e81b88c576
[HttpFoundation] added HeaderBag::__toString()
2011-05-15 12:38:12 +02:00
Fabien Potencier
dcb4ef6e23
[HttpFoundation] added Request::__toString()
2011-05-15 12:33:06 +02:00
Amal Raghav
ebc2f01e5b
[PdoSessionStorage] Added insert... on duplicate
2011-05-15 15:48:29 +05:30
Fabien Potencier
62d09b8fb2
[HttpFoundation] ensures that path info always starts with a /
2011-05-15 11:28:38 +02:00
Fabien Potencier
d2525c9492
[Validator] fixed possible warning
2011-05-15 11:18:03 +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
Stepan Tanasiychuk
c6206f8faf
Small refact. Without this I get a php Notice and Warnig if try getFlash() after clearing the session:
...
Notice: Undefined index: _flash in /var/www/test/symfony2/vendors/symfony/src/Symfony/Component/HttpFoundation/Session.php on line 231
Warning: array_key_exists() expects parameter 2 to be array, null given in /var/www/test/symfony2/vendors/symfony/src/Symfony/Component/HttpFoundation/Session.php on line 231
2011-05-14 14:23:14 -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
Amal Raghav
4fa0c4c3ea
some cosmetic changes to PdoSessionStorage
...
aligned line 210
2011-05-14 23:45:13 +05:30
Fabien Potencier
4ef13b6d5c
added exceptions when APC is not enabled
2011-05-14 17:43:25 +02:00
Fabien Potencier
fe4515bde3
Merge remote branch 'stloyd/patch-2'
...
* stloyd/patch-2:
Throw an exception when APC is not loaded but cache is enabled in app config
2011-05-14 17:38:41 +02:00
Fabien Potencier
e1347e788e
[Yaml] tweaked error message
2011-05-14 17:37:28 +02:00