Continued:

- stringVal() has been moved to StringUtils class and is now static
- updated core framework

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php
index ea51d451e374612763c716ef00e8206fe810e307..8545f70a71566c20d1264f62f5383ffd3a55d70d 100644 (file)
--- a/application/hub/class_ApplicationHelper.php
+++ b/application/hub/class_ApplicationHelper.php
@@ -13,7 +13,6 @@ use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
-use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
 
 /**
  * A class holding general data about the application and some methods for

diff --git a/application/hub/classes/handler/chunks/class_ChunkHandler.php b/application/hub/classes/handler/chunks/class_ChunkHandler.php
index 223a616b3922bcc7b54e96a2aa5e6e5ff89d05f7..0468445c7912eedf554b83170965d1f99bb20905 100644 (file)
--- a/application/hub/classes/handler/chunks/class_ChunkHandler.php
+++ b/application/hub/classes/handler/chunks/class_ChunkHandler.php
@@ -11,6 +11,7 @@ use Org\Shipsimu\Hub\Network\Package\Delivery\Fragment\PackageFragmenter;
 use Org\Mxchange\CoreFramework\Assertion\AssertionException;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
 use Org\Mxchange\CoreFramework\Traits\Crypto\CryptoTrait;
 
 /**
@@ -208,10 +209,10 @@ class ChunkHandler extends BaseHubHandler implements HandleableChunks, Registera
         * @param       $serialNumber   A serial number from a chunk
         * @return      $isValid                Whether the serial number is valid
         */
-       private function isSerialNumberValid ($serialNumber) {
+       private function isSerialNumberValid (string $serialNumber) {
                // Check it
                /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CHUNK-HANDLER: serialNumber=%s - CALLED!', $serialNumber));
-               $isValid = ((strlen($serialNumber) == PackageFragmenter::MAX_SERIAL_LENGTH) && ($this->hexval($serialNumber, FALSE) === $serialNumber));
+               $isValid = ((strlen($serialNumber) == PackageFragmenter::MAX_SERIAL_LENGTH) && (StringUtils::hexval($serialNumber, FALSE) === $serialNumber));
 
                // Return result
                /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CHUNK-HANDLER: isValid=%d - EXIT!', intval($isValid)));

diff --git a/application/hub/classes/package/assembler/class_PackageAssembler.php b/application/hub/classes/package/assembler/class_PackageAssembler.php
index 14704afd0928bbac3648020eb6aab50eb7938dfd..b6611b8ad67fbfe27c4d94784b54679decf54b52 100644 (file)
--- a/application/hub/classes/package/assembler/class_PackageAssembler.php
+++ b/application/hub/classes/package/assembler/class_PackageAssembler.php
@@ -18,9 +18,9 @@ use Org\Shipsimu\Hub\Network\Receive\Receivable;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Handler\Handleable;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
-use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
 use Org\Mxchange\CoreFramework\Stacker\Stackable;
 use Org\Mxchange\CoreFramework\Traits\Stream\Input\InputStreamTrait;
+use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;
 use Org\Mxchange\CoreFramework\Visitor\Visitor;
 

diff --git a/core b/core
index 8b3d5574973066ee9e99759f283005ca0c8d519b..8de52623465245375075410e5c14e36c1df1f621 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 8b3d5574973066ee9e99759f283005ca0c8d519b
+Subproject commit 8de52623465245375075410e5c14e36c1df1f621