From e44c39a513f5c350acae16d2101b1c7b0371ca3d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 12 Aug 2021 15:48:45 +0200 Subject: [PATCH] Continued: - $infoInstance should not be NULL or anything beside an instance of ShareableInfo MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../handler/package/class_NetworkPackageHandler.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/application/hub/classes/handler/package/class_NetworkPackageHandler.php b/application/hub/classes/handler/package/class_NetworkPackageHandler.php index 888aeb3cd..5c83d26d4 100644 --- a/application/hub/classes/handler/package/class_NetworkPackageHandler.php +++ b/application/hub/classes/handler/package/class_NetworkPackageHandler.php @@ -36,6 +36,7 @@ use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint; use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Factory\Registry\Socket\SocketRegistryFactory; use Org\Mxchange\CoreFramework\Feature\FrameworkFeature; +use Org\Mxchange\CoreFramework\Generic\NullPointerException; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; use Org\Mxchange\CoreFramework\Socket\InvalidSocketException; @@ -49,6 +50,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; use \BadMethodCallException; use \InvalidArgumentException; use \Iterator; +use \LogicException; use \UnexpectedValueException; /** @@ -719,7 +721,13 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei $infoInstance = $this->getRegistryInstance()->getInfoInstanceFromPackageInstance($packageInstance); // Test helper instance - assert($infoInstance instanceof ShareableInfo); + if (is_null($infoInstance)) { + // Throw NPE + throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); + } elseif (!($infoInstance instanceof ShareableInfo)) { + // Not the right instance + throw new LogicException(sprintf('infoInstance[]=%s is not an instance of %s', gettype($infoInstance), ShareableInfo::class)); + } // Get helper instance $helperInstance = $infoInstance->getHelperInstance(); -- 2.39.5