Bernhard Schussek
67582c9a5c
Merge remote branch 'symfony/master' into experimental
...
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Debug/TraceableEventDispatcher.php
2011-04-06 16:06:26 +02:00
Bernhard Schussek
e476231e8a
[Form] Removed invalid tests, cleaned up some tests, added test coverage
2011-04-06 15:58:53 +02:00
Kris Wallsmith
9b3ce98432
[Validator] added test skip if APC is not enabled for the CLI
2011-04-06 04:16:16 -07:00
Kris Wallsmith
9ff2ca7f1d
[Validator] fixed apc cache
2011-04-06 04:07:37 -07:00
Victor Berchet
7707c0f251
[Kernel] Fix bundle inheritance
2011-04-06 07:46:08 +02:00
Fabien Potencier
e3679ef44f
[Routing] decoupled Routing from FrameworkBundle
2011-04-05 15:21:32 +02:00
Johannes Schmitt
6d4814c115
Merge branch 'acl-fix' of https://github.com/comfortablynumb/symfony into security
2011-04-05 12:25:24 +02:00
Gustavo Adrian
2e96f2c63d
Fixed exception that was thrown while updating a field ACE
2011-04-05 13:05:20 -03:00
Fabien Potencier
7c0a39c353
[Routing] optimized the output of the PHP matcher dumper
2011-04-05 11:58:56 +02:00
Bernhard Schussek
0cf8cc762a
Merge remote branch 'symfony/master' into experimental
...
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
2011-04-04 15:16:08 +02:00
Victor Berchet
5317c96fef
Update for Bundle names long again (= include the 'Bundle' suffix)
2011-04-04 11:39:41 +02:00
Victor Berchet
7ed18bf829
[Kernel] Make locateResource() throws an exception when a resource from a Bundle hides a custom resource
2011-04-04 11:24:51 +02:00
Victor Berchet
3cd3dd39ba
[Kernel] Make resources overriding consistent across bundle directories and resource directories
2011-04-04 11:24:51 +02:00
Victor Berchet
d0b6ed2bb6
[Kernel] Improve test semantic
2011-04-04 11:24:51 +02:00
Victor Berchet
3e64106aae
[Kernel] Update tests with shorter bundle names
2011-04-04 11:24:51 +02:00
Victor Berchet
dcd727c092
[Kernel] Restore the tests for the locateResource method
2011-04-04 11:24:51 +02:00
Fabien Potencier
f232b3cdda
reverted Merge remote branch 'kriswallsmith/kernel/shorter-bundle-names'
2011-04-04 11:10:56 +02:00
Fabien Potencier
6a5356290a
Revert "[HttpKernel] updated tests for shorter bundle names"
...
This reverts commit fb7e87da7d
.
2011-04-04 11:08:37 +02:00
Fabien Potencier
ad4a0bda1c
[Console] changed returned value of CommandTester to the command exit code
2011-04-03 22:30:40 +02:00
Fabien Potencier
53274512e2
Merge remote branch 'weaverryan/better_import_exception_and_bug_fix'
...
* weaverryan/better_import_exception_and_bug_fix:
[Config] Improving the exception when a resource cannot be imported
[DependencyInjection] Fixing a bug where "ignore_errors" doesn't work in YAML and XML
2011-04-02 18:37:51 +02:00
Bernhard Schussek
72a41f8c94
[Form] Fixed: Booleans can be used as choice keys now
2011-04-02 18:26:28 +02:00
Bernhard Schussek
a5d0b3aea6
[Form] Changed FormBuilder::set(Client|Norm)Transformer to FormBuilder::prepend(Client|Norm)Transformer and FormBuilder::append(Client|Norm)Transformer to facilitate extension of types
2011-04-02 16:39:19 +02:00
Bernhard Schussek
fc59936740
[Form] Fixed: ThemeRenderer::isChoiceSelected() works correctly for boolean choices
2011-04-02 16:00:46 +02:00
Bernhard Schussek
a4bbc40ac6
[Form] Cleaned up ChoiceListInterface
2011-04-02 15:41:43 +02:00
Pascal Borreli
8a82aee56f
[Locale][Windows] Fixing tests for old ICU version (default in php.net packages)
2011-04-02 13:19:30 +00:00
Bernhard Schussek
d3b7c4e8c1
[Form] Moved getLabel(), isChoiceSelected() and isChoiceGroup() from ChoiceListInterface to ThemeRenderer
2011-04-02 14:14:18 +02:00
Bernhard Schussek
94f2baa895
[Form] Fixed BooleanToStringTransformer::reverseTransform() to accept NULL values. Fixes ChoiceTypeTest
2011-04-02 13:00:19 +02:00
Bernhard Schussek
37e8e1270c
[Form][FrameworkBundle][TwigBundle] Renamed view variable 'disabled' to 'read_only' to match with the according FormInterface methods
2011-04-02 12:18:43 +02:00
Bernhard Schussek
39b0aafc00
Merge remote branch 'symfony/master' into experimental
...
Conflicts:
src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml
2011-04-02 12:08:27 +02:00
Bernhard Schussek
35d9b7f800
[Form] Improved test coverage of Form. The emptyValue closure now receives the Form instance to use form data when constructing new objects
2011-04-02 12:00:19 +02:00
Bernhard Schussek
4f39234741
[Form] bind() is ignored if a form is read-only
2011-04-02 11:39:15 +02:00
Bernhard Schussek
ca20aef379
[Form] Improved test coverage of DelegatingValidator and fixed validation group inheritance
2011-04-02 11:35:58 +02:00
Bernhard Schussek
33b0011f86
[Form] Improved test coverage of Form
2011-04-02 11:22:29 +02:00
Ryan Weaver
65ac5ec7c0
[DependencyInjection] Fixing a bug where "ignore_errors" doesn't work in YAML and XML
...
Tests added, the arguments were simply mismatched.
2011-04-01 18:59:45 -05:00
Fabien Potencier
1a486492b8
[HttpKernel] fixed test
2011-04-01 18:07:22 +02:00
Kris Wallsmith
c51b716180
[Config] simplified DirectoryResource to only allow one regex
2011-04-01 04:56:50 -07:00
Fabien Potencier
a9160eee70
[Validator] made fields the default option for Collection constraint
2011-03-31 15:36:04 +02:00
Bernhard Schussek
c864d7fae1
[Form] Improved test coverage of Form class
2011-03-31 15:23:33 +02:00
Bernhard Schussek
1ef18360fa
[Form] Made name immutable in FormBuilder to avoid synchronization problems with name and property path
2011-03-31 13:48:06 +02:00
Bernhard Schussek
bbeddf7789
Merge remote branch 'symfony/master' into experimental
2011-03-31 12:32:20 +02:00
Fabien Potencier
59ef0c991c
[Form] fixed two unit tests
2011-03-31 07:36:52 +02:00
Fabien Potencier
c7ccb6643b
[Form] removed unused constructor argument from Type\FieldType (themeFactory and template)
2011-03-31 07:34:04 +02:00
Jeremy Mikola
e295bfc7a5
[Config] Alias used classes in NodeBuilderTest to avoid conflicts with fixture classes required in TreeBuilderTest
...
Depending on the order of execution of Config\Definition\Builder tests (due to filesystem ordering), namespace conflicts can occur between real classes and fixtures loaded by the TreeBuilderTest.
2011-03-30 19:52:00 -04:00
Fabien Potencier
f92055ce42
[Validator] renamed methods that do not follow CS
...
requiredOptions -> getRequiredOptions
targets -> getTargets
defaultOption -> getDefaultOption
2011-03-30 23:18:20 +02:00
Fabien Potencier
525702b5c6
[Validator] renamed method to follow CS
2011-03-30 23:10:30 +02:00
Fabien Potencier
f77b94074f
[HttpFoundation] replaced the option argument of Session by defaultLocale
2011-03-30 17:26:13 +02:00
Bernhard Schussek
55c14680d3
Merge remote branch 'symfony/master' into experimental
2011-03-30 10:31:21 +02:00
Pascal Borreli
33d887e154
[Finder][Windows] Fixed windows tests
2011-03-29 14:32:18 +00:00
Pascal Borreli
0199b5c70d
[HttpFoundation][Windows] Fixed guesser tests if Fileinfo extension is not loaded
...
Didn't test for presence of mime_content_type function since it's obsolete (deprecated) in PHP5
2011-03-29 14:32:17 +00:00
Bernhard Schussek
53838abf3f
Merge remote branch 'symfony/master' into experimental
...
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
src/Symfony/Component/Form/Resources/config/validation.xml
2011-03-28 22:52:15 +02:00