[Beeframework-svn] SF.net SVN: beeframework:[170] trunk/framework/Bee/MVC
Brought to you by:
b_hartmann,
m_plomer
|
From: <m_p...@us...> - 2014-07-03 10:22:03
|
Revision: 170
http://sourceforge.net/p/beeframework/code/170
Author: m_plomer
Date: 2014-07-03 10:21:54 +0000 (Thu, 03 Jul 2014)
Log Message:
-----------
- MVC: namespaced some core classes
Modified Paths:
--------------
trunk/framework/Bee/MVC/Dispatcher.php
trunk/framework/Bee/MVC/HandlerMapping/AbstractHandlerMapping.php
trunk/framework/Bee/MVC/IHandlerExceptionResolver.php
trunk/framework/Bee/MVC/SimpleMappingExceptionResolver.php
Modified: trunk/framework/Bee/MVC/Dispatcher.php
===================================================================
--- trunk/framework/Bee/MVC/Dispatcher.php 2014-07-03 10:02:05 UTC (rev 169)
+++ trunk/framework/Bee/MVC/Dispatcher.php 2014-07-03 10:21:54 UTC (rev 170)
@@ -103,7 +103,7 @@
/**
* The view resolver used by this dispatcher
*
- * @var IViewResolver
+ * @var Bee\MVC\IViewResolver
*/
private $viewResolver;
@@ -116,7 +116,7 @@
/**
*
- * @var Bee_MVC_IHandlerExceptionResolver
+ * @var Bee\MVC\IHandlerExceptionResolver
*/
private $handlerExceptionResolver;
@@ -220,7 +220,7 @@
}
try {
- $this->handlerExceptionResolver = $this->context->getBean(self::HANDLER_EXCEPTION_RESOLVER_NAME, 'Bee_MVC_IHandlerExceptionResolver');
+ $this->handlerExceptionResolver = $this->context->getBean(self::HANDLER_EXCEPTION_RESOLVER_NAME, 'Bee\MVC\IHandlerExceptionResolver');
} catch (Bee_Context_NoSuchBeanDefinitionException $ex) {
$this->getLog()->info('no exception resolver configured');
}
Modified: trunk/framework/Bee/MVC/HandlerMapping/AbstractHandlerMapping.php
===================================================================
--- trunk/framework/Bee/MVC/HandlerMapping/AbstractHandlerMapping.php 2014-07-03 10:02:05 UTC (rev 169)
+++ trunk/framework/Bee/MVC/HandlerMapping/AbstractHandlerMapping.php 2014-07-03 10:21:54 UTC (rev 170)
@@ -104,7 +104,7 @@
public function getHandler(Bee_MVC_IHttpRequest $request) {
$controllerBeanName = $this->getControllerBeanName($request);
$handlerBean = is_string($controllerBeanName) ?
- $handlerBean = $this->context->getBean($controllerBeanName, 'IController') :
+ $handlerBean = $this->context->getBean($controllerBeanName, 'Bee\MVC\IController') :
$controllerBeanName;
if (!$handlerBean instanceof IController) {
Modified: trunk/framework/Bee/MVC/IHandlerExceptionResolver.php
===================================================================
--- trunk/framework/Bee/MVC/IHandlerExceptionResolver.php 2014-07-03 10:02:05 UTC (rev 169)
+++ trunk/framework/Bee/MVC/IHandlerExceptionResolver.php 2014-07-03 10:21:54 UTC (rev 170)
@@ -1,4 +1,5 @@
<?php
+namespace Bee\MVC;
/*
* Copyright 2008-2014 the original author or authors.
*
@@ -14,16 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-use Bee\MVC\IController;
+use Bee_MVC_IHttpRequest;
+use Exception;
-interface Bee_MVC_IHandlerExceptionResolver {
+interface IHandlerExceptionResolver {
/**
*
* @param Bee_MVC_IHttpRequest $request
* @param IController $handler
* @param Exception $ex
- * @return Bee_MVC_ModelAndView
+ * @return \Bee_MVC_ModelAndView
*/
public function resolveException(Bee_MVC_IHttpRequest $request, IController $handler = null, Exception $ex);
}
Modified: trunk/framework/Bee/MVC/SimpleMappingExceptionResolver.php
===================================================================
--- trunk/framework/Bee/MVC/SimpleMappingExceptionResolver.php 2014-07-03 10:02:05 UTC (rev 169)
+++ trunk/framework/Bee/MVC/SimpleMappingExceptionResolver.php 2014-07-03 10:21:54 UTC (rev 170)
@@ -15,8 +15,9 @@
* limitations under the License.
*/
use Bee\MVC\IController;
+use Bee\MVC\IHandlerExceptionResolver;
-class Bee_MVC_SimpleMappingExceptionResolver implements Bee_MVC_IHandlerExceptionResolver {
+class Bee_MVC_SimpleMappingExceptionResolver implements IHandlerExceptionResolver {
const MODEL_HANDLER_EXCEPTION_KEY = 'handler_excpetion';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|