feat(php): Change match class name to rMatch to prevent conflict with php match function

Geekimo · Geekimo · commit fe981ee81056 · 2024-09-10T21:48:18.000+02:00
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": "^8.3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8",
diff --git a/rdb/Datum/ArrayDatum.php b/rdb/Datum/ArrayDatum.php
@@ -3,9 +3,7 @@
 namespace r\Datum;
 
 use r\DatumConverter;
-use r\Datum\Datum;
 use r\ValuedQuery\MakeArray;
-use r\Datum\ArrayDatum;
 use r\Exceptions\RqlDriverError;
 
 class ArrayDatum extends Datum
diff --git a/rdb/Datum/BoolDatum.php b/rdb/Datum/BoolDatum.php
@@ -2,7 +2,6 @@
 
 namespace r\Datum;
 
-use r\Datum\Datum;
 use r\Exceptions\RqlDriverError;
 
 class BoolDatum extends Datum
diff --git a/rdb/Datum/NullDatum.php b/rdb/Datum/NullDatum.php
@@ -2,7 +2,6 @@
 
 namespace r\Datum;
 
-use r\Datum\Datum;
 use r\Exceptions\RqlDriverError;
 
 class NullDatum extends Datum
diff --git a/rdb/Datum/NumberDatum.php b/rdb/Datum/NumberDatum.php
@@ -2,7 +2,6 @@
 
 namespace r\Datum;
 
-use r\Datum\Datum;
 use r\Exceptions\RqlDriverError;
 
 class NumberDatum extends Datum
diff --git a/rdb/Datum/ObjectDatum.php b/rdb/Datum/ObjectDatum.php
@@ -2,7 +2,6 @@
 
 namespace r\Datum;
 
-use r\Datum\Datum;
 use r\DatumConverter;
 use r\Exceptions\RqlDriverError;
 
@@ -15,7 +14,7 @@ public function encodeServerRequest()
             $val = $val->encodeServerRequest();
             unset($val);
         }
-        return (Object)$jsonValue;
+        return (object) $jsonValue;
     }
 
     public static function decodeServerResponse($json)
diff --git a/rdb/Datum/StringDatum.php b/rdb/Datum/StringDatum.php
@@ -2,7 +2,6 @@
 
 namespace r\Datum;
 
-use r\Datum\Datum;
 use r\Exceptions\RqlDriverError;
 
 class StringDatum extends Datum
diff --git a/rdb/Exceptions/RqlDriverError.php b/rdb/Exceptions/RqlDriverError.php
@@ -2,8 +2,6 @@
 
 namespace r\Exceptions;
 
-use r\Exceptions\RqlException;
-
 class RqlDriverError extends RqlException
 {
     public function __construct($message, $code = 0)
diff --git a/rdb/Exceptions/RqlServerError.php b/rdb/Exceptions/RqlServerError.php
@@ -2,8 +2,6 @@
 
 namespace r\Exceptions;
 
-use r\Exceptions\RqlException;
-
 class RqlServerError extends RqlException
 {
 
diff --git a/rdb/FunctionQuery/RFunction.php b/rdb/FunctionQuery/RFunction.php
@@ -3,7 +3,6 @@
 namespace r\FunctionQuery;
 
 use r\Query;
-use r\FunctionQuery\FunctionQuery;
 use r\Datum\NumberDatum;
 use r\Datum\ArrayDatum;
 use r\ProtocolBuffer\TermTermType;
diff --git a/rdb/Ordering/Asc.php b/rdb/Ordering/Asc.php
@@ -2,7 +2,6 @@
 
 namespace r\Ordering;
 
-use r\Ordering\Ordering;
 use r\ProtocolBuffer\TermTermType;
 
 class Asc extends Ordering
diff --git a/rdb/Ordering/Desc.php b/rdb/Ordering/Desc.php
@@ -2,7 +2,6 @@
 
 namespace r\Ordering;
 
-use r\Ordering\Ordering;
 use r\ProtocolBuffer\TermTermType;
 
 class Desc extends Ordering
diff --git a/rdb/ProtocolBuffer/DatumDatumType.php b/rdb/ProtocolBuffer/DatumDatumType.php
@@ -4,11 +4,11 @@
 
 class DatumDatumType
 {
-    const PB_R_ARRAY   = 5;
-    const PB_R_BOOL    = 2;
-    const PB_R_JSON    = 7;
-    const PB_R_NULL    = 1;
-    const PB_R_NUM     = 3;
-    const PB_R_OBJECT  = 6;
-    const PB_R_STR     = 4;
+    const int PB_R_ARRAY   = 5;
+    const int PB_R_BOOL    = 2;
+    const int PB_R_JSON    = 7;
+    const int PB_R_NULL    = 1;
+    const int PB_R_NUM     = 3;
+    const int PB_R_OBJECT  = 6;
+    const int PB_R_STR     = 4;
 }
diff --git a/rdb/ProtocolBuffer/FrameFrameType.php b/rdb/ProtocolBuffer/FrameFrameType.php
@@ -4,6 +4,6 @@
 
 class FrameFrameType
 {
-    const PB_OPT  = 2;
-    const PB_POS  = 1;
+    const int PB_OPT  = 2;
+    const int PB_POS  = 1;
 }
diff --git a/rdb/ProtocolBuffer/QueryQueryType.php b/rdb/ProtocolBuffer/QueryQueryType.php
@@ -4,9 +4,9 @@
 
 class QueryQueryType
 {
-    const PB_CONTINUE      = 2;
-    const PB_NOREPLY_WAIT  = 4;
-    const PB_SERVER_INFO   = 5;
-    const PB_START         = 1;
-    const PB_STOP          = 3;
+    const int PB_CONTINUE      = 2;
+    const int PB_NOREPLY_WAIT  = 4;
+    const int PB_SERVER_INFO   = 5;
+    const int PB_START         = 1;
+    const int PB_STOP          = 3;
 }
diff --git a/rdb/ProtocolBuffer/ResponseResponseNote.php b/rdb/ProtocolBuffer/ResponseResponseNote.php
@@ -4,9 +4,9 @@
 
 class ResponseResponseNote
 {
-    const PB_ATOM_FEED            = 2;
-    const PB_INCLUDES_STATES      = 5;
-    const PB_ORDER_BY_LIMIT_FEED  = 3;
-    const PB_SEQUENCE_FEED        = 1;
-    const PB_UNIONED_FEED         = 4;
+    const int PB_ATOM_FEED            = 2;
+    const int PB_INCLUDES_STATES      = 5;
+    const int PB_ORDER_BY_LIMIT_FEED  = 3;
+    const int PB_SEQUENCE_FEED        = 1;
+    const int PB_UNIONED_FEED         = 4;
 }
diff --git a/rdb/ProtocolBuffer/ResponseResponseType.php b/rdb/ProtocolBuffer/ResponseResponseType.php
@@ -4,12 +4,12 @@
 
 class ResponseResponseType
 {
-    const PB_CLIENT_ERROR      = 16;
-    const PB_COMPILE_ERROR     = 17;
-    const PB_RUNTIME_ERROR     = 18;
-    const PB_SERVER_INFO       = 5;
-    const PB_SUCCESS_ATOM      = 1;
-    const PB_SUCCESS_PARTIAL   = 3;
-    const PB_SUCCESS_SEQUENCE  = 2;
-    const PB_WAIT_COMPLETE     = 4;
+    const int PB_CLIENT_ERROR      = 16;
+    const int PB_COMPILE_ERROR     = 17;
+    const int PB_RUNTIME_ERROR     = 18;
+    const int PB_SERVER_INFO       = 5;
+    const int PB_SUCCESS_ATOM      = 1;
+    const int PB_SUCCESS_PARTIAL   = 3;
+    const int PB_SUCCESS_SEQUENCE  = 2;
+    const int PB_WAIT_COMPLETE     = 4;
 }
diff --git a/rdb/ProtocolBuffer/TermTermType.php b/rdb/ProtocolBuffer/TermTermType.php
diff --git a/rdb/ProtocolBuffer/VersionDummyProtocol.php b/rdb/ProtocolBuffer/VersionDummyProtocol.php
diff --git a/rdb/ProtocolBuffer/VersionDummyVersion.php b/rdb/ProtocolBuffer/VersionDummyVersion.php
diff --git a/rdb/Queries/Math/RMatch.php b/rdb/Queries/Math/RMatch.php
diff --git a/rdb/ValuedQuery/ValuedQuery.php b/rdb/ValuedQuery/ValuedQuery.php
diff --git a/tests/Functional/MathTest.php b/tests/Functional/MathTest.php

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`	`],`
`21`	`21`	`"require": {`
`22`		`- "php": ">=5.3.0"`
	`22`	`+ "php": "^8.3.0"`
`23`	`23`	`},`
`24`	`24`	`"require-dev": {`
`25`	`25`	`"phpunit/phpunit": "~4.8",`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace r\Datum;`
`4`	`4`
`5`		`-use r\Datum\Datum;`
`6`	`5`	`use r\DatumConverter;`
`7`	`6`	`use r\Exceptions\RqlDriverError;`
`8`	`7`
`@@ -15,7 +14,7 @@ public function encodeServerRequest()`
`15`	`14`	`$val = $val->encodeServerRequest();`
`16`	`15`	`unset($val);`
`17`	`16`	`}`
`18`		`- return (Object)$jsonValue;`
	`17`	`+ return (object) $jsonValue;`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`public static function decodeServerResponse($json)`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace r\Exceptions;`
`4`	`4`
`5`		`-use r\Exceptions\RqlException;`
`6`		`-`
`7`	`5`	`class RqlDriverError extends RqlException`
`8`	`6`	`{`
`9`	`7`	`public function __construct($message, $code = 0)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`
`5`	`5`	`class FrameFrameType`
`6`	`6`	`{`
`7`		`- const PB_OPT = 2;`
`8`		`- const PB_POS = 1;`
	`7`	`+ const int PB_OPT = 2;`
	`8`	`+ const int PB_POS = 1;`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`class QueryQueryType`
`6`	`6`	`{`
`7`		`- const PB_CONTINUE = 2;`
`8`		`- const PB_NOREPLY_WAIT = 4;`
`9`		`- const PB_SERVER_INFO = 5;`
`10`		`- const PB_START = 1;`
`11`		`- const PB_STOP = 3;`
	`7`	`+ const int PB_CONTINUE = 2;`
	`8`	`+ const int PB_NOREPLY_WAIT = 4;`
	`9`	`+ const int PB_SERVER_INFO = 5;`
	`10`	`+ const int PB_START = 1;`
	`11`	`+ const int PB_STOP = 3;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`
`5`	`5`	`class ResponseResponseNote`
`6`	`6`	`{`
`7`		`- const PB_ATOM_FEED = 2;`
`8`		`- const PB_INCLUDES_STATES = 5;`
`9`		`- const PB_ORDER_BY_LIMIT_FEED = 3;`
`10`		`- const PB_SEQUENCE_FEED = 1;`
`11`		`- const PB_UNIONED_FEED = 4;`
	`7`	`+ const int PB_ATOM_FEED = 2;`
	`8`	`+ const int PB_INCLUDES_STATES = 5;`
	`9`	`+ const int PB_ORDER_BY_LIMIT_FEED = 3;`
	`10`	`+ const int PB_SEQUENCE_FEED = 1;`
	`11`	`+ const int PB_UNIONED_FEED = 4;`
`12`	`12`	`}`