[Beeframework-svn] SF.net SVN: beeframework:[219] trunk/framework/Bee

[<m_p...@us...>]

Revision: 219
          http://sourceforge.net/p/beeframework/code/219
Author:   m_plomer
Date:     2014-09-18 01:53:52 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
 - MVC: fixed broken handling of optional parameters in AnnotationBasedInvocator

Modified Paths:
--------------
    trunk/framework/Bee/Beans/PropertyEditor/PropertyEditorRegistry.php
    trunk/framework/Bee/MVC/Controller/Multiaction/HandlerMethodInvocator/AnnotationBasedInvocator.php

Modified: trunk/framework/Bee/Beans/PropertyEditor/PropertyEditorRegistry.php
===================================================================
--- trunk/framework/Bee/Beans/PropertyEditor/PropertyEditorRegistry.php	2014-09-17 23:51:13 UTC (rev 218)
+++ trunk/framework/Bee/Beans/PropertyEditor/PropertyEditorRegistry.php	2014-09-18 01:53:52 UTC (rev 219)
@@ -135,5 +135,7 @@
 PropertyEditorRegistry::registerEditor(ITypeDefinitions::UNIX_TIMESTAMP, new UnixTimestampPropertyEditor());
 PropertyEditorRegistry::registerEditor(ITypeDefinitions::STRING, new StringPropertyEditor());
 PropertyEditorRegistry::registerEditor(ITypeDefinitions::BASE64, new Base64StringPropertyEditor());
+// todo: implement actual ArraPropertyEditor
+PropertyEditorRegistry::registerEditor(ITypeDefinitions::ARRAY_TYPE, new StringPropertyEditor());
 
 PropertyEditorRegistry::registerEditor(ConstantPropertyEditor::TYPE_STRING, new ConstantPropertyEditor());

Modified: trunk/framework/Bee/MVC/Controller/Multiaction/HandlerMethodInvocator/AnnotationBasedInvocator.php
===================================================================
--- trunk/framework/Bee/MVC/Controller/Multiaction/HandlerMethodInvocator/AnnotationBasedInvocator.php	2014-09-17 23:51:13 UTC (rev 218)
+++ trunk/framework/Bee/MVC/Controller/Multiaction/HandlerMethodInvocator/AnnotationBasedInvocator.php	2014-09-18 01:53:52 UTC (rev 219)
@@ -103,6 +103,8 @@
 						(array_key_exists($parameter->getName(), $_REQUEST) ? $_REQUEST[$parameter->getName()] : null);
 				if (!is_null($value) || !$parameter->isOptional()) {
 					$args[$pos] = $propEditor->fromString($value);
+				} else {
+					$args[$pos] = null;
 				}
 			}
 		}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.