Bernhard Schussek
729438fdea
Merge branch 'rename-execute' into experimental
...
Conflicts:
src/Symfony/Component/Form/FileField.php
src/Symfony/Component/Form/Resources/config/validation.xml
2011-03-25 01:38:49 +01:00
Bernhard Schussek
3e29348d21
[Validator] Added support for static callbacks to Callback constraint
2011-03-25 01:36:58 +01:00
Bernhard Schussek
9c6a6e13bf
[Validator] Renamed Execute constraint to Callback
2011-03-25 01:34:35 +01:00
Bernhard Schussek
770d403a52
[Form] Improved error mapping in DelegatingValidator
2011-03-25 00:57:35 +01:00
Bernhard Schussek
4372bd5dc8
[Form] Fixed: Bubbling errors are caught correctly
2011-03-25 00:18:58 +01:00
Bernhard Schussek
262bdcb21d
[Form] Fixed validation
2011-03-25 00:16:21 +01:00
Bernhard Schussek
ef334dbc4a
Merge remote branch 'beberlei/AttributeSupport' into beberlei-merge
2011-03-24 22:53:39 +01:00
Bernhard Schussek
3f390aa271
[Form] Removed EntityType from DefaultTypeLoader
2011-03-24 22:50:39 +01:00
Benjamin Eberlei
ee96ad0e81
[Form] [DoctrineBridge] Move EntityType and DoctrineTypeLoader into Doctrine Bridge
2011-03-24 22:43:00 +01:00
Benjamin Eberlei
8d6dd2b9af
[Form] Add Arbitrary Attribute Support to Form Rendering.
2011-03-24 22:08:08 +01:00
Benjamin Eberlei
6bcc04905c
[Form] Introduce ArrayTypeLoader, Remove EntityManager and FormFactory interface from DefaultTypeLoader
2011-03-24 20:00:17 +01:00
Bernhard Schussek
2faa47d03b
[Form] Added fallback templates to TwigThemeFactory
2011-03-24 15:11:43 +01:00
Bernhard Schussek
1211d77f49
[Form] Introduced renderer theme factories so that themes can be changed during runtime
2011-03-24 14:27:21 +01:00
Fabien Potencier
8cb400a5d8
[Console] fixed a test
2011-03-24 14:03:56 +01:00
Bernhard Schussek
5b41810b6d
Revert "[Form] Changed naming of Themes to ThemeEngines. Theme templates are now 'themes'"
...
This reverts commit 1efd680b68
.
2011-03-24 10:55:12 +01:00
Bernhard Schussek
5078a63c74
Revert "[Form] Fixed more naming of themes and theme engines"
...
This reverts commit 1aa34b7240
.
2011-03-24 10:54:47 +01:00
Fabien Potencier
f5ab021386
Merge remote branch 'aurelijus/clear_name_for_goto'
...
* aurelijus/clear_name_for_goto:
removes unwanted characters from goto name
2011-03-24 10:00:31 +01:00
Fabien Potencier
ff3c66753f
[BrowserKit] tagged the guaranteed BC API
2011-03-24 09:25:46 +01:00
Aurelijus
38318f8f80
removes unwanted characters from goto name
2011-03-24 10:03:59 +02:00
Bernhard Schussek
1aa34b7240
[Form] Fixed more naming of themes and theme engines
2011-03-23 22:51:37 +01:00
Bernhard Schussek
1efd680b68
[Form] Changed naming of Themes to ThemeEngines. Theme templates are now 'themes'
2011-03-23 22:34:58 +01:00
Fabien Potencier
06d00f36ba
Merge remote branch 'kriswallsmith/framework/protocol-relative-base-urls'
...
* kriswallsmith/framework/protocol-relative-base-urls:
[Templating] updated assets helper to leave protocol-relative URLs untouched
[FrameworkBundle] cleaned up test class
2011-03-23 22:03:48 +01:00
Fabien Potencier
a6e6cbbb27
[HttpFoundation] removed the hardcoded ^ and $ from the RequestMatcher
2011-03-23 21:27:04 +01:00
Bernhard Schussek
c01419d856
Merge remote branch 'johnwards/renderer_tests' into renderer-tests-merge
2011-03-23 21:13:36 +01:00
Kris Wallsmith
55671be888
[Templating] updated assets helper to leave protocol-relative URLs untouched
2011-03-23 13:02:49 -07:00
Fabien Potencier
76cf89b800
[Finder] fixed some tests that were failing on the CI server
2011-03-23 20:58:14 +01:00
Fabien Potencier
cb62fde8c9
[Serializer] fixed some tests that were failing on the CI server
2011-03-23 20:27:58 +01:00
Fabien Potencier
b5857528e0
[Routing] moved protected to private
2011-03-23 19:25:56 +01:00
Bernhard Schussek
9839aafb7d
Merge remote branch 'symfony/master' into experimental
2011-03-23 19:18:38 +01:00
Bernhard Schussek
08a09240f6
[Form] Fixed order of input and output timezone to a more natural one
2011-03-23 17:12:04 +01:00
Bernhard Schussek
a880f8d0d1
[Form] Fixed coding conventions
2011-03-23 16:14:53 +01:00
Bernhard Schussek
9e025440ca
Merge remote branch 'johnwards/configuration' into configurable-merge
2011-03-23 16:05:16 +01:00
Fabien Potencier
e912b347f0
moved integration between the Translation component and Twig to a Symfony Bridge
2011-03-23 15:23:52 +01:00
John Wards
1a014d130e
[Form] Tests for Renderer Plugins
2011-03-22 22:19:51 +00:00
John Wards
2e750f7287
[Form] Coding conventions
2011-03-22 21:02:02 +00:00
John Wards
ef8113c50f
[Form] Base tests for renderers
2011-03-22 20:51:19 +00:00
Fabien Potencier
a95f72fff3
Merge remote branch 'l3l0/routing-tests'
...
* l3l0/routing-tests:
[Routing] added tearDown with cleanup the file system tmp directory
[Routing] moved clean up the directory from tearDown to setUp. Removed setUpBeforeClass method
[Routing] modified place when we store temporary file
[Routing] modified unit test for PhpGeneratorDumper class
[Routing] add unit test for PhpGeneratorDumper class
[Routing] added more tests for UrlGenerator class
2011-03-22 21:44:31 +01:00
Leszek
05a105f641
[Routing] added tearDown with cleanup the file system tmp directory
2011-03-22 21:21:43 +01:00
Leszek
9b80591133
[Routing] moved clean up the directory from tearDown to setUp. Removed setUpBeforeClass method
2011-03-22 21:21:43 +01:00
Leszek
389810e12a
[Routing] modified place when we store temporary file
2011-03-22 21:21:43 +01:00
Leszek
2b820ac9d0
[Routing] modified unit test for PhpGeneratorDumper class
2011-03-22 21:21:43 +01:00
Leszek
1059f7cb82
[Routing] add unit test for PhpGeneratorDumper class
2011-03-22 21:21:42 +01:00
Leszek
fc5295436b
[Routing] added more tests for UrlGenerator class
2011-03-22 21:21:42 +01:00
Fabien Potencier
e159c47cc9
[Routing] fixed UrlMatcher when no method requirement is defined
2011-03-22 20:56:55 +01:00
Fabien Potencier
03282f8d4e
[Config] fixed a test
2011-03-22 19:55:16 +01:00
Fabien Potencier
af9c292001
Merge remote branch 'subsven/master'
...
* subsven/master:
re-add filename based directory filter to the AnnotationDirectoryLoader, now restricting to *.php files and therefore disregarding e.g. SVN metadata files
revert adding filename based filter to the directory resource
Eleminate the need to manually clear the cache if a new controller file containing routing annotations is added - part II * add unit tests * introduce filename filter to DirectoryResource (to restrict change monitoring to a subset of files) * modify AnnotationDirectoryLoader.php to use filename filter set on Controller\.php$
2011-03-22 19:52:55 +01:00
Fabien Potencier
3c0ecf277e
Merge remote branch 'jaypea/PhpDumperFix'
...
* jaypea/PhpDumperFix:
Fixed PhpDumper isSimpleService and changed test fixtures
2011-03-22 19:46:58 +01:00
Jan Prieser
67aaf5ce91
Fixed PhpDumper isSimpleService and changed test fixtures
2011-03-22 17:01:03 +01:00
Fabien Potencier
1991437766
Merge remote branch 'kriswallsmith/router/method-not-allowed'
2011-03-22 16:40:41 +01:00
Bernhard Schussek
ea0e5bb2d6
[Form] Renamed FieldTypeInterface to FormTypeInterface
2011-03-22 12:36:41 +01:00