Signed-off-by: Roland Häder <roland@mxchange.org>
} // END - if
// Create class name
} // END - if
// Create class name
- $className = $this->getClassPrefix() . $this->convertToClassName($actionName) . 'Action';
+ $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($actionName) . 'Action';
// Now, let us create the full name of the action class
$this->setClassName($className);
// Now, let us create the full name of the action class
$this->setClassName($className);
$actionInstance = NULL;
// Create action class name
$actionInstance = NULL;
// Create action class name
- $className = $this->getClassPrefix() . $this->convertToClassName($this->getActionName()) . 'Action';
+ $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($this->getActionName()) . 'Action';
// ... and set it
$this->setClassName($className);
// ... and set it
$this->setClassName($className);
return $this->className;
}
return $this->className;
}
+ /**
+ * "Getter" for class name (useable for an object factory)
+ *
+ * @return $className Capitalized class name
+ */
+ protected function getCapitalizedClassPrefix () {
+ // Get class name
+ $className = $this->getClassPrefix();
+
+ // And capitalize it
+ $className = $this->convertToClassName($className);
+
+ // Return it
+ return $className;
+ }
+
/**
* Setter for class name
*
/**
* Setter for class name
*
} // END - if
// Create the full class name
} // END - if
// Create the full class name
- $className = $this->getClassPrefix() . $this->convertToClassName($commandName) . 'Command';
+ $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($commandName) . 'Command';
// Now, let us create the full name of the command class
$this->setClassName($className);
// Now, let us create the full name of the command class
$this->setClassName($className);
$commandInstance = NULL;
// Create class name
$commandInstance = NULL;
// Create class name
- $className = $this->getClassPrefix() . $this->convertToClassName($commandName) . 'Command';
+ $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($commandName) . 'Command';
// Create command class name
$this->setClassName($className);
// Create command class name
$this->setClassName($className);
$commandInstance = NULL;
// Create class name
$commandInstance = NULL;
// Create class name
- $className = $this->getClassPrefix() . $this->convertToClassName($commandName) . 'Command';
+ $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($commandName) . 'Command';
// Is this class loaded?
if (!class_exists($this->getClassName())) {
// Is this class loaded?
if (!class_exists($this->getClassName())) {
$controllerInstance = NULL;
// Default controller
$controllerInstance = NULL;
// Default controller
- $this->setClassName($this->getClassPrefix() . 'DefaultNewsController');
+ $this->setClassName($this->getCapitalizedClassPrefix() . 'DefaultNewsController');
// Generate the class name
//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BEFORE: controller=' . $controllerName);
if ($controllerName != $defaultController) {
// Create controller class name
// Generate the class name
//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('BEFORE: controller=' . $controllerName);
if ($controllerName != $defaultController) {
// Create controller class name
- $className = $this->getClassPrefix() . $this->convertToClassName($controllerName) . 'Controller';
+ $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($controllerName) . 'Controller';
// ... and set it
$this->setClassName($className);
} else {
// No news at main command or non-news command
// ... and set it
$this->setClassName($className);
} else {
// No news at main command or non-news command
- $this->setClassName($this->getClassPrefix() . 'DefaultNewsController');
+ $this->setClassName($this->getCapitalizedClassPrefix() . 'DefaultNewsController');
}
//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('AFTER: controller=' . $this->getClassName());
}
//* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('AFTER: controller=' . $this->getClassName());
} // END - if
// Create class name
} // END - if
// Create class name
- $className = $this->getClassPrefix() . $this->convertToClassName($controllerName) . 'Controller';
+ $className = $this->getCapitalizedClassPrefix() . $this->convertToClassName($controllerName) . 'Controller';
// Now, let us create the full name of the controller class
$this->setClassName($className);
// Now, let us create the full name of the controller class
$this->setClassName($className);
if (class_exists($this->getClassName())) {
// This class does exist. :-)
$isValid = TRUE;
if (class_exists($this->getClassName())) {
// This class does exist. :-)
$isValid = TRUE;
- } elseif ($this->getClassName() != $this->getClassPrefix() . 'DefaultNewsController') {
+ } elseif ($this->getClassName() != $this->getCapitalizedClassPrefix() . 'DefaultNewsController') {
// Set default controller
// Set default controller
- $this->setClassName($this->getClassPrefix() . 'DefaultNewsController');
+ $this->setClassName($this->getCapitalizedClassPrefix() . 'DefaultNewsController');
} else {
// All is tried, give it up here
throw new DefaultControllerException($this, self::EXCEPTION_DEFAULT_CONTROLLER_GONE);
} else {
// All is tried, give it up here
throw new DefaultControllerException($this, self::EXCEPTION_DEFAULT_CONTROLLER_GONE);