X-Git-Url: https://git.mxchange.org/?p=hub.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;fp=inc%2Fclasses%2Fmain%2Fclass_BaseFrameworkSystem.php;h=7e461ac820071fde42e846ae1b7f2e79adf211be;hp=9dd62b4f4467abcbb78a441bd2e85cdc914dd3b4;hb=663356790b69b73605e383989654ed51bf1b22e8;hpb=1fc59c41e4a5a4791dec393d4a69f0633f60fc15 diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 9dd62b4f4..7e461ac82 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -281,7 +281,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { // Set the compressor channel $this->setCompressorChannel(CompressorChannel::createCompressorChannel(sprintf("%s%s", - PATH, + $this->getConfigInstance()->readConfig('base_path'), $this->getConfigInstance()->readConfig('compressor_base_path') ))); @@ -557,25 +557,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { $this->realClass = $realClass; } - /** - * Compare if both simulation part description and class name matches - * (shall be enough) - * - * @param $itemInstance An object instance to an other class - * @return boolean The result of comparing class name simulation part description - * @deprecated - */ - public function itemMatches ($itemInstance) { - $this->partialStub("Deprecated!"); - return ( - ( - $this->__toString() == $itemInstance->__toString() - ) && ( - $this->getObjectDescription() == $itemInstance->getObjectDescription() - ) - ); - } - /** * Compare class name of this and given class name * @@ -737,8 +718,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } // END - if // Generate FQFN for all application templates - $fqfn = sprintf("%s%s/%s/%s", - PATH, + $fqfn = sprintf("%s%s/%s", $this->getConfigInstance()->readConfig('application_path'), strtolower($appInstance->getAppShortName()), $this->getConfigInstance()->readConfig('tpl_base_path') @@ -911,7 +891,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { } // END - if // Add line number to the code - foreach (explode("\n", $phpCode) as $lineNo=>$code) { + foreach (explode("\n", $phpCode) as $lineNo => $code) { // Add line numbers $markedCode .= sprintf("%s: %s\n", ($lineNo + 1),