From 184af6062a7ad60d7d998e4cb4dd62c657e0ac80 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 2 Dec 2020 18:46:55 +0100 Subject: [PATCH] Continued: - renamed PackageData:$status to $packageStatus - updated core framework MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../package/class_NetworkPackageHandler.php | 6 +++--- .../package/deliverable/class_PackageData.php | 20 +++++++++---------- .../fragmenter/class_PackageFragmenter.php | 2 +- .../package/class_DeliverablePackage.php | 4 ++-- core | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/application/hub/classes/handler/package/class_NetworkPackageHandler.php b/application/hub/classes/handler/package/class_NetworkPackageHandler.php index 4bc52231c..492248644 100644 --- a/application/hub/classes/handler/package/class_NetworkPackageHandler.php +++ b/application/hub/classes/handler/package/class_NetworkPackageHandler.php @@ -871,7 +871,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei $packageInstance->setRecipientType($helperInstance->getRecipientType()); /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('NETWORK-PACKAGE-HANDLER: Setting packageContent=%s ...', $packageContent)); $packageInstance->setPackageContent($packageContent); - $packageInstance->setStatus(self::PACKAGE_STATUS_NEW); + $packageInstance->setPackageStatus(self::PACKAGE_STATUS_NEW); $packageInstance->setContentHash($this->generatePackageHash($content, $this->getNodeInstance()->getSessionId())); $packageInstance->setSenderPrivateKeyHash($this->getNodeInstance()->getNodePrivateKeyHash()); @@ -1389,7 +1389,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei $packageInstance = $this->getStackInstance()->getNamed(self::STACKER_NAME_DECLARED); // Is the package status 'failed'? - if ($packageInstance->getStatus() != self::PACKAGE_STATUS_FAILED) { + if ($packageInstance->getPackageStatus() != self::PACKAGE_STATUS_FAILED) { // Not failed! throw new UnexpectedPackageStatusException(array($this, $packageInstance, self::PACKAGE_STATUS_FAILED), self::EXCEPTION_UNEXPECTED_PACKAGE_STATUS); } @@ -1441,7 +1441,7 @@ class NetworkPackageHandler extends BaseHubHandler implements Deliverable, Recei $packageInstance->setRecipientId($decodedArray[self::INDEX_PACKAGE_RECIPIENT]); $packageInstance->setRecipientType(self::RECIPIENT_TYPE_DIRECT); $packageInstance->setPackageContent($decodedArray[self::INDEX_PACKAGE_CONTENT]); - $packageInstance->setStatus(self::PACKAGE_STATUS_DECODED); + $packageInstance->setPackageStatus(self::PACKAGE_STATUS_DECODED); $packageInstance->setContentHash($decodedArray[self::INDEX_PACKAGE_HASH]); $packageInstance->setSenderPrivateKeyHash($decodedArray[self::INDEX_PACKAGE_PRIVATE_KEY_HASH]); diff --git a/application/hub/classes/package/deliverable/class_PackageData.php b/application/hub/classes/package/deliverable/class_PackageData.php index 36bdb7620..99f31018e 100644 --- a/application/hub/classes/package/deliverable/class_PackageData.php +++ b/application/hub/classes/package/deliverable/class_PackageData.php @@ -88,9 +88,9 @@ class PackageData extends BaseHubSystem implements DeliverablePackage, Registera private $recipientUnl; /** - * Status + * Package status */ - private $status; + private $packageStatus; /** * Private key's hash @@ -269,22 +269,22 @@ class PackageData extends BaseHubSystem implements DeliverablePackage, Registera } /** - * Getter for status + * Getter for packageStatus * - * @return $status Status + * @return $packageStatus Package status */ - public final function getStatus () { - return $this->status; + public final function getPackageStatus () { + return $this->packageStatus; } /** - * Setter for status + * Setter for packageStatus * - * @param $status Status + * @param $packageStatus Package status * @return void */ - public final function setStatus (string $status) { - $this->status = $status; + public final function setPackageStatus (string $packageStatus) { + $this->packageStatus = $packageStatus; } /** diff --git a/application/hub/classes/package/fragmenter/class_PackageFragmenter.php b/application/hub/classes/package/fragmenter/class_PackageFragmenter.php index c8870b9cf..fb99c473d 100644 --- a/application/hub/classes/package/fragmenter/class_PackageFragmenter.php +++ b/application/hub/classes/package/fragmenter/class_PackageFragmenter.php @@ -521,7 +521,7 @@ class PackageFragmenter extends BaseHubSystem implements Fragmentable, Registera NetworkPackageHandler::PACKAGE_DATA_SEPARATOR, $packageInstance->getPackageContent(), NetworkPackageHandler::PACKAGE_DATA_SEPARATOR, - $packageInstance->getStatus(), + $packageInstance->getPackageStatus(), NetworkPackageHandler::PACKAGE_DATA_SEPARATOR, $packageInstance->getContentHash(), NetworkPackageHandler::PACKAGE_DATA_SEPARATOR, diff --git a/application/hub/interfaces/delivery/package/class_DeliverablePackage.php b/application/hub/interfaces/delivery/package/class_DeliverablePackage.php index c7a705856..349b9167d 100644 --- a/application/hub/interfaces/delivery/package/class_DeliverablePackage.php +++ b/application/hub/interfaces/delivery/package/class_DeliverablePackage.php @@ -138,7 +138,7 @@ interface DeliverablePackage extends HubInterface { * * @return $status Status */ - function getStatus (); + function getPackageStatus (); /** * Setter for status @@ -146,7 +146,7 @@ interface DeliverablePackage extends HubInterface { * @param $status Status * @return void */ - function setStatus (string $status); + function setPackageStatus (string $status); /** * Getter for content hash diff --git a/core b/core index 035b3221b..ef7a7e55c 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 035b3221bff7b542e264a9d0a4a6d086833487ef +Subproject commit ef7a7e55c59c9e887e6bb09c8c02b8126309f716 -- 2.39.5