fix for #842

mevdschee · mevdschee · commit 9acd434b3afa · 2022-01-21T11:45:58.000+01:00
diff --git a/api.include.php b/api.include.php
@@ -3856,7 +3856,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return array_filter($this->serialize());
         }
@@ -3928,7 +3929,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->serialize();
         }
@@ -4098,7 +4100,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->serialize();
         }
@@ -6588,7 +6591,7 @@ public function rollBack(): bool
         }
 
         #[\ReturnTypeWillChange]
-        public function errorCode(): mixed
+        public function errorCode()
         {
             return $this->pdo()->errorCode();
         }
@@ -6604,7 +6607,7 @@ public function exec($query): int
         }
 
         #[\ReturnTypeWillChange]
-        public function prepare($statement, $options = array()): mixed
+        public function prepare($statement, $options = array())
         {
             return $this->pdo()->prepare($statement, $options);
         }
@@ -6872,7 +6875,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->serialize();
         }
@@ -6903,7 +6907,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return array_filter($this->serialize(), function ($v) {
                 return $v !== -1;
@@ -7098,7 +7103,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->serialize();
         }
@@ -9587,7 +9593,8 @@ public function has(string $path): bool
             return true;
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->root;
         }
@@ -10349,7 +10356,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return array_filter($this->serialize(), function ($v) {return $v !== null;});
         }
@@ -10411,7 +10419,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return array_filter($this->serialize(), function ($v) {
                 return $v !== -1;
@@ -10837,7 +10846,8 @@ public static function fromJson( /* object */$tree): PathTree
             return new PathTree($tree);
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->tree;
         }
diff --git a/api.php b/api.php
@@ -3856,7 +3856,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return array_filter($this->serialize());
         }
@@ -3928,7 +3929,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->serialize();
         }
@@ -4098,7 +4100,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->serialize();
         }
@@ -6588,7 +6591,7 @@ public function rollBack(): bool
         }
 
         #[\ReturnTypeWillChange]
-        public function errorCode(): mixed
+        public function errorCode()
         {
             return $this->pdo()->errorCode();
         }
@@ -6604,7 +6607,7 @@ public function exec($query): int
         }
 
         #[\ReturnTypeWillChange]
-        public function prepare($statement, $options = array()): mixed
+        public function prepare($statement, $options = array())
         {
             return $this->pdo()->prepare($statement, $options);
         }
@@ -6872,7 +6875,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->serialize();
         }
@@ -6903,7 +6907,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return array_filter($this->serialize(), function ($v) {
                 return $v !== -1;
@@ -7098,7 +7103,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->serialize();
         }
@@ -9587,7 +9593,8 @@ public function has(string $path): bool
             return true;
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->root;
         }
@@ -10349,7 +10356,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return array_filter($this->serialize(), function ($v) {return $v !== null;});
         }
@@ -10411,7 +10419,8 @@ public function serialize()
             ];
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return array_filter($this->serialize(), function ($v) {
                 return $v !== -1;
@@ -10837,7 +10846,8 @@ public static function fromJson( /* object */$tree): PathTree
             return new PathTree($tree);
         }
 
-        public function jsonSerialize(): mixed
+        #[\ReturnTypeWillChange]
+        public function jsonSerialize()
         {
             return $this->tree;
         }
diff --git a/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedColumn.php b/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedColumn.php
@@ -206,7 +206,8 @@ public function serialize()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return array_filter($this->serialize());
     }
diff --git a/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedDatabase.php b/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedDatabase.php
@@ -64,7 +64,8 @@ public function serialize()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return $this->serialize();
     }
diff --git a/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedTable.php b/src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedTable.php
@@ -162,7 +162,8 @@ public function serialize()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return $this->serialize();
     }
diff --git a/src/Tqdev/PhpCrudApi/Database/LazyPdo.php b/src/Tqdev/PhpCrudApi/Database/LazyPdo.php
@@ -88,7 +88,7 @@ public function rollBack(): bool
     }
 
     #[\ReturnTypeWillChange]
-    public function errorCode(): mixed
+    public function errorCode()
     {
         return $this->pdo()->errorCode();
     }
@@ -104,7 +104,7 @@ public function exec($query): int
     }
 
     #[\ReturnTypeWillChange]
-    public function prepare($statement, $options = array()): mixed
+    public function prepare($statement, $options = array())
     {
         return $this->pdo()->prepare($statement, $options);
     }
diff --git a/src/Tqdev/PhpCrudApi/GeoJson/Feature.php b/src/Tqdev/PhpCrudApi/GeoJson/Feature.php
@@ -25,7 +25,8 @@ public function serialize()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return $this->serialize();
     }
diff --git a/src/Tqdev/PhpCrudApi/GeoJson/FeatureCollection.php b/src/Tqdev/PhpCrudApi/GeoJson/FeatureCollection.php
@@ -23,7 +23,8 @@ public function serialize()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return array_filter($this->serialize(), function ($v) {
             return $v !== -1;
diff --git a/src/Tqdev/PhpCrudApi/GeoJson/Geometry.php b/src/Tqdev/PhpCrudApi/GeoJson/Geometry.php
@@ -57,7 +57,8 @@ public function serialize()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return $this->serialize();
     }
diff --git a/src/Tqdev/PhpCrudApi/OpenApi/OpenApiDefinition.php b/src/Tqdev/PhpCrudApi/OpenApi/OpenApiDefinition.php
@@ -39,7 +39,8 @@ public function has(string $path): bool
         return true;
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return $this->root;
     }
diff --git a/src/Tqdev/PhpCrudApi/Record/Document/ErrorDocument.php b/src/Tqdev/PhpCrudApi/Record/Document/ErrorDocument.php
@@ -41,7 +41,8 @@ public function serialize()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return array_filter($this->serialize(), function ($v) {return $v !== null;});
     }
diff --git a/src/Tqdev/PhpCrudApi/Record/Document/ListDocument.php b/src/Tqdev/PhpCrudApi/Record/Document/ListDocument.php
@@ -32,7 +32,8 @@ public function serialize()
         ];
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return array_filter($this->serialize(), function ($v) {
             return $v !== -1;
diff --git a/src/Tqdev/PhpCrudApi/Record/PathTree.php b/src/Tqdev/PhpCrudApi/Record/PathTree.php
@@ -73,7 +73,8 @@ public static function fromJson( /* object */$tree): PathTree
         return new PathTree($tree);
     }
 
-    public function jsonSerialize(): mixed
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return $this->tree;
     }

Original file line number	Diff line number	Diff line change
`@@ -3856,7 +3856,8 @@ public function serialize()`
`3856`	`3856`	`];`
`3857`	`3857`	`}`
`3858`	`3858`
`3859`		`- public function jsonSerialize(): mixed`
	`3859`	`+ #[\ReturnTypeWillChange]`
	`3860`	`+ public function jsonSerialize()`
`3860`	`3861`	`{`
`3861`	`3862`	`return array_filter($this->serialize());`
`3862`	`3863`	`}`
`@@ -3928,7 +3929,8 @@ public function serialize()`
`3928`	`3929`	`];`
`3929`	`3930`	`}`
`3930`	`3931`
`3931`		`- public function jsonSerialize(): mixed`
	`3932`	`+ #[\ReturnTypeWillChange]`
	`3933`	`+ public function jsonSerialize()`
`3932`	`3934`	`{`
`3933`	`3935`	`return $this->serialize();`
`3934`	`3936`	`}`
`@@ -4098,7 +4100,8 @@ public function serialize()`
`4098`	`4100`	`];`
`4099`	`4101`	`}`
`4100`	`4102`
`4101`		`- public function jsonSerialize(): mixed`
	`4103`	`+ #[\ReturnTypeWillChange]`
	`4104`	`+ public function jsonSerialize()`
`4102`	`4105`	`{`
`4103`	`4106`	`return $this->serialize();`
`4104`	`4107`	`}`
`@@ -6588,7 +6591,7 @@ public function rollBack(): bool`
`6588`	`6591`	`}`
`6589`	`6592`
`6590`	`6593`	`#[\ReturnTypeWillChange]`
`6591`		`- public function errorCode(): mixed`
	`6594`	`+ public function errorCode()`
`6592`	`6595`	`{`
`6593`	`6596`	`return $this->pdo()->errorCode();`
`6594`	`6597`	`}`
`@@ -6604,7 +6607,7 @@ public function exec($query): int`
`6604`	`6607`	`}`
`6605`	`6608`
`6606`	`6609`	`#[\ReturnTypeWillChange]`
`6607`		`- public function prepare($statement, $options = array()): mixed`
	`6610`	`+ public function prepare($statement, $options = array())`
`6608`	`6611`	`{`
`6609`	`6612`	`return $this->pdo()->prepare($statement, $options);`
`6610`	`6613`	`}`
`@@ -6872,7 +6875,8 @@ public function serialize()`
`6872`	`6875`	`];`
`6873`	`6876`	`}`
`6874`	`6877`
`6875`		`- public function jsonSerialize(): mixed`
	`6878`	`+ #[\ReturnTypeWillChange]`
	`6879`	`+ public function jsonSerialize()`
`6876`	`6880`	`{`
`6877`	`6881`	`return $this->serialize();`
`6878`	`6882`	`}`
`@@ -6903,7 +6907,8 @@ public function serialize()`
`6903`	`6907`	`];`
`6904`	`6908`	`}`
`6905`	`6909`
`6906`		`- public function jsonSerialize(): mixed`
	`6910`	`+ #[\ReturnTypeWillChange]`
	`6911`	`+ public function jsonSerialize()`
`6907`	`6912`	`{`
`6908`	`6913`	`return array_filter($this->serialize(), function ($v) {`
`6909`	`6914`	`return $v !== -1;`
`@@ -7098,7 +7103,8 @@ public function serialize()`
`7098`	`7103`	`];`
`7099`	`7104`	`}`
`7100`	`7105`
`7101`		`- public function jsonSerialize(): mixed`
	`7106`	`+ #[\ReturnTypeWillChange]`
	`7107`	`+ public function jsonSerialize()`
`7102`	`7108`	`{`
`7103`	`7109`	`return $this->serialize();`
`7104`	`7110`	`}`
`@@ -9587,7 +9593,8 @@ public function has(string $path): bool`
`9587`	`9593`	`return true;`
`9588`	`9594`	`}`
`9589`	`9595`
`9590`		`- public function jsonSerialize(): mixed`
	`9596`	`+ #[\ReturnTypeWillChange]`
	`9597`	`+ public function jsonSerialize()`
`9591`	`9598`	`{`
`9592`	`9599`	`return $this->root;`
`9593`	`9600`	`}`
`@@ -10349,7 +10356,8 @@ public function serialize()`
`10349`	`10356`	`];`
`10350`	`10357`	`}`
`10351`	`10358`
`10352`		`- public function jsonSerialize(): mixed`
	`10359`	`+ #[\ReturnTypeWillChange]`
	`10360`	`+ public function jsonSerialize()`
`10353`	`10361`	`{`
`10354`	`10362`	`return array_filter($this->serialize(), function ($v) {return $v !== null;});`
`10355`	`10363`	`}`
`@@ -10411,7 +10419,8 @@ public function serialize()`
`10411`	`10419`	`];`
`10412`	`10420`	`}`
`10413`	`10421`
`10414`		`- public function jsonSerialize(): mixed`
	`10422`	`+ #[\ReturnTypeWillChange]`
	`10423`	`+ public function jsonSerialize()`
`10415`	`10424`	`{`
`10416`	`10425`	`return array_filter($this->serialize(), function ($v) {`
`10417`	`10426`	`return $v !== -1;`
`@@ -10837,7 +10846,8 @@ public static function fromJson( /* object */$tree): PathTree`
`10837`	`10846`	`return new PathTree($tree);`
`10838`	`10847`	`}`
`10839`	`10848`
`10840`		`- public function jsonSerialize(): mixed`
	`10849`	`+ #[\ReturnTypeWillChange]`
	`10850`	`+ public function jsonSerialize()`
`10841`	`10851`	`{`
`10842`	`10852`	`return $this->tree;`
`10843`	`10853`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,8 @@ public function serialize()`
`206`	`206`	`];`
`207`	`207`	`}`
`208`	`208`
`209`		`- public function jsonSerialize(): mixed`
	`209`	`+ #[\ReturnTypeWillChange]`
	`210`	`+ public function jsonSerialize()`
`210`	`211`	`{`
`211`	`212`	`return array_filter($this->serialize());`
`212`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ public function serialize()`
`64`	`64`	`];`
`65`	`65`	`}`
`66`	`66`
`67`		`- public function jsonSerialize(): mixed`
	`67`	`+ #[\ReturnTypeWillChange]`
	`68`	`+ public function jsonSerialize()`
`68`	`69`	`{`
`69`	`70`	`return $this->serialize();`
`70`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,8 @@ public function serialize()`
`162`	`162`	`];`
`163`	`163`	`}`
`164`	`164`
`165`		`- public function jsonSerialize(): mixed`
	`165`	`+ #[\ReturnTypeWillChange]`
	`166`	`+ public function jsonSerialize()`
`166`	`167`	`{`
`167`	`168`	`return $this->serialize();`
`168`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function rollBack(): bool`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`#[\ReturnTypeWillChange]`
`91`		`- public function errorCode(): mixed`
	`91`	`+ public function errorCode()`
`92`	`92`	`{`
`93`	`93`	`return $this->pdo()->errorCode();`
`94`	`94`	`}`
`@@ -104,7 +104,7 @@ public function exec($query): int`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`#[\ReturnTypeWillChange]`
`107`		`- public function prepare($statement, $options = array()): mixed`
	`107`	`+ public function prepare($statement, $options = array())`
`108`	`108`	`{`
`109`	`109`	`return $this->pdo()->prepare($statement, $options);`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ public function serialize()`
`25`	`25`	`];`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function jsonSerialize(): mixed`
	`28`	`+ #[\ReturnTypeWillChange]`
	`29`	`+ public function jsonSerialize()`
`29`	`30`	`{`
`30`	`31`	`return $this->serialize();`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ public function serialize()`
`23`	`23`	`];`
`24`	`24`	`}`
`25`	`25`
`26`		`- public function jsonSerialize(): mixed`
	`26`	`+ #[\ReturnTypeWillChange]`
	`27`	`+ public function jsonSerialize()`
`27`	`28`	`{`
`28`	`29`	`return array_filter($this->serialize(), function ($v) {`
`29`	`30`	`return $v !== -1;`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ public function serialize()`
`57`	`57`	`];`
`58`	`58`	`}`
`59`	`59`
`60`		`- public function jsonSerialize(): mixed`
	`60`	`+ #[\ReturnTypeWillChange]`
	`61`	`+ public function jsonSerialize()`
`61`	`62`	`{`
`62`	`63`	`return $this->serialize();`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ public function has(string $path): bool`
`39`	`39`	`return true;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public function jsonSerialize(): mixed`
	`42`	`+ #[\ReturnTypeWillChange]`
	`43`	`+ public function jsonSerialize()`
`43`	`44`	`{`
`44`	`45`	`return $this->root;`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ public function serialize()`
`41`	`41`	`];`
`42`	`42`	`}`
`43`	`43`
`44`		`- public function jsonSerialize(): mixed`
	`44`	`+ #[\ReturnTypeWillChange]`
	`45`	`+ public function jsonSerialize()`
`45`	`46`	`{`
`46`	`47`	`return array_filter($this->serialize(), function ($v) {return $v !== null;});`
`47`	`48`	`}`