Fabien Potencier
456eb53eb8
[DependencyInjection] renamed CircularReferenceException to ServiceCircularReferenceException
2011-05-25 09:48:49 +02:00
Fabien Potencier
6c409cac84
[DependencyInjection] refactored parameter bag parameter replacements (removed duplicated code)
2011-05-25 09:35:51 +02:00
Fabien Potencier
179864414e
[Form] fixed CS
2011-05-25 08:03:21 +02:00
Fabien Potencier
9e632b9135
Merge remote branch 'hlecorche/master'
...
* hlecorche/master:
IntegerToLocalizedStringTransformer must return "null" if input value is null
2011-05-25 08:02:35 +02:00
hlecorche
cc49cd9498
Merge remote-tracking branch 'remotes/symfony/master'
2011-05-24 23:25:58 +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
05778c719f
[BrowserKit] fixed CS
2011-05-24 20:37:52 +02:00
Fabien Potencier
e0bf310b55
Merge remote branch 'hnw/cookie-raw-value'
...
* hnw/cookie-raw-value:
added test for Cookie#getRawValue and CookieJar#AllRawValues
fixed doc comment
[BrowserKit] dealing with raw value for cookies
2011-05-24 20:20:57 +02:00
Fabien Potencier
aa356e7288
[BrowserKit] fixed cookie management (see RFC 2109)
2011-05-24 20:08:11 +02: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
Thomas Rabaix
be2c427053
change self to static so the parent class can have access to the child constant
2011-05-24 18:25:28 +02: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
Johannes M. Schmitt
decac13331
added a few finals
2011-05-24 15:08:22 +02:00
Johannes M. Schmitt
0f9767a49e
Merge remote branch 'origin/master' into security
2011-05-24 14:58:41 +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
hlecorche
400de9c541
IntegerToLocalizedStringTransformer must return "null" if input value is null
2011-05-24 10:52:28 +02:00
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