Skip to content

Commit 5dc17a2

Browse files
mevdscheemevdschee
committed
fix for #842 
1 parent 933a5d2 commit 5dc17a2

File tree

14 files changed

+58
-52
lines changed

14 files changed

+58
-52
lines changed

‎api.include.php

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3737,7 +3737,7 @@ public static function fromReflection(GenericReflection $reflection, array $colu
37373737
return new ReflectedColumn($name, $type, $length, $precision, $scale, $nullable, $pk, $fk);
37383738
}
37393739

3740-
public static function fromJson(/* object */$json): ReflectedColumn
3740+
public static function fromJson( /* object */$json): ReflectedColumn
37413741
{
37423742
$name = $json->name;
37433743
$type = $json->type;
@@ -3856,7 +3856,7 @@ public function serialize()
38563856
];
38573857
}
38583858

3859-
public function jsonSerialize()
3859+
public function jsonSerialize(): mixed
38603860
{
38613861
return array_filter($this->serialize());
38623862
}
@@ -3891,7 +3891,7 @@ public static function fromReflection(GenericReflection $reflection): ReflectedD
38913891
return new ReflectedDatabase($tableTypes);
38923892
}
38933893

3894-
public static function fromJson(/* object */$json): ReflectedDatabase
3894+
public static function fromJson( /* object */$json): ReflectedDatabase
38953895
{
38963896
$tableTypes = (array) $json->tables;
38973897
return new ReflectedDatabase($tableTypes);
@@ -3928,7 +3928,7 @@ public function serialize()
39283928
];
39293929
}
39303930

3931-
public function jsonSerialize()
3931+
public function jsonSerialize(): mixed
39323932
{
39333933
return $this->serialize();
39343934
}
@@ -4098,7 +4098,7 @@ public function serialize()
40984098
];
40994099
}
41004100

4101-
public function jsonSerialize()
4101+
public function jsonSerialize(): mixed
41024102
{
41034103
return $this->serialize();
41044104
}
@@ -6587,6 +6587,7 @@ public function rollBack(): bool
65876587
return $this->pdo()->rollBack();
65886588
}
65896589

6590+
#[\ReturnTypeWillChange]
65906591
public function errorCode(): mixed
65916592
{
65926593
return $this->pdo()->errorCode();
@@ -6602,7 +6603,8 @@ public function exec($query): int
66026603
return $this->pdo()->exec($query);
66036604
}
66046605

6605-
public function prepare($statement, $options = array())
6606+
#[\ReturnTypeWillChange]
6607+
public function prepare($statement, $options = array()): mixed
66066608
{
66076609
return $this->pdo()->prepare($statement, $options);
66086610
}
@@ -6870,7 +6872,7 @@ public function serialize()
68706872
];
68716873
}
68726874

6873-
public function jsonSerialize()
6875+
public function jsonSerialize(): mixed
68746876
{
68756877
return $this->serialize();
68766878
}
@@ -6901,7 +6903,7 @@ public function serialize()
69016903
];
69026904
}
69036905

6904-
public function jsonSerialize()
6906+
public function jsonSerialize(): mixed
69056907
{
69066908
return array_filter($this->serialize(), function ($v) {
69076909
return $v !== -1;
@@ -7096,7 +7098,7 @@ public function serialize()
70967098
];
70977099
}
70987100

7099-
public function jsonSerialize()
7101+
public function jsonSerialize(): mixed
71007102
{
71017103
return $this->serialize();
71027104
}
@@ -9585,7 +9587,7 @@ public function has(string $path): bool
95859587
return true;
95869588
}
95879589

9588-
public function jsonSerialize()
9590+
public function jsonSerialize(): mixed
95899591
{
95909592
return $this->root;
95919593
}
@@ -10347,9 +10349,9 @@ public function serialize()
1034710349
];
1034810350
}
1034910351

10350-
public function jsonSerialize()
10352+
public function jsonSerialize(): mixed
1035110353
{
10352-
return array_filter($this->serialize(), function($v) {return $v!==null;});
10354+
return array_filter($this->serialize(), function ($v) {return $v !== null;});
1035310355
}
1035410356

1035510357
public static function fromException(\Throwable $exception, bool $debug)
@@ -10367,7 +10369,7 @@ public static function fromException(\Throwable $exception, bool $debug)
1036710369
} elseif (strpos(strtolower($exception->getMessage()), 'constraint') !== false) {
1036810370
$document = new ErrorDocument(new ErrorCode(ErrorCode::DATA_INTEGRITY_VIOLATION), '', null);
1036910371
} else {
10370-
$message = $debug?$exception->getMessage():'PDOException occurred (enable debug mode)';
10372+
$message = $debug ? $exception->getMessage() : 'PDOException occurred (enable debug mode)';
1037110373
$document = new ErrorDocument(new ErrorCode(ErrorCode::ERROR_NOT_FOUND), $message, null);
1037210374
}
1037310375
}
@@ -10409,7 +10411,7 @@ public function serialize()
1040910411
];
1041010412
}
1041110413

10412-
public function jsonSerialize()
10414+
public function jsonSerialize(): mixed
1041310415
{
1041410416
return array_filter($this->serialize(), function ($v) {
1041510417
return $v !== -1;
@@ -10770,7 +10772,7 @@ class PathTree implements \JsonSerializable
1077010772

1077110773
private $tree;
1077210774

10773-
public function __construct(/* object */&$tree = null)
10775+
public function __construct( /* object */&$tree = null)
1077410776
{
1077510777
if (!$tree) {
1077610778
$tree = $this->newTree();
@@ -10830,12 +10832,12 @@ public function match(array $path): array
1083010832
return $tree->values;
1083110833
}
1083210834

10833-
public static function fromJson(/* object */$tree): PathTree
10835+
public static function fromJson( /* object */$tree): PathTree
1083410836
{
1083510837
return new PathTree($tree);
1083610838
}
1083710839

10838-
public function jsonSerialize()
10840+
public function jsonSerialize(): mixed
1083910841
{
1084010842
return $this->tree;
1084110843
}

‎api.php

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3737,7 +3737,7 @@ public static function fromReflection(GenericReflection $reflection, array $colu
37373737
return new ReflectedColumn($name, $type, $length, $precision, $scale, $nullable, $pk, $fk);
37383738
}
37393739

3740-
public static function fromJson(/* object */$json): ReflectedColumn
3740+
public static function fromJson( /* object */$json): ReflectedColumn
37413741
{
37423742
$name = $json->name;
37433743
$type = $json->type;
@@ -3856,7 +3856,7 @@ public function serialize()
38563856
];
38573857
}
38583858

3859-
public function jsonSerialize()
3859+
public function jsonSerialize(): mixed
38603860
{
38613861
return array_filter($this->serialize());
38623862
}
@@ -3891,7 +3891,7 @@ public static function fromReflection(GenericReflection $reflection): ReflectedD
38913891
return new ReflectedDatabase($tableTypes);
38923892
}
38933893

3894-
public static function fromJson(/* object */$json): ReflectedDatabase
3894+
public static function fromJson( /* object */$json): ReflectedDatabase
38953895
{
38963896
$tableTypes = (array) $json->tables;
38973897
return new ReflectedDatabase($tableTypes);
@@ -3928,7 +3928,7 @@ public function serialize()
39283928
];
39293929
}
39303930

3931-
public function jsonSerialize()
3931+
public function jsonSerialize(): mixed
39323932
{
39333933
return $this->serialize();
39343934
}
@@ -4098,7 +4098,7 @@ public function serialize()
40984098
];
40994099
}
41004100

4101-
public function jsonSerialize()
4101+
public function jsonSerialize(): mixed
41024102
{
41034103
return $this->serialize();
41044104
}
@@ -6587,6 +6587,7 @@ public function rollBack(): bool
65876587
return $this->pdo()->rollBack();
65886588
}
65896589

6590+
#[\ReturnTypeWillChange]
65906591
public function errorCode(): mixed
65916592
{
65926593
return $this->pdo()->errorCode();
@@ -6602,7 +6603,8 @@ public function exec($query): int
66026603
return $this->pdo()->exec($query);
66036604
}
66046605

6605-
public function prepare($statement, $options = array())
6606+
#[\ReturnTypeWillChange]
6607+
public function prepare($statement, $options = array()): mixed
66066608
{
66076609
return $this->pdo()->prepare($statement, $options);
66086610
}
@@ -6870,7 +6872,7 @@ public function serialize()
68706872
];
68716873
}
68726874

6873-
public function jsonSerialize()
6875+
public function jsonSerialize(): mixed
68746876
{
68756877
return $this->serialize();
68766878
}
@@ -6901,7 +6903,7 @@ public function serialize()
69016903
];
69026904
}
69036905

6904-
public function jsonSerialize()
6906+
public function jsonSerialize(): mixed
69056907
{
69066908
return array_filter($this->serialize(), function ($v) {
69076909
return $v !== -1;
@@ -7096,7 +7098,7 @@ public function serialize()
70967098
];
70977099
}
70987100

7099-
public function jsonSerialize()
7101+
public function jsonSerialize(): mixed
71007102
{
71017103
return $this->serialize();
71027104
}
@@ -9585,7 +9587,7 @@ public function has(string $path): bool
95859587
return true;
95869588
}
95879589

9588-
public function jsonSerialize()
9590+
public function jsonSerialize(): mixed
95899591
{
95909592
return $this->root;
95919593
}
@@ -10347,9 +10349,9 @@ public function serialize()
1034710349
];
1034810350
}
1034910351

10350-
public function jsonSerialize()
10352+
public function jsonSerialize(): mixed
1035110353
{
10352-
return array_filter($this->serialize(), function($v) {return $v!==null;});
10354+
return array_filter($this->serialize(), function ($v) {return $v !== null;});
1035310355
}
1035410356

1035510357
public static function fromException(\Throwable $exception, bool $debug)
@@ -10367,7 +10369,7 @@ public static function fromException(\Throwable $exception, bool $debug)
1036710369
} elseif (strpos(strtolower($exception->getMessage()), 'constraint') !== false) {
1036810370
$document = new ErrorDocument(new ErrorCode(ErrorCode::DATA_INTEGRITY_VIOLATION), '', null);
1036910371
} else {
10370-
$message = $debug?$exception->getMessage():'PDOException occurred (enable debug mode)';
10372+
$message = $debug ? $exception->getMessage() : 'PDOException occurred (enable debug mode)';
1037110373
$document = new ErrorDocument(new ErrorCode(ErrorCode::ERROR_NOT_FOUND), $message, null);
1037210374
}
1037310375
}
@@ -10409,7 +10411,7 @@ public function serialize()
1040910411
];
1041010412
}
1041110413

10412-
public function jsonSerialize()
10414+
public function jsonSerialize(): mixed
1041310415
{
1041410416
return array_filter($this->serialize(), function ($v) {
1041510417
return $v !== -1;
@@ -10770,7 +10772,7 @@ class PathTree implements \JsonSerializable
1077010772

1077110773
private $tree;
1077210774

10773-
public function __construct(/* object */&$tree = null)
10775+
public function __construct( /* object */&$tree = null)
1077410776
{
1077510777
if (!$tree) {
1077610778
$tree = $this->newTree();
@@ -10830,12 +10832,12 @@ public function match(array $path): array
1083010832
return $tree->values;
1083110833
}
1083210834

10833-
public static function fromJson(/* object */$tree): PathTree
10835+
public static function fromJson( /* object */$tree): PathTree
1083410836
{
1083510837
return new PathTree($tree);
1083610838
}
1083710839

10838-
public function jsonSerialize()
10840+
public function jsonSerialize(): mixed
1083910841
{
1084010842
return $this->tree;
1084110843
}

‎src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedColumn.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static function fromReflection(GenericReflection $reflection, array $colu
8787
return new ReflectedColumn($name, $type, $length, $precision, $scale, $nullable, $pk, $fk);
8888
}
8989

90-
public static function fromJson(/* object */$json): ReflectedColumn
90+
public static function fromJson( /* object */$json): ReflectedColumn
9191
{
9292
$name = $json->name;
9393
$type = $json->type;
@@ -206,7 +206,7 @@ public function serialize()
206206
];
207207
}
208208

209-
public function jsonSerialize()
209+
public function jsonSerialize(): mixed
210210
{
211211
return array_filter($this->serialize());
212212
}

‎src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedDatabase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static function fromReflection(GenericReflection $reflection): ReflectedD
2727
return new ReflectedDatabase($tableTypes);
2828
}
2929

30-
public static function fromJson(/* object */$json): ReflectedDatabase
30+
public static function fromJson( /* object */$json): ReflectedDatabase
3131
{
3232
$tableTypes = (array) $json->tables;
3333
return new ReflectedDatabase($tableTypes);
@@ -64,7 +64,7 @@ public function serialize()
6464
];
6565
}
6666

67-
public function jsonSerialize()
67+
public function jsonSerialize(): mixed
6868
{
6969
return $this->serialize();
7070
}

‎src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedTable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function serialize()
162162
];
163163
}
164164

165-
public function jsonSerialize()
165+
public function jsonSerialize(): mixed
166166
{
167167
return $this->serialize();
168168
}

‎src/Tqdev/PhpCrudApi/Database/LazyPdo.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public function rollBack(): bool
8787
return $this->pdo()->rollBack();
8888
}
8989

90+
#[\ReturnTypeWillChange]
9091
public function errorCode(): mixed
9192
{
9293
return $this->pdo()->errorCode();
@@ -102,7 +103,8 @@ public function exec($query): int
102103
return $this->pdo()->exec($query);
103104
}
104105

105-
public function prepare($statement, $options = array())
106+
#[\ReturnTypeWillChange]
107+
public function prepare($statement, $options = array()): mixed
106108
{
107109
return $this->pdo()->prepare($statement, $options);
108110
}

‎src/Tqdev/PhpCrudApi/GeoJson/Feature.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function serialize()
2525
];
2626
}
2727

28-
public function jsonSerialize()
28+
public function jsonSerialize(): mixed
2929
{
3030
return $this->serialize();
3131
}

‎src/Tqdev/PhpCrudApi/GeoJson/FeatureCollection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function serialize()
2323
];
2424
}
2525

26-
public function jsonSerialize()
26+
public function jsonSerialize(): mixed
2727
{
2828
return array_filter($this->serialize(), function ($v) {
2929
return $v !== -1;

‎src/Tqdev/PhpCrudApi/GeoJson/Geometry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function serialize()
5757
];
5858
}
5959

60-
public function jsonSerialize()
60+
public function jsonSerialize(): mixed
6161
{
6262
return $this->serialize();
6363
}

0 commit comments

Comments
 (0)