Continued:

[core.git] / framework / main / classes / criteria / search / class_SearchCriteria.php

diff --git a/framework/main/classes/criteria/search/class_SearchCriteria.php b/framework/main/classes/criteria/search/class_SearchCriteria.php
index f2fabf21255869935312fc404cf292306d0c01b0..d689be2e59c78a5ea6adf0cfe8e73d0baa0fe81c 100644 (file)
--- a/framework/main/classes/criteria/search/class_SearchCriteria.php
+++ b/framework/main/classes/criteria/search/class_SearchCriteria.php
@@ -3,6 +3,7 @@
 namespace Org\Mxchange\CoreFramework\Criteria\Search;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\BaseCriteria;
 use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
 
@@ -34,7 +35,7 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
        /**
         * Criteria to handle
         */
-       private $criteria = array();
+       private $criteria = [];
 
        /**
         * Limitation for the search
@@ -88,7 +89,7 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
         */
        public final function setConfiguredLimit ($configEntry) {
                // Get the limit from config entry and set it
-               $limit = $this->getConfigInstance()->getConfigEntry($configEntry);
+               $limit = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry($configEntry);
                $this->setLimit($limit);
        }
 
@@ -163,14 +164,14 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
 
                // 'choice' check
                if ((is_array($searchChoice)) && (count($valueArray) == 1)) {
-                       // $value is a single-search value, so use in_array()
+                       // $value is a single-search value, so use in_[]
                        $isMatching = ((($isMatching === true) || (($searchDefault === false) && (!is_null($value)))) && (in_array($value, $searchChoice)));
 
                        // Debug message
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: getCriteriaChoiceElement(' . $key . ')[]=' . gettype($searchChoice) . ',value[' . gettype($value) . ']=' . $value . ',isMatching=' . intval($isMatching) . ' - SINGLE-MATCH');
                } elseif ((is_array($searchChoice)) && (count($valueArray) > 1)) {
                        // Debug message
-                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: getCriteriaChoiceElement(' . $key . ')[]=' . gettype($searchChoice) . ',valueArray()=' . count($valueArray) . ',isMatching=' . intval($isMatching));
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: getCriteriaChoiceElement(' . $key . ')[]=' . gettype($searchChoice) . ',value[]=' . count($valueArray) . ',isMatching=' . intval($isMatching));
 
                        // $value is choice-search value, so check all entries
                        $isMatching = (($isMatching === true) || (($searchDefault === false) && (!is_null($value))));
@@ -187,7 +188,7 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
                        } // END - foreach
 
                        // Debug message
-                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: getCriteriaChoiceElement(' . $key . ')[]=' . gettype($searchChoice) . ',valueArray()=' . count($valueArray) . ',idx=' . $idx . ',isMatching=' . intval($isMatching) . ' - CHOICE-MATCH');
+                       //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('SEARCH-CRITERIA: getCriteriaChoiceElement(' . $key . ')[]=' . gettype($searchChoice) . ',value[]=' . count($valueArray) . ',idx=' . $idx . ',isMatching=' . intval($isMatching) . ' - CHOICE-MATCH');
                } else {
                        // Choice-match is false
                        // Debug message