From d12af3294af2d790e423a16891f395d88b139832 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 27 May 2015 03:37:43 +0200 Subject: [PATCH] Updated to latest 'core' + convertToClassName() and convertDashesToUnderscores() are now static. Signed-off-by: Roland Haeder --- application/selector/class_ApplicationHelper.php | 6 +++--- application/shipsimu/class_ApplicationHelper.php | 6 +++--- core | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/application/selector/class_ApplicationHelper.php b/application/selector/class_ApplicationHelper.php index 8f93e18..204800f 100644 --- a/application/selector/class_ApplicationHelper.php +++ b/application/selector/class_ApplicationHelper.php @@ -157,7 +157,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica $responseType = self::getResponseTypeFromSystem(); // Create a new request object - $requestInstance = ObjectFactory::createObjectByName($this->convertToClassName($response) . 'Request'); + $requestInstance = ObjectFactory::createObjectByName(self::convertToClassName($response) . 'Request'); // Remember request instance here $this->setRequestInstance($requestInstance); @@ -170,7 +170,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica } // END - if // ... and a new response object - $responseClass = sprintf('%sResponse', $this->convertToClassName($response)); + $responseClass = sprintf('%sResponse', self::convertToClassName($response)); $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this)); // Remember response instance here @@ -189,7 +189,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica } // END - if // Get a controller resolver - $resolverClass = $this->convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); + $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this)); // Get a controller instance as well diff --git a/application/shipsimu/class_ApplicationHelper.php b/application/shipsimu/class_ApplicationHelper.php index 8f93e18..204800f 100644 --- a/application/shipsimu/class_ApplicationHelper.php +++ b/application/shipsimu/class_ApplicationHelper.php @@ -157,7 +157,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica $responseType = self::getResponseTypeFromSystem(); // Create a new request object - $requestInstance = ObjectFactory::createObjectByName($this->convertToClassName($response) . 'Request'); + $requestInstance = ObjectFactory::createObjectByName(self::convertToClassName($response) . 'Request'); // Remember request instance here $this->setRequestInstance($requestInstance); @@ -170,7 +170,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica } // END - if // ... and a new response object - $responseClass = sprintf('%sResponse', $this->convertToClassName($response)); + $responseClass = sprintf('%sResponse', self::convertToClassName($response)); $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this)); // Remember response instance here @@ -189,7 +189,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica } // END - if // Get a controller resolver - $resolverClass = $this->convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); + $resolverClass = self::convertToClassName($this->getAppShortName() . '_' . $responseType . '_controller_resolver'); $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this)); // Get a controller instance as well diff --git a/core b/core index a578894..1f81d21 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit a57889486c1cbc1a24f5926a02a80d319ed88a86 +Subproject commit 1f81d21b97669832b84da3680d046eb9e4afba64 -- 2.39.5