implemented minor changes by newer php versions

stefanak-michal · stefanak-michal · commit 3351f563ad6a · 2022-03-10T13:53:12.000+01:00
diff --git a/.github/workflows/db-tests.yml b/.github/workflows/db-tests.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-18.04
-    name: "Running Integration tests for PHP 7.1 on Neo4j ${{ matrix.neo4j-version }}"
+    name: "Running Integration tests for PHP 7.4 on Neo4j ${{ matrix.neo4j-version }}"
     strategy:
       fail-fast: false
       matrix:
@@ -34,7 +34,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.1'
+          php-version: '7.4'
           extensions: mbstring, sockets
           coverage: xdebug
           ini-values: max_execution_time=0
diff --git a/.github/workflows/no-db-test-php-7.yml b/.github/workflows/no-db-test-php-7.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.1', '7.2', '7.3', '7.4']
+        php-version: ['7.4']
 
     steps:
       - name: Checkout
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     "license": "MIT",
     "minimum-stability": "stable",
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=7.4",
         "ext-mbstring": "*"
     },
     "require-dev": {
diff --git a/src/Bolt.php b/src/Bolt.php
@@ -19,31 +19,11 @@
  */
 final class Bolt
 {
-    /**
-     * @var IPacker
-     */
-    private $packer;
-
-    /**
-     * @var IUnpacker
-     */
-    private $unpacker;
-
-    /**
-     * @var IConnection
-     */
-    private $connection;
-
-    /**
-     * @var array
-     */
-    private $versions = [4.4, 4.3, 4.2, 3];
-
-    /**
-     * Print debug info
-     * @var bool
-     */
-    public static $debug = false;
+    private IPacker $packer;
+    private IUnpacker $unpacker;
+    private IConnection $connection;
+    private array $versions = [4.4, 4.3, 4.2, 3];
+    public static bool $debug = false;
 
     /**
      * Bolt constructor
diff --git a/src/PackStream/v1/Packer.php b/src/PackStream/v1/Packer.php
@@ -32,12 +32,9 @@ class Packer implements IPacker
     private const LARGE = 65536;
     private const HUGE = 4294967295;
 
-    /**
-     * @var bool
-     */
-    private $littleEndian;
+    private bool $littleEndian;
 
-    private $structuresLt = [
+    private array $structuresLt = [
         Date::class => [0x44, 'days' => 'packInteger'],
         Time::class => [0x54, 'nanoseconds' => 'packInteger', 'tz_offset_seconds' => 'packInteger'],
         LocalTime::class => [0x74, 'nanoseconds' => 'packInteger'],
diff --git a/src/PackStream/v1/Unpacker.php b/src/PackStream/v1/Unpacker.php
@@ -30,27 +30,12 @@
  */
 class Unpacker implements IUnpacker
 {
-    /**
-     * @var string
-     */
-    private $message;
-
-    /**
-     * @var int
-     */
-    private $offset;
-
-    /**
-     * @var bool
-     */
-    private $littleEndian;
-
-    /**
-     * @var int
-     */
-    private $signature;
+    private string $message;
+    private int $offset;
+    private bool $littleEndian;
+    private int $signature;
 
-    private $structuresLt = [
+    private array $structuresLt = [
         0x4E => [Node::class, 'unpackInteger', 'unpackList', 'unpackMap'],
         0x52 => [Relationship::class, 'unpackInteger', 'unpackInteger', 'unpackInteger', 'unpackString', 'unpackMap'],
         0x72 => [UnboundRelationship::class, 'unpackInteger', 'unpackString', 'unpackMap'],
diff --git a/src/connection/AConnection.php b/src/connection/AConnection.php
@@ -11,29 +11,14 @@
  */
 abstract class AConnection implements IConnection
 {
+    protected string $ip;
+    protected int $port;
+    protected float $timeout;
 
     /**
-     * @var string
+     * @inheritDoc
      */
-    protected $ip;
-
-    /**
-     * @var int
-     */
-    protected $port;
-
-    /**
-     * @var int
-     */
-    protected $timeout;
-
-    /**
-     * AConnection constructor.
-     * @param string $ip
-     * @param int $port
-     * @param int|float $timeout
-     */
-    public function __construct(string $ip = '127.0.0.1', int $port = 7687, $timeout = 15)
+    public function __construct(string $ip = '127.0.0.1', int $port = 7687, float $timeout = 15)
     {
         $this->ip = $ip;
         $this->port = $port;
diff --git a/src/connection/IConnection.php b/src/connection/IConnection.php
@@ -14,9 +14,9 @@ interface IConnection
     /**
      * @param string $ip
      * @param int $port
-     * @param int|float $timeout
+     * @param float $timeout
      */
-    public function __construct(string $ip = '127.0.0.1', int $port = 7687, $timeout = 15);
+    public function __construct(string $ip = '127.0.0.1', int $port = 7687, float $timeout = 15);
 
     public function connect(): bool;
 
diff --git a/src/connection/Socket.php b/src/connection/Socket.php
@@ -15,7 +15,6 @@
  */
 class Socket extends AConnection
 {
-
     /**
      * @var resource|object|bool
      */
diff --git a/src/connection/StreamSocket.php b/src/connection/StreamSocket.php
@@ -16,11 +16,7 @@
  */
 class StreamSocket extends AConnection
 {
-
-    /**
-     * @var array
-     */
-    private $sslContextOptions = [];
+    private array $sslContextOptions = [];
 
     /**
      * @var resource
diff --git a/src/error/MessageException.php b/src/error/MessageException.php
@@ -14,15 +14,8 @@
  */
 class MessageException extends Exception
 {
-    /**
-     * @var string
-     */
-    private $serverMessage;
-
-    /**
-     * @var string
-     */
-    private $serverCode;
+    private string $serverMessage;
+    private string $serverCode;
 
     /**
      * @param string $message
diff --git a/src/helpers/Auth.php b/src/helpers/Auth.php
@@ -12,10 +12,7 @@
  */
 class Auth
 {
-    /**
-     * @var string
-     */
-    public static $defaultUserAgent = 'bolt-php';
+    public static string $defaultUserAgent = 'bolt-php';
 
     /**
      * None authorization
diff --git a/src/protocol/AProtocol.php b/src/protocol/AProtocol.php
@@ -21,20 +21,9 @@ abstract class AProtocol
     protected const IGNORED = 0x7E;
     protected const RECORD = 0x71;
 
-    /**
-     * @var IPacker
-     */
-    protected $packer;
-
-    /**
-     * @var IUnpacker
-     */
-    protected $unpacker;
-
-    /**
-     * @var IConnection
-     */
-    protected $connection;
+    protected IPacker $packer;
+    protected IUnpacker $unpacker;
+    protected IConnection $connection;
 
     /**
      * AProtocol constructor.
diff --git a/src/structures/Date.php b/src/structures/Date.php
@@ -15,10 +15,7 @@
  */
 class Date implements IStructure
 {
-    /**
-     * @var int
-     */
-    private $days;
+    private int $days;
 
     /**
      * Date constructor.
diff --git a/src/structures/DateTime.php b/src/structures/DateTime.php
@@ -19,21 +19,9 @@
  */
 class DateTime implements IStructure
 {
-
-    /**
-     * @var int
-     */
-    private $seconds;
-
-    /**
-     * @var int
-     */
-    private $nanoseconds;
-
-    /**
-     * @var int
-     */
-    private $tz_offset_seconds;
+    private int $seconds;
+    private int $nanoseconds;
+    private int $tz_offset_seconds;
 
     /**
      * DateTime constructor.
diff --git a/src/structures/DateTimeZoneId.php b/src/structures/DateTimeZoneId.php
@@ -19,21 +19,9 @@
  */
 class DateTimeZoneId implements IStructure
 {
-
-    /**
-     * @var int
-     */
-    private $seconds;
-
-    /**
-     * @var int
-     */
-    private $nanoseconds;
-
-    /**
-     * @var string
-     */
-    private $tz_id;
+    private int $seconds;
+    private int $nanoseconds;
+    private string $tz_id;
 
     /**
      * DateTimeZoneId constructor.
diff --git a/src/structures/Duration.php b/src/structures/Duration.php
@@ -16,25 +16,10 @@
 class Duration implements IStructure
 {
 
-    /**
-     * @var int
-     */
-    private $months;
-
-    /**
-     * @var int
-     */
-    private $days;
-
-    /**
-     * @var int
-     */
-    private $seconds;
-
-    /**
-     * @var int
-     */
-    private $nanoseconds;
+    private int $months;
+    private int $days;
+    private int $seconds;
+    private int $nanoseconds;
 
     /**
      * Duration constructor.
diff --git a/src/structures/IStructure.php b/src/structures/IStructure.php
@@ -11,5 +11,5 @@
  */
 interface IStructure
 {
-    public function __toString () : string;
+    public function __toString(): string;
 }
diff --git a/src/structures/LocalDateTime.php b/src/structures/LocalDateTime.php
@@ -15,16 +15,8 @@
  */
 class LocalDateTime implements IStructure
 {
-
-    /**
-     * @var int
-     */
-    private $seconds;
-
-    /**
-     * @var int
-     */
-    private $nanoseconds;
+    private int $seconds;
+    private int $nanoseconds;
 
     /**
      * LocalDateTime constructor.
diff --git a/src/structures/LocalTime.php b/src/structures/LocalTime.php
@@ -15,10 +15,7 @@
  */
 class LocalTime implements IStructure
 {
-    /**
-     * @var int
-     */
-    private $nanoseconds;
+    private int $nanoseconds;
 
     /**
      * LocalTime constructor.
diff --git a/src/structures/Node.php b/src/structures/Node.php
@@ -13,18 +13,9 @@
  */
 class Node implements IStructure
 {
-    /**
-     * @var int
-     */
-    private $id;
-    /**
-     * @var array
-     */
-    private $labels;
-    /**
-     * @var array
-     */
-    private $properties;
+    private int $id;
+    private array $labels;
+    private array $properties;
 
     /**
      * Node constructor.
diff --git a/src/structures/Path.php b/src/structures/Path.php
diff --git a/src/structures/Point2D.php b/src/structures/Point2D.php
diff --git a/src/structures/Point3D.php b/src/structures/Point3D.php
diff --git a/src/structures/Relationship.php b/src/structures/Relationship.php
diff --git a/src/structures/Time.php b/src/structures/Time.php
diff --git a/src/structures/UnboundRelationship.php b/src/structures/UnboundRelationship.php

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`*/`
`16`	`16`	`class Socket extends AConnection`
`17`	`17`	`{`
`18`		`-`
`19`	`18`	`/**`
`20`	`19`	`* @var resource\|object\|bool`
`21`	`20`	`*/`