Commit Graph

1832 Commits

Author SHA1 Message Date
Josiah
98e46a23fa Added 201 to the possible status codes that indicate a response is a redirect. 2011-04-21 10:36:25 -07:00
Fabien Potencier
9a2d4c77c3 Merge remote branch 'Garfield-fr/master'
* Garfield-fr/master:
  [Container] Added function array_unique on getServiceIds to return only one service name
2011-04-21 18:31:55 +02:00
Bernhard Schussek
c58b05a6d6 [Form] Removed obsolete code in TextType 2011-04-21 10:17:04 +02:00
Fabien Potencier
7e33159723 [Routing] the global parameters must not be added in the QS when generating URLs 2011-04-21 09:52:35 +02:00
Bertrand Zuchuat
7ed8ea25d8 [Container] Added function array_unique on getServiceIds to return only one service name 2011-04-20 23:45:36 +02:00
Fabien Potencier
071caeb0c8 Merge remote branch 'merk/file'
* merk/file:
  [HttpFoundation\File] Removed realpath()
2011-04-20 23:13:55 +02:00
Fabien Potencier
d721cbe1e2 Merge remote branch 'kriswallsmith/http/filesystem-session-fix'
* kriswallsmith/http/filesystem-session-fix:
  [HttpFoundation] fixed FilesystemSessionStorage
2011-04-20 23:09:04 +02:00
Fabien Potencier
ace5e26406 Merge remote branch 'schmittjoh/security'
* schmittjoh/security:
  [Security/Core] force implementations to accept null values
  [Security/Acl] some misc fixes
  [Security/Acl] removed Doctrine dependency from interfaces and moved them to the actual implementation
  [SecurityBundle] changed expected value for token_provider key in the rememberme section
2011-04-20 23:07:33 +02:00
Fabien Potencier
c6dcf0f8f3 [Routing] added a way to set default parameters that are applied when generating URLs 2011-04-20 23:01:05 +02:00
Fabien Potencier
f7d44148df [Routing] removed unused defaults variable 2011-04-20 22:55:23 +02:00
Johannes Schmitt
192592ec9b [Security/Core] force implementations to accept null values 2011-04-20 22:38:16 +02:00
Johannes Schmitt
f697fe3b26 [Security/Acl] some misc fixes 2011-04-20 22:35:17 +02:00
Johannes Schmitt
4d6e239f10 [Security/Acl] removed Doctrine dependency from interfaces and moved them to the actual implementation 2011-04-20 22:25:05 +02:00
Kris Wallsmith
30511d2965 [HttpFoundation] fixed FilesystemSessionStorage 2011-04-20 13:20:21 -07:00
Fabien Potencier
fd1636b324 [Routing] added RedirectableUrlMatcher 2011-04-20 15:54:48 +02:00
Ryan Weaver
967a42b797 [Form] Adding a check that the choice_list option on the ChoiceType implements the ChoiceListInterface.
Also removed an unused "use" statement.
2011-04-20 08:52:31 -05:00
Tim Nagel
03bb3580a6 [HttpFoundation\File] Removed realpath() 2011-04-20 23:52:17 +10:00
Fabien Potencier
9d2ea4ec31 Merge remote branch 'kriswallsmith/dic/method-renames'
* kriswallsmith/dic/method-renames:
  added method renames to UPDATE
  [DependencyInjection] renamed ContainerBuilder::remove() as removeDefinition() to be more consistent with other definition-related methods
  [DependencyInjection] renamed Definition::setArgument() as replaceArgument() to be more specific
2011-04-20 14:28:09 +02:00
Fabien Potencier
0dbfa18c46 [Routing] made a small optimization to the route dumper 2011-04-20 14:19:33 +02:00
Fabien Potencier
117321d3c6 replaced array for request context in Routing by a RequestContext class 2011-04-20 14:19:32 +02:00
Kris Wallsmith
470baaab9f [DependencyInjection] renamed ContainerBuilder::remove() as removeDefinition() to be more consistent with other definition-related methods 2011-04-20 04:48:19 -07:00
Kris Wallsmith
cdf706d357 [DependencyInjection] renamed Definition::setArgument() as replaceArgument() to be more specific 2011-04-20 04:47:44 -07:00
Fabien Potencier
07aae98495 [Routing] added support for _scheme requirement
The _scheme requirement can be used to force routes to always match one given scheme
and to always be generated with the given scheme.

So, if _scheme is set to https, URL generation will force an absolute URL if the
current scheme is http. And if you request the URL with http, you will be redirected
to the https URL.
2011-04-20 10:49:32 +02:00
Fabien Potencier
d993a9160a [HttpFoundation] fixed getScheme() method 2011-04-20 10:49:08 +02:00
Johannes M. Schmitt
c660fcd2f2 fixes a bug in the SwitchUserListener 2011-04-19 14:24:37 +02:00
Fabien Potencier
2014ff6856 merged lsmith77/url_generator_null_parameter 2011-04-19 14:21:14 +02:00
Fabien Potencier
e09a0f9f80 Merge remote branch 'brikou/coding_standards'
* brikou/coding_standards:
  removed empty lines/trailing spaces
2011-04-19 14:06:30 +02:00
Fabien Potencier
5ff67a8d54 made request data collector more robust when the user got the request content as a resource 2011-04-19 14:02:32 +02:00
Fabien Potencier
3ca5f513a4 [Form] added support for groups in form validation (when using array data) 2011-04-19 09:56:49 +02:00
Fabien Potencier
5242859920 [Form] fixed error bubbling for choices when expanded is true 2011-04-19 09:13:29 +02:00
Bernhard Schussek
d93e10160c [Form] Removed obsolete view variables 2011-04-18 15:47:18 +02:00
Lukas Kahwe Smith
1ecaade68d added support for parameters with default null 2011-04-18 15:35:05 +02:00
Bernhard Schussek
b93f5a372a [Form] Renamed ChoiceUtil to FormUtil and gave its methods more general names 2011-04-18 15:07:12 +02:00
Bernhard Schussek
abb0d0cde1 [Form] Removed StripTagsListener. Its implementation is insufficient and needs to be replaced by a better one.
The current implementation does not sanitize HTML properly. See [1] and [2] for more information.

[1] https://github.com/padraic/wibble
[2] http://blog.astrumfutura.com/?s=html+sanitising
2011-04-18 14:19:20 +02:00
Fabien Potencier
bee5d07d86 [Form] added a way to specify the form constraint when building the form (useful if you work with arrays instead of objects) 2011-04-18 14:09:29 +02:00
Bernhard Schussek
57722550de [Form] Added test for 'email' type and fixed a few bugs 2011-04-18 13:04:18 +02:00
Bernhard Schussek
23e9ad7a99 Merge remote branch 'mvrhov/email_type' into mvrhov_merge 2011-04-18 12:57:38 +02:00
Bernhard Schussek
eb21dc9fea [Form] Removed obsolete constraints from validation.xml 2011-04-18 12:57:19 +02:00
Bernhard Schussek
325049ac73 Revert "[Form] removed validation.xml file (not used anymore)"
This reverts commit 3e476e1c30.
2011-04-18 12:53:41 +02:00
Miha Vrhovnik
50011fa344 Added html5 email input to the forms 2011-04-18 11:17:41 +02:00
Miha Vrhovnik
43bcadbb80 Updating renamed event 2011-04-18 11:00:26 +02:00
Fabien Potencier
3a2ca3dd92 moved Doctrine2 Entity Type guesser to the Doctrine bridge 2011-04-18 08:44:37 +02:00
Fabien Potencier
4bfd5bf079 [Form] tweaked Date time transformer to allow fields with 0 as hour/minute/... 2011-04-17 22:50:22 +02:00
Fabien Potencier
3e476e1c30 [Form] removed validation.xml file (not used anymore) 2011-04-17 22:33:31 +02:00
Fabien Potencier
f4aae27904 Merge remote branch 'lsmith77/add_decoder_interface'
* lsmith77/add_decoder_interface:
  added a DecodeInterface (and SerializerAwareInterface) to make it easier to identify if an Encoder also supports decoding
2011-04-17 19:30:13 +02:00
Bernhard Schussek
be5738564f [Form] Improved regular expression in AbstractType::getName() and added unit tests 2011-04-17 18:01:22 +02:00
Bernhard Schussek
4905bfd285 Merge remote branch 'brikou/form' into form 2011-04-17 18:01:17 +02:00
Lukas Kahwe Smith
874c4b6e07 added a DecodeInterface (and SerializerAwareInterface) to make it easier to identify if an Encoder also supports decoding 2011-04-17 17:00:42 +02:00
Lukas Kahwe Smith
c2ac8304b0 added text/html to default format mapping 2011-04-17 14:39:07 +02:00
Lukas Kahwe Smith
4c3c6cdabf return "q" from splitHttpAcceptHeader() to enable more complex accept header negotiations 2011-04-17 14:38:33 +02:00
Lukas Kahwe Smith
53c7bcf3aa added support for setting a custom default format in Request::getRequestFormat() 2011-04-17 14:37:35 +02:00
Fabien Potencier
7a70236437 Merge remote branch 'schmittjoh/containerBaseClass'
* schmittjoh/containerBaseClass:
  [DependencyInjection] make base class of generated container configurable
2011-04-17 14:15:36 +02:00
Fabien Potencier
62737c2495 Merge remote branch 'hidenorigoto/feature/add-server-param-method'
* hidenorigoto/feature/add-server-param-method:
  [BrowserKit] added tests for setServerParameter/getServerParameter methods
  [BrowserKit] added getServerParameter method which makes setServerParameters/setServerParameter methods testable
  [BrowserKit] added the method to Client which enables to set single server parameter
2011-04-17 14:14:49 +02:00
Fabien Potencier
5861a1b962 Merge remote branch 'merk/security/phpdoc'
* merk/security/phpdoc:
  [Security] Added missing phpdoc
2011-04-17 14:11:49 +02:00
Johannes M. Schmitt
30bac46e1b [DependencyInjection] make base class of generated container configurable 2011-04-17 12:29:33 +02:00
hidenorigoto
1d85a3dcb1 [BrowserKit] added getServerParameter method which makes setServerParameters/setServerParameter methods testable 2011-04-17 11:22:59 +09:00
hidenorigoto
54c3d236c2 [BrowserKit] added the method to Client which enables to set single server parameter 2011-04-17 10:45:32 +09:00
Fabien Potencier
c6818d8bf7 [HttpKernel] added support for controllers as arrays and object with an __invoke method
Controllers can now be any valid PHP callable
2011-04-16 16:26:15 +02:00
Tobias Naumann
f6ce451e2c [Form] Made FormView implement Countable 2011-04-16 13:54:31 +02:00
Tim Nagel
ad86f9ff0d [Security] Added missing phpdoc 2011-04-16 16:21:04 +10:00
Brikou CARRE
e898445b94 removed empty lines/trailing spaces 2011-04-15 21:12:02 +02:00
Brikou CARRE
a83046f470 fixed regex (we don't need '?') 2011-04-15 19:04:53 +02:00
Brikou CARRE
28121e4a57 [Form] AbstractType::getName() improvement 2011-04-15 18:58:15 +02:00
Bernhard Schussek
30922d9375 [Form] Fixed: Checkboxes in an expanded choice field never have the 'required' HTML5 attribute. Closes http://trac.symfony-project.org/ticket/9588 2011-04-15 16:10:04 +02:00
Bernhard Schussek
9582221862 [Form] ResizeFormListener::preBind() now handles empty strings. Fixes https://github.com/symfony/symfony/pull/40 2011-04-15 15:43:02 +02:00
Bernhard Schussek
d0c572716a Merge remote branch 'henrikbjorn/form' into henrik_merge 2011-04-15 15:34:29 +02:00
Henrik Bjørnskov
e687685f98 [Form] change FormView::setVar,getVar,getVars,hasVar to set,get,all,has
[Form] Fixed {get,set,has}Var references in templating php

[Form] Added getVars to FormView to ease usage in Twig. Also added some phpdoc and cleaned up the get method by adding a default value

[Form] Fix

[Form] Delete file generated by test
2011-04-15 15:25:37 +02:00
Bernhard Schussek
e787d5dc22 [Form] PropertyPath now can handle elements with special characters 2011-04-15 15:25:19 +02:00
Bernhard Schussek
4f1ae660fa [Form] Fixed choice labels in expanded choice fields 2011-04-15 15:04:44 +02:00
Bernhard Schussek
41c6ab0ac7 [Form] Field labels can now be passed in the 'label' option 2011-04-15 15:03:10 +02:00
Bernhard Schussek
8fe21285ba [Form] Renamed Form::getView() to createView() to clearly indicate that each call returns a new object 2011-04-15 13:52:11 +02:00
Bernhard Schussek
276b23a344 [Form] Moved creation logic of FormView to Form class 2011-04-15 13:41:45 +02:00
Fabien Potencier
db8b118e8a Merge remote branch 'hidenorigoto/fix-methodname-case'
* hidenorigoto/fix-methodname-case:
  [HttpFoundation] fixed wrong method name
2011-04-15 12:53:37 +02:00
Bernhard Schussek
44fa9bbeaa [Form] Fixed: CSRF token is regenerated if validation fails to avoid stalled tokens. Closes https://github.com/symfony/symfony/pull/415 2011-04-15 12:50:50 +02:00
Bernhard Schussek
c9c8b5c98e [Form] Improved test coverage of MonthChoiceList and fixed timezone used in it. Fixes https://github.com/symfony/symfony/pull/433
Based on dfb93b1bcebf1f34d3a880d00f36acb2bcca0f08:

[FORM] Fixed DateField Month Choices

The month choices were calculated using the current day of the month with
gmmktime rather than the 1st of the month. Additionally, this provides a
UTC timestamp which is passed to the formatter (IntlDateFormatter) which
converts the timestamp using the current timezone. This means that the UTC
timestamp for 1st March was being converted for my timezone (EST) and giving
a date of 28th February, leading to Feb appearing again in the popup form
instead of Mar.
2011-04-15 12:26:07 +02:00
Fabien Potencier
7e58c3f976 [Routing] allowed default route variables to be null 2011-04-15 12:04:48 +02:00
hidenorigoto
1e78ec395c [HttpFoundation] fixed wrong method name 2011-04-15 19:04:00 +09:00
Fabien Potencier
ad112da5bc added the request content to the request data collector 2011-04-15 11:31:08 +02:00
Bernhard Schussek
77bea81ed5 [Form] Improved test coverage of ResizeFormListener. Fixed https://github.com/symfony/symfony/pull/493 2011-04-15 11:06:51 +02:00
Bernhard Schussek
fa457b1cc4 [Form] Renamed 'filter' listeners to 'on' to match naming conventions across the framework 2011-04-15 10:57:32 +02:00
Fabien Potencier
de390fd893 [DependencyInjection] removed timing info as it is useless 2011-04-15 10:42:56 +02:00
Fabien Potencier
0b563c32ac Merge remote branch 'schmittjoh/diLogging'
* schmittjoh/diLogging:
  [DependencyInjection] enable debug related passes only in debug environment
  [DependencyInjection] removed pass time
  [DependencyInjection] fixes a bug which might have occurred when using property injection under certain circumstances
  [DependencyInjection] fixed method name
  [FrameworkBundle] whitespace fix
  [DependencyInjection] refactored code a bit, added some more logging messages
  [DependencyInjection] dump a readable format
  [DependencyInjection] better logging
2011-04-15 10:38:54 +02:00
Johannes Schmitt
fd5caa9546 [DependencyInjection] also check references of inlined services 2011-04-15 08:47:28 +02:00
Johannes Schmitt
ff41541d45 [DependencyInjection] removed pass time 2011-04-15 08:19:28 +02:00
Fabien Potencier
067bd0009e Merge remote branch 'kriswallsmith/scalar-nodes'
* kriswallsmith/scalar-nodes:
  removed a lot of special normalization logic in the configuration by using xml values instead of attributes
2011-04-15 07:44:22 +02:00
Johannes Schmitt
6d7a9d752d [DependencyInjection] adds emulation of "exception-on-invalid-reference" behavior
This pass requires that all of references are valid at the end of
the compilation process.
2011-04-15 00:55:18 +02:00
Johannes M. Schmitt
1992c3b96d [DependencyInjection] fixes a bug which might have occurred when using property injection under certain circumstances 2011-04-14 21:29:46 +02:00
Johannes M. Schmitt
75ac0f5dc3 [DependencyInjection] fixed method name 2011-04-14 21:07:16 +02:00
Johannes M. Schmitt
6ea9fb16c7 [DependencyInjection] refactored code a bit, added some more logging messages 2011-04-14 21:01:37 +02:00
Bernhard Schussek
e3db366116 [Form] Passing FormFactory to FormBuilder in its constructor 2011-04-14 15:25:30 +02:00
Bernhard Schussek
44af72bbf4 Merge remote branch 'symfony/master' into experimental 2011-04-14 15:04:59 +02:00
Bernhard Schussek
72b17cd67c [Form] Renamed TemplateContext to FormView 2011-04-14 15:02:51 +02:00
Bernhard Schussek
ca6ae09779 [Form] Removed TemplateContext::create() 2011-04-14 14:42:17 +02:00
Fabien Potencier
9cc340a262 fixed inconsistencies in file locator classes 2011-04-14 12:52:22 +02:00
Bernhard Schussek
ce5f3073bd Fixed test suite and names of accessor methods in TemplateContext 2011-04-14 03:52:52 +02:00
Fabien Potencier
5316decd8c Merge remote branch 'hhamon/shared_maxage_fix'
* hhamon/shared_maxage_fix:
  [HttpFoundation] force Response to be "public" if setSharedMaxAge() is called.
2011-04-13 23:24:31 +02:00
Fabien Potencier
b32a7e935a simplified code 2011-04-13 23:18:28 +02:00
Fabien Potencier
ea84bb025b fixed session management in functional tests 2011-04-13 23:11:25 +02:00
Fabien Potencier
6957dae4f9 [HttpKernel] added support for cookies in Client 2011-04-13 20:25:35 +02:00
Fabien Potencier
e2c9fdf2c7 [HttpFoundation] fixed expiration time for Cookie (PHP wants a Unix timestamp) 2011-04-13 20:12:14 +02:00
Fabien Potencier
66c4bc727c [HttpFoundation] renamed Cookie::getExpire() to getExpiresTime() to be consistent with the DomCrawler component 2011-04-13 20:10:39 +02:00
Fabien Potencier
84dde4074a [HttpFoundation] changed default value of Cookie httponly argument to match PHP defaults 2011-04-13 20:07:31 +02:00
hhamon
053d83f557 [HttpFoundation] force Response to be "public" if setSharedMaxAge() is called. 2011-04-13 15:58:48 +02:00
Bernhard Schussek
8031ad77c8 Merge remote branch 'fabpot/form' into fabpot_merge 2011-04-13 15:58:15 +02:00
Kris Wallsmith
672291087c removed a lot of special normalization logic in the configuration by using xml values instead of attributes 2011-04-13 05:59:46 -07:00
Fabien Potencier
a6d790f89f Merge remote branch 'hhamon/http_cache_fix'
* hhamon/http_cache_fix:
  [HttpKernel] private $traces property was not initialized to an empty array. When using the getLog() method to debug traces, it led to a warning in the apache error log.
2011-04-13 14:38:32 +02:00
Fabien Potencier
fa6961bb91 Revert "Merge remote branch 'lsmith77/prevent_redundant_DI_method_calls'"
This reverts commit 0d61ae06b4, reversing
changes made to 8e3d125902.
2011-04-13 14:30:06 +02:00
Fabien Potencier
227c87404f Merge remote branch 'Funsational/master'
* Funsational/master:
  Update PDO session storage to check if any rows are updated when doing a session write. If no rows are udpated when performing a session write it generally means that we have created a new session id somewhere and we have not inserted into the database. This is the case for when calling regenerate_session_id() from the native session storage class. It will update the session id then call sessionWrite() to save the session but since the new session id does not exist in the DB, no rows are updated and any new session attributes such as security tokens are lost.
2011-04-13 14:27:16 +02:00
hhamon
facb67cbfa [HttpKernel] private $traces property was not initialized to an empty array. When using the getLog() method to debug traces, it led to a warning in the apache error log. 2011-04-13 14:24:53 +02:00
Fabien Potencier
0d61ae06b4 Merge remote branch 'lsmith77/prevent_redundant_DI_method_calls'
* lsmith77/prevent_redundant_DI_method_calls:
  do not add method calls from interface injection if a method call has already been set manually
2011-04-13 14:16:14 +02:00
Lukas Kahwe Smith
c9be18a79f do not add method calls from interface injection if a method call has already been set manually 2011-04-13 14:11:56 +02:00
Fabien Potencier
4e047b5e27 Merge remote branch 'vicb/event_debug'
* vicb/event_debug:
  [FrameworkBundle] Make some TraceableEventDispacther properties private
  [Event] Tweak phpDoc for consistency
  [FrameworkBundle] Add error detection to the TraceableEventDispatcher
2011-04-13 14:07:05 +02:00
George Giannoulopoulos
81e1d4f11d Refactoring, replace is_null() wuth null === 2011-04-13 13:56:15 +02:00
Bernhard Schussek
2a18be1c9f Merge remote branch 'symfony/master' into experimental 2011-04-13 13:53:20 +02:00
Fabien Potencier
7913d7978e [Form] removed DefaultFormFactory as it does not help that much and adds some confusion 2011-04-13 13:24:56 +02:00
Fabien Potencier
92f77cce97 Merge remote branch 'lsmith77/ResolveInvalidReferencesPass'
* lsmith77/ResolveInvalidReferencesPass:
  updated tests (aka removed exceptions handling)
  use synthetic services instead of special exceptions
2011-04-13 11:46:52 +02:00
Fabien Potencier
49dc836521 [Form] moved the template context creation to the Form class
Moving the template context creation makes sense and allows for simpler code for the end user:

Before:

        return array('post' => $post, 'form' => $this->get('form.factory')->createTemplateContext($form));

After:

        return array('post' => $post, 'form' => $form->getContext());
2011-04-13 09:31:13 +02:00
Fabien Potencier
94eed37a93 Merge remote branch 'schmittjoh/parameterBagEnhancement'
* schmittjoh/parameterBagEnhancement:
  [HttpFoundation] added some unit tests
  [HttpFoundation] allow to retrieve paths of arbitrary depths
2011-04-13 07:58:14 +02:00
Johannes Schmitt
2397bcbe94 [DependencyInjection] better logging 2011-04-13 00:51:32 +02:00
Fabien Potencier
d95a743d9f Merge remote branch 'Brouznouf/master'
* Brouznouf/master:
  [Serializer] Revert DOMElement to SimpleXmlElement
  [Serializer] Using DOMElement instead of SimpleXmlElement in XmlEncoder to permit some behavior
2011-04-12 13:02:35 +02:00
Fabien Potencier
e6fd8deb00 [Security] tweaked some exception messages 2011-04-12 11:41:39 +02:00
Brouznouf
86343b43ec [Serializer] Revert DOMElement to SimpleXmlElement 2011-04-12 11:18:17 +02:00
Brouznouf
b02c1d9f32 Merge remote branch 'upstream/master' 2011-04-12 11:17:09 +02:00
Fabien Potencier
41a1a75b92 [Process] made default options overridable 2011-04-12 11:04:35 +02:00
Fabien Potencier
7f911642e1 Merge remote branch 'pborreli/windows-process-fix'
* pborreli/windows-process-fix:
  [Process][Windows] Don't use cmd for launching process (fixing Sismo git.exe calling)
2011-04-12 11:04:02 +02:00
Fabien Potencier
d163a60f54 [Security] fixed URL 2011-04-12 10:49:22 +02:00
Lukas Kahwe Smith
a4b04c4add use synthetic services instead of special exceptions 2011-04-12 10:07:46 +02:00
Pascal Borreli
3e8874df75 Merge remote-tracking branch 'upstream/master' into windows-process-fix 2011-04-12 01:05:46 +00:00
Brouznouf
8e6233e9c2 [Serializer] Using DOMElement instead of SimpleXmlElement in XmlEncoder to permit some behavior 2011-04-12 00:58:21 +02:00
Fabien Potencier
aa26624161 Merge remote branch 'vicb/template_logical_name'
* vicb/template_logical_name:
  Display template logical names in exception messages
2011-04-11 18:35:51 +02:00
Kris Wallsmith
c5fe4c390d [Templating] cleaned up some anomalies in the engine 2011-04-11 09:20:47 -07:00
Fabien Potencier
7f2294395c [Form] reverted the templating part to be similar to what we have today 2011-04-11 16:42:51 +02:00
Pascal Borreli
46b4098907 [Process][Windows] Don't use cmd for launching process (fixing Sismo git.exe calling) 2011-04-09 17:31:26 +00:00
Victor Berchet
e254ff8cc6 Display template logical names in exception messages 2011-04-08 19:56:12 +02:00
Fabien Potencier
9ceec87eb8 [DomCrawler] fixed various bug with URIs 2011-04-08 17:52:43 +02:00
Fabien Potencier
a230090537 removed some json_encode() calls to use the new getLogicalName() method instead 2011-04-08 17:28:27 +02:00
Fabien Potencier
5558ee24c7 Merge remote branch 'hason/logicalname'
* hason/logicalname:
  [Templating] changed __toString method (synonym for getLogicalName method)
  [Templating] fixed phpdoc a test
  [FrameworkBundle] added getLogicalName() method to TemplateReference
  [Templating] added method to return the template logical name, added test
2011-04-08 17:22:11 +02:00
Johannes M. Schmitt
8132102237 [Process] use component exception 2011-04-08 14:27:03 +02:00
Johannes M. Schmitt
34beec2161 [Process][Assetic] refactored some code to allow for better executable defaults 2011-04-08 12:20:27 +02:00
Martin Hason
185144bc46 [Templating] changed __toString method (synonym for getLogicalName method) 2011-04-08 11:33:35 +02:00
Martin Hason
20c5db2197 [Templating] fixed phpdoc a test 2011-04-08 11:24:28 +02:00
Martin Hason
6b5d991685 [Templating] added method to return the template logical name, added test 2011-04-08 10:31:47 +02:00
Victor Berchet
ceb2c976de [HttpKernel] Fix the case where no resource is found 2011-04-08 08:52:03 +02:00
Fabien Potencier
dfa1da0416 [Form] removed unused use statement and fixed phpdoc 2011-04-07 09:00:01 +02:00
michaelwilliams
c4660418d2 Merge remote-tracking branch 'upstream/master' 2011-04-06 17:42:32 -07:00
Pascal Borreli
3dfbc08d73 [HttpKernel][Windows] Removed useless DIRECTORY_SEPARATOR conversion 2011-04-06 17:30:32 +00:00
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
3482ff73b7 [Form] Fixed empty value in choice fields 2011-04-06 15:59:09 +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
3ff157c8a5 [Validator] switched to apc_exists() 2011-04-06 04:12:29 -07:00