From 7157f013662d045e7f215d803da0f297874e0da9 Mon Sep 17 00:00:00 2001 From: webeweb Date: Tue, 7 Aug 2018 10:47:09 +0200 Subject: [PATCH] Update dependencies (core-library v3.0.0) --- API/QueryBuilderFilter.php | 10 +++++----- API/QueryBuilderValidation.php | 16 ++++++++-------- Rule/QueryBuilderRule.php | 4 ++-- composer.json | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/API/QueryBuilderFilter.php b/API/QueryBuilderFilter.php index 74d3d8e..c76a30c 100644 --- a/API/QueryBuilderFilter.php +++ b/API/QueryBuilderFilter.php @@ -14,7 +14,7 @@ use JsonSerializable; use WBW\Bundle\JQuery\QueryBuilderBundle\Data\AbstractQueryBuilderData; use WBW\Library\Core\Exception\Argument\IllegalArgumentException; -use WBW\Library\Core\Utility\Argument\ArrayUtility; +use WBW\Library\Core\Helper\Argument\ArrayHelper; /** * jQuery QueryBuilder filter. @@ -198,14 +198,14 @@ public function toArray() { $output["id"] = $this->getId(); - ArrayUtility::set($output, "field", $this->getField(), [null]); + ArrayHelper::set($output, "field", $this->getField(), [null]); $output["label"] = $this->label; $output["type"] = $this->getType(); - ArrayUtility::set($output, "input", $this->getInput(), [null]); - ArrayUtility::set($output, "values", $this->values, [null]); - ArrayUtility::set($output, "multiple", $this->multiple, [null, false]); + ArrayHelper::set($output, "input", $this->getInput(), [null]); + ArrayHelper::set($output, "values", $this->values, [null]); + ArrayHelper::set($output, "multiple", $this->multiple, [null, false]); if (null !== $this->validation) { $output["validation"] = $this->validation->toArray(); diff --git a/API/QueryBuilderValidation.php b/API/QueryBuilderValidation.php index 19a19c1..8f33805 100644 --- a/API/QueryBuilderValidation.php +++ b/API/QueryBuilderValidation.php @@ -12,7 +12,7 @@ namespace WBW\Bundle\JQuery\QueryBuilderBundle\API; use JsonSerializable; -use WBW\Library\Core\Utility\Argument\ArrayUtility; +use WBW\Library\Core\Helper\Argument\ArrayHelper; /** * jQuery QueryBuilder validation. @@ -237,13 +237,13 @@ public function toArray() { // Initialize the output. $output = []; - ArrayUtility::set($output, "format", $this->format, [null]); - ArrayUtility::set($output, "min", $this->min, [null]); - ArrayUtility::set($output, "max", $this->max, [null]); - ArrayUtility::set($output, "step", $this->step, [null]); - ArrayUtility::set($output, "messages", $this->messages, [null]); - ArrayUtility::set($output, "allow_empty_value", $this->allowEmptyValue, [null]); - ArrayUtility::set($output, "callback", $this->callback, [null]); + ArrayHelper::set($output, "format", $this->format, [null]); + ArrayHelper::set($output, "min", $this->min, [null]); + ArrayHelper::set($output, "max", $this->max, [null]); + ArrayHelper::set($output, "step", $this->step, [null]); + ArrayHelper::set($output, "messages", $this->messages, [null]); + ArrayHelper::set($output, "allow_empty_value", $this->allowEmptyValue, [null]); + ArrayHelper::set($output, "callback", $this->callback, [null]); // Return the output. return $output; diff --git a/Rule/QueryBuilderRule.php b/Rule/QueryBuilderRule.php index d6c7c33..010199a 100644 --- a/Rule/QueryBuilderRule.php +++ b/Rule/QueryBuilderRule.php @@ -16,7 +16,7 @@ use WBW\Bundle\JQuery\QueryBuilderBundle\Data\AbstractQueryBuilderData; use WBW\Bundle\JQuery\QueryBuilderBundle\Decorator\QueryBuilderDecoratorInterface; use WBW\Library\Core\Exception\Argument\IllegalArgumentException; -use WBW\Library\Core\Utility\IntegerUtility; +use WBW\Library\Core\Helper\Argument\IntegerHelper; /** * jQuery QueryBuilder rule. @@ -140,7 +140,7 @@ private function quoteMixed($value, $wrap = false) { $output = null; switch ($this->getType()) { case self::TYPE_BOOLEAN: - $output = IntegerUtility::parseBoolean($value); + $output = IntegerHelper::parseBoolean($value); break; case self::TYPE_DATE: case self::TYPE_DATETIME: diff --git a/composer.json b/composer.json index 8402ba9..23cb82e 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "php": "^5.6|^7.0", "symfony/framework-bundle": "^2.6|^3.0", "twig/twig": "^1.0||^2.0", - "webeweb/core-library": "^2.0" + "webeweb/core-library": "^3.0" }, "require-dev": { "phpunit/phpunit": "5.7.*",