From 9a5592c259da4ce6f0349d6aba8e51657e241bbf Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Wed, 27 May 2015 03:35:59 +0200 Subject: [PATCH] Updated to latest 'core' + convertToClassName() and convertDashesToUnderscores() are now static. Signed-off-by: Roland Haeder --- application/lfdb2/class_ApplicationHelper.php | 6 +++--- .../main/filter/server/class_ServerInitializationFilter.php | 2 +- core | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/lfdb2/class_ApplicationHelper.php b/application/lfdb2/class_ApplicationHelper.php index 3517d28..d93593a 100644 --- a/application/lfdb2/class_ApplicationHelper.php +++ b/application/lfdb2/class_ApplicationHelper.php @@ -163,7 +163,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); @@ -176,7 +176,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 @@ -195,7 +195,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/lfdb2/main/filter/server/class_ServerInitializationFilter.php b/application/lfdb2/main/filter/server/class_ServerInitializationFilter.php index b57618b..0e95f96 100644 --- a/application/lfdb2/main/filter/server/class_ServerInitializationFilter.php +++ b/application/lfdb2/main/filter/server/class_ServerInitializationFilter.php @@ -70,7 +70,7 @@ class ServerInitializationFilter extends BaseServerFilter implements Filterable } // Now convert the node-mode in a class name - $className = 'Lfdb2' . $this->convertToClassName($nodeMode) . 'Server'; + $className = 'Lfdb2' . self::convertToClassName($nodeMode) . 'Server'; // And try to instance it try { diff --git a/core b/core index f1483fb..1f81d21 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f1483fbeae4881d349f9b9558340d1d56b0aab78 +Subproject commit 1f81d21b97669832b84da3680d046eb9e4afba64 -- 2.39.5