Also this must be "namespaced" ;-)

[core.git] / application / tests / class_ApplicationHelper.php

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index a65e2966681977184bca72762258d7ff6d943f35..20cfaeafe778e5e611b9d389ddab35f80a116e89 100644 (file)
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -168,7 +168,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                $responseType = self::getResponseTypeFromSystem();
 
                // Create a new request object
                $responseType = self::getResponseTypeFromSystem();
 
                // Create a new request object

-               $requestInstance = ObjectFactory::createObjectByName(sprintf('\CoreFramework\Request\%sRequest', self::convertToClassName($response)));
+               $requestInstance = ObjectFactory::createObjectByName(sprintf('CoreFramework\Request\%sRequest', self::convertToClassName($response)));

 
                // Remember request instance here
                $this->setRequestInstance($requestInstance);
 
                // Remember request instance here
                $this->setRequestInstance($requestInstance);


@@ -181,7 +181,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                } // END - if
 
                // ... and a new response object
                } // END - if
 
                // ... and a new response object

-               $responseClass = sprintf('\CoreFramework\Response\%sResponse', self::convertToClassName($response));
+               $responseClass = sprintf('CoreFramework\Response\%sResponse', self::convertToClassName($response));

                $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
                // Remember response instance here
                $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
 
                // Remember response instance here


@@ -200,7 +200,14 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
                } // END - if
 
                // Get a controller resolver
                } // END - if
 
                // Get a controller resolver

-               $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver');
+               $resolverClass = sprintf(
+                       'CoreFramework\Resolver\Controller\%s',
+                       self::convertToClassName(sprintf(
+                               '%s_%s_controller_resolver',
+                               $this->getAppShortName(),
+                               $responseType
+                       ))
+               );

                $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
                // Get a controller instance as well
                $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
 
                // Get a controller instance as well