From b02b4e957d75ae6f0e3ca7286e4d092096996d34 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 10 Feb 2023 17:19:29 +0100 Subject: [PATCH] Continued: - ops, $criteriaType wasn't here - also $configEntry wasn't here - debug line added --- framework/main/classes/criteria/class_BaseCriteria.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/framework/main/classes/criteria/class_BaseCriteria.php b/framework/main/classes/criteria/class_BaseCriteria.php index a9c90b93..9698b948 100644 --- a/framework/main/classes/criteria/class_BaseCriteria.php +++ b/framework/main/classes/criteria/class_BaseCriteria.php @@ -459,7 +459,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria { */ public function getCriteriaElemnent (string $criteriaKey, string $criteriaType = Criteria::CRITERIA_TYPE_DEFAULT) { // Check parameter - /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-CRITERIA: criteriaKey=%s,configEntry=%s,criteriaType=%s - CALLED!', strtoupper($criteriaType), $criteriaKey, $configEntry, $criteriaType)); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-CRITERIA: criteriaKey=%s,criteriaType=%s - CALLED!', strtoupper($criteriaType), $criteriaKey, $criteriaType)); if (empty($criteriaKey)) { // Throw IAE throw new InvalidArgumentException('Parameter "criteriaKey" is empty'); @@ -502,7 +502,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria { */ public function getCriteriaChoiceElemnent (string $criteriaKey) { // Check parameter - /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-CRITERIA: criteriaKey=%s - CALLED!', strtoupper($criteriaType), $criteriaKey)); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CRITERIA: criteriaKey=%s - CALLED!', $criteriaKey)); if (empty($criteriaKey)) { // Throw IAE throw new InvalidArgumentException('Parameter "criteriaKey" is empty'); @@ -512,6 +512,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria { } // Invoke inner method + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CRITERIA: Invoking this->getCriteriaElemnent(%s,%s) ...', $criteriaKey, Criteria::CRITERIA_TYPE_CHOICE)); return $this->getCriteriaElemnent($criteriaKey, Criteria::CRITERIA_TYPE_CHOICE); } @@ -524,7 +525,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria { */ public function getCriteriaExcludeElemnent (string $criteriaKey) { // Check parameter - /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('%s-CRITERIA: criteriaKey=%s - CALLED!', strtoupper($criteriaType), $criteriaKey)); + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CRITERIA: criteriaKey=%s - CALLED!', $criteriaKey)); if (empty($criteriaKey)) { // Throw IAE throw new InvalidArgumentException('Parameter "criteriaKey" is empty'); @@ -534,6 +535,7 @@ abstract class BaseCriteria extends BaseFrameworkSystem implements Criteria { } // Invoke inner method + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-CRITERIA: Invoking this->getCriteriaElemnent(%s,%s) ...', $criteriaKey, Criteria::CRITERIA_TYPE_EXCLUDE)); return $this->getCriteriaElemnent($criteriaKey, Criteria::CRITERIA_TYPE_EXCLUDE); } -- 2.39.5