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

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

Revision: 205
          http://sourceforge.net/p/beeframework/code/205
Author:   m_plomer
Date:     2014-08-30 15:50:47 +0000 (Sat, 30 Aug 2014)
Log Message:
-----------
 - D2 EnumType: fixed compatibility with early 5.3 version (which exhibit quirks in reflected access to late statically bound methods)
 - MVC: fixed bug in BasicViewResolver that essentially disabled json view resolution

Modified Paths:
--------------
    trunk/framework/Bee/MVC/ViewResolver/BasicViewResolver.php
    trunk/framework/Bee/Persistence/Doctrine2/Types/EnumType.php

Modified: trunk/framework/Bee/MVC/ViewResolver/BasicViewResolver.php
===================================================================
--- trunk/framework/Bee/MVC/ViewResolver/BasicViewResolver.php	2014-08-29 16:47:25 UTC (rev 204)
+++ trunk/framework/Bee/MVC/ViewResolver/BasicViewResolver.php	2014-08-30 15:50:47 UTC (rev 205)
@@ -86,7 +86,7 @@
 		$modifiedViewName = $this->modifyViewName($viewName, $request);
 		if ($modifiedViewName != $viewName) {
 			try {
-				return $this->getViewForName($viewName);
+				return $this->getViewForName($modifiedViewName);
 			} catch (Bee_Context_BeansException $bex) {
 				if($this->getLog()->isDebugEnabled()) {
 					$this->getLog()->debug('Modified view name "' . $modifiedViewName . '" not found, trying base bean name "' . $viewName . '"', $bex);

Modified: trunk/framework/Bee/Persistence/Doctrine2/Types/EnumType.php
===================================================================
--- trunk/framework/Bee/Persistence/Doctrine2/Types/EnumType.php	2014-08-29 16:47:25 UTC (rev 204)
+++ trunk/framework/Bee/Persistence/Doctrine2/Types/EnumType.php	2014-08-30 15:50:47 UTC (rev 205)
@@ -42,7 +42,7 @@
 		if (!$this->reflClass) self::init();
 		$values = array_map(function ($val) {
 			return "'" . $val . "'";
-		}, $this->reflClass->getMethod('getValues')->invoke(null));
+		}, call_user_func(array(static::getEnumClassName(), 'getValues')));
 		return "ENUM(" . implode(", ", $values) . ") COMMENT '(DC2Type:" . $this->getName() . ")'";
 	}
 

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