X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fhelper%2Fclass_BaseHelper.php;h=8011081af8da8de89aab160e93e5a3de76eb160d;hp=e360adc6229f9a97f6e5a65a49f83b45bee6e986;hb=c879213e1d244b3e814473050719e87a7a343e82;hpb=3e1fbf30a631cf1cd64562b69228452c49e0033f diff --git a/inc/classes/main/helper/class_BaseHelper.php b/inc/classes/main/helper/class_BaseHelper.php index e360adc6..8011081a 100644 --- a/inc/classes/main/helper/class_BaseHelper.php +++ b/inc/classes/main/helper/class_BaseHelper.php @@ -2,11 +2,11 @@ /** * A generic helper class with generic methods * - * @author Roland Haeder + * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org + * @link http://www.shipsimu.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -87,7 +87,7 @@ class BaseHelper extends BaseFrameworkSystem { * @return void */ protected final function addContent ($newContent) { - $this->content .= (string) trim($newContent) . "\n"; + $this->content .= (string) trim($newContent) . PHP_EOL; } /** @@ -175,7 +175,7 @@ class BaseHelper extends BaseFrameworkSystem { public function assignFieldWithFilter ($fieldName, $filterMethod) { // Get the value $fieldValue = $this->getValueField($fieldName); - //* DEBUG: */ $this->debugOutput($fieldName.'='.$fieldValue); + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($fieldName.'='.$fieldValue); // Now filter it through the value through the filter method $filteredValue = call_user_func_array(array($this, 'doFilter' . $this->convertToClassName($filterMethod)), array($fieldValue)); @@ -193,14 +193,14 @@ class BaseHelper extends BaseFrameworkSystem { * @throws NullPointerException If recovery of requested value instance failed */ public function prefetchValueInstance ($registryKey, $extraKey = NULL) { - //* DEBUG: */ $this->debugOutput('O:'.$registryKey.'/'.$extraKey); + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('O:'.$registryKey.'/'.$extraKey); try { // Get the required instance $this->valueInstance = Registry::getRegistry()->getInstance($registryKey); } catch (NullPointerException $e) { // Not set in registry // @TODO Try to log it here - //* DEBUG: */ $this->debugOutput($registryKey.'=NULL!'); + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($registryKey.'=NULL!'); } // Shall we get an extra instance? @@ -212,18 +212,13 @@ class BaseHelper extends BaseFrameworkSystem { // Try to create it $this->extraInstance = ObjectFactory::createObjectByConfiguredName($extraKey . '_class', array($this->valueInstance)); } - //* DEBUG: */ $this->debugOutput($extraKey.'='.$this->extraInstance.' - EXTRA!'); + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($extraKey.'='.$this->extraInstance.' - EXTRA!'); } // END - if // Is the value instance valid? if (is_null($this->valueInstance)) { - try { - // Get the requested instance - $this->valueInstance = ObjectFactory::createObjectByConfiguredName($registryKey . '_class', array($this->extraInstance)); - } catch (FrameworkException $e) { - // Okay, nothing found so throw a null pointer exception here - throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); - } + // Get the requested instance + $this->valueInstance = ObjectFactory::createObjectByConfiguredName($registryKey . '_class', array($this->extraInstance)); } // END - if } @@ -251,9 +246,9 @@ class BaseHelper extends BaseFrameworkSystem { // Add the group to the stack $this->groups[$this->totalCounter] = $groupId; - $this->groups[$groupId]['opened'] = true; + $this->groups[$groupId]['opened'] = TRUE; $this->groups[$groupId]['content'] = sprintf( - "%s\n", + '%s' . PHP_EOL, $groupId, strlen($content), $tag, @@ -281,7 +276,7 @@ class BaseHelper extends BaseFrameworkSystem { } // END - if // Check if any group was opened before - if ($this->ifGroupOpenedPreviously() === false) { + if ($this->ifGroupOpenedPreviously() === FALSE) { // Then throw an exception throw new HelperNoPreviousOpenedGroupException(array($this, $content), self::EXCEPTION_NO_PREVIOUS_SUB_GROUP_OPENED); } // END - if @@ -307,7 +302,7 @@ class BaseHelper extends BaseFrameworkSystem { $this->groups[$groupId]['tag'], $content ); - $this->groups[$groupId]['opened'] = false; + $this->groups[$groupId]['opened'] = FALSE; // Mark previous group as closed $this->setPreviousGroupId(''); @@ -338,7 +333,7 @@ class BaseHelper extends BaseFrameworkSystem { // Add the group to the stack $this->subGroups[$this->totalCounter] = $subGroupId; - $this->subGroups[$subGroupId]['opened'] = true; + $this->subGroups[$subGroupId]['opened'] = TRUE; $this->subGroups[$subGroupId]['content'] = sprintf("%s\n", $subGroupId, strlen($content), $tag, $content); $this->subGroups[$subGroupId]['tag'] = $tag; @@ -356,7 +351,7 @@ class BaseHelper extends BaseFrameworkSystem { */ public function closePreviousSubGroupByContent ($content = '') { // Check if any sub group was opened before - if ($this->ifSubGroupOpenedPreviously() === false) { + if ($this->ifSubGroupOpenedPreviously() === FALSE) { // Then throw an exception throw new HelperNoPreviousOpenedSubGroupException(array($this, $content), self::EXCEPTION_NO_PREVIOUS_SUB_GROUP_OPENED); } // END - if @@ -367,12 +362,13 @@ class BaseHelper extends BaseFrameworkSystem { // Is the content empty? if ((empty($content)) && (!empty($this->subGroups[$subGroupId]['tag']))) { // Get it from opener - $content = sprintf("", $subGroupId, $this->subGroups[$subGroupId]['tag']); + $content = sprintf('', $subGroupId, $this->subGroups[$subGroupId]['tag']); } // END - if // Add content to it and mark it as closed - $this->subGroups[$subGroupId]['content'] .= sprintf("%s\n", $subGroupId, strlen($content), $this->subGroups[$subGroupId]['tag'], $content); - $this->subGroups[$subGroupId]['opened'] = false; + $this->subGroups[$subGroupId]['content'] .= sprintf('%s' . PHP_EOL, $subGroupId, strlen($content), $this->subGroups[$subGroupId]['tag'], $content); + $this->subGroups[$subGroupId]['opened'] = FALSE + ; // Mark previous sub group as closed $this->setPreviousSubGroupId(''); @@ -391,7 +387,7 @@ class BaseHelper extends BaseFrameworkSystem { // Is header content there? if (isset($this->groups['header'])) { // Then add it - $content .= $this->groups['header']['content'] . "\n"; + $content .= $this->groups['header']['content'] . PHP_EOL; } // END - if // Initiate content @@ -400,26 +396,26 @@ class BaseHelper extends BaseFrameworkSystem { // Now "walk" through all groups and sub-groups for ($idx = 1; $idx <= $this->totalCounter; $idx++) { // Is this a sub/group and is it closed? - if ((isset($this->groups[$idx])) && ($this->groups[$this->groups[$idx]]['opened'] === false)) { + if ((isset($this->groups[$idx])) && ($this->groups[$this->groups[$idx]]['opened'] === FALSE)) { // Then add it's content $groupContent = trim($this->groups[$this->groups[$idx]]['content']); //* DEBUG: */ echo "group={$this->groups[$idx]},content=
".htmlentities($groupContent)."

\n"; $content .= $groupContent; - } elseif ((isset($this->subGroups[$idx])) && ($this->subGroups[$this->subGroups[$idx]]['opened'] === false)) { + } elseif ((isset($this->subGroups[$idx])) && ($this->subGroups[$this->subGroups[$idx]]['opened'] === FALSE)) { // Then add it's content $subGroupContent = $this->subGroups[$this->subGroups[$idx]]['content']; //* DEBUG: */ echo "subgroup={$this->subGroups[$idx]},content=
".htmlentities($subGroupContent)."

\n"; $content .= trim($subGroupContent); } else { // Something went wrong - $this->debugInstance(__METHOD__."(): Something unexpected happened here."); + $this->debugInstance(__METHOD__ . '(): Something unexpected happened here.'); } } // END - for // Is footer content there? if (isset($this->groups['footer'])) { // Then add it - $content .= $this->groups['footer']['content'] . "\n"; + $content .= $this->groups['footer']['content'] . PHP_EOL; } // END - if // Return it @@ -428,14 +424,14 @@ class BaseHelper extends BaseFrameworkSystem { } /** - * Checks wether the specified group is opened + * Checks whether the specified group is opened * * @param $groupId Id of group to check - * @return $isOpened Wether the specified group is open + * @return $isOpened Whether the specified group is open */ protected function ifGroupIsOpened ($groupId) { // Is the group open? - $isOpened = ((isset($this->groups[$groupId])) && ($this->groups[$groupId]['opened'] === true)); + $isOpened = ((isset($this->groups[$groupId])) && ($this->groups[$groupId]['opened'] === TRUE)); // Return status return $isOpened; @@ -457,7 +453,7 @@ class BaseHelper extends BaseFrameworkSystem { // Get the field value $fieldValue = $this->getValueInstance()->getField($fieldName); - //* DEBUG: */ $this->debugOutput($fieldName.'[]='.gettype($fieldValue).'('.strlen($fieldValue).')'); + //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput($fieldName.'[]='.gettype($fieldValue).'('.strlen($fieldValue).')'); // Is it null? if ((is_null($fieldValue)) && (!is_null($this->extraInstance))) { @@ -479,9 +475,9 @@ class BaseHelper extends BaseFrameworkSystem { } /** - * Check wether a group was opened previously + * Check whether a group was opened previously * - * @return $groupOpened Wether any group was opened before + * @return $groupOpened Whether any group was opened before */ protected final function ifGroupOpenedPreviously () { $groupOpened = (!empty($this->previousGroupId)); @@ -489,9 +485,9 @@ class BaseHelper extends BaseFrameworkSystem { } /** - * Check wether a group was opened previously + * Check whether a group was opened previously * - * @return $subGroupOpened Wether any group was opened before + * @return $subGroupOpened Whether any group was opened before */ protected final function ifSubGroupOpenedPreviously () { $subGroupOpened = (!empty($this->previousSubGroupId));