Skip to content

Commit dc3dcf9

Browse files
committed
update composer and changelog
1 parent 971ac6e commit dc3dcf9

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## Version 2.5.1
4+
5+
1. Fix Query's rebuildSubQueries() method and make its toArray() recursive.
6+
37
## Version 2.5.0
48

59
1. Enhance the `selectRaw()`, `whereRaw()` and `orderByRaw()`

Query.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -783,18 +783,9 @@ public static function create($arr)
783783
public function toArray($obj = null)
784784
{
785785
if (! isset($obj)) $obj = $this;
786-
// return get_object_vars($this);
787-
// if (! isset($this->level)) $this->level = 0;
788-
// echo "level="; echo $this->level++; echo "<br>";
789-
// if ($this->level > 10) return [];
790-
// $obj = $this;
791786
$_arr = is_object($obj) ? get_object_vars($obj) : $obj;
792787
foreach ($_arr as $key => $val) {
793-
// var_dump($val); echo "<br>";
794-
// echo is_array($val) ? "$key is array <br>" : "$key is not array <br>";
795-
// echo is_object($val) ? "$key is object <br>" : "$key is not object <br>";
796788
$recursive = ! empty($val) && (is_array($val) || is_object($val));
797-
// echo $recursive ? "is recursive <br>" : "is not recursive <br>";
798789
$val = $recursive ? $this->toArray($val) : $val;
799790
$arr[$key] = $val;
800791
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "koolreport/querybuilder",
3-
"version":"2.5.0",
3+
"version":"2.5.1",
44
"description": "Create query by php code",
55
"keywords": ["PHP","php reprting tools","php reporting framework","mysql reporting tools","charts","graphs","query builder","sql query generator"],
66
"homepage": "https://www.koolreport.com",

0 commit comments

Comments
 (0)