Merge pull request #57 from WyriHaximus-labs/php-8.5-deprecations

Fix PHP 8.5 deprecations

Author: mbonneau

composer.json

@@ -33,7 +33,7 @@
     }
   },
   "require": {
-    "php": ">=7.0.0",
+    "php": ">=7.1.0",
     "voryx/event-loop": "^3.0.2 || ^2.0.2",
     "reactivex/rxphp": "^2.0.11",
     "react/promise": "^2.7.1 || ^3",

src/PgAsync/Client.php

@@ -38,7 +38,7 @@ class Client
     /** @var Connection */
     private $listenConnection;
 
-    public function __construct(array $parameters, LoopInterface $loop = null, ConnectorInterface $connector = null)
+    public function __construct(array $parameters, ?LoopInterface $loop = null, ?ConnectorInterface $connector = null)
     {
         $this->loop      = $loop ?: \EventLoop\getLoop();
         $this->connector = $connector;

src/PgAsync/Connection.php

@@ -155,7 +155,7 @@ class Connection extends EventEmitter
     private $tlsConnectorFlags = [];
     private $password;
 
-    public function __construct(array $parameters, LoopInterface $loop, ConnectorInterface $connector = null)
+    public function __construct(array $parameters, LoopInterface $loop, ?ConnectorInterface $connector = null)
     {
         if (!is_array($parameters) ||
             !isset($parameters['user']) ||
@@ -572,7 +572,7 @@ private function handleRowDescription(RowDescription $message)
         $this->addColumns($message->getColumns());
     }
 
-    private function failAllCommandsWith(\Throwable $e = null)
+    private function failAllCommandsWith(?\Throwable $e = null)
     {
         $e = $e ?: new \Exception('unknown error');
 
@@ -642,7 +642,7 @@ public function processQueue()
     public function query($query): Observable
     {
         return new AnonymousObservable(
-            function (ObserverInterface $observer, SchedulerInterface $scheduler = null) use ($query) {
+            function (ObserverInterface $observer, ?SchedulerInterface $scheduler = null) use ($query) {
                 if ($this->connStatus === $this::CONNECTION_NEEDED) {
                     $this->start();
                 }
@@ -692,7 +692,7 @@ public function executeStatement(string $queryString, array $parameters = []): O
          */
 
         return new AnonymousObservable(
-            function (ObserverInterface $observer, SchedulerInterface $scheduler = null) use ($queryString, $parameters) {
+            function (ObserverInterface $observer, ?SchedulerInterface $scheduler = null) use ($queryString, $parameters) {
                 if ($this->connStatus === $this::CONNECTION_NEEDED) {
                     $this->start();
                 }