Merge pull request #89 from neo4j-php/88-increase-php-version

implemented minor changes by newer php versions

Author: stefanak-michal

.github/workflows/db-tests.yml renamed to .github/workflows/db-test-php-7.yml

@@ -9,11 +9,12 @@ 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 ${{ matrix.php-version }} on Neo4j ${{ matrix.neo4j-version }}"
     strategy:
       fail-fast: false
       matrix:
         neo4j-version: ["3.5", "4.2", "4.3", "4.4"]
+        php-version: ['7.4']
 
     services:
       neo4j:
@@ -34,7 +35,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.1'
+          php-version: ${{ matrix.php-version }}
           extensions: mbstring, sockets
           coverage: xdebug
           ini-values: max_execution_time=0

.github/workflows/db-test-php-8.yml

@@ -0,0 +1,47 @@
+name: Tests with a database
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  tests:
+    runs-on: ubuntu-20.04
+    name: "Running Integration tests for PHP ${{ matrix.php-version }} on Neo4j ${{ matrix.neo4j-version }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        neo4j-version: ["3.5", "4.2", "4.3", "4.4"]
+        php-version: ['8.0', '8.1']
+
+    services:
+      neo4j:
+        image: neo4j:${{ matrix.neo4j-version }}
+        env:
+          NEO4J_AUTH: neo4j/nothing
+          NEO4JLABS_PLUGINS: '["apoc"]'
+        ports:
+          - 7687:7687
+          - 7474:7474
+        options: >-
+          --health-cmd "wget http://localhost:7474 || exit 1"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: mbstring, sockets
+          coverage: xdebug
+          ini-values: max_execution_time=0
+
+      - name: Install dependencies
+        run: composer install --no-progress
+
+      - name: Test with phpunit
+        run: vendor/bin/phpunit --configuration phpunit.xml --testsuite "Database"

.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

composer.json

@@ -8,11 +8,11 @@
     "license": "MIT",
     "minimum-stability": "stable",
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=7.4",
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": ">=7.5.0"
+        "phpunit/phpunit": ">=9"
     },
     "support": {
         "issues": "https://github.com/neo4j-php/Bolt/issues",
@@ -43,7 +43,7 @@
     },
     "suggest": {
         "laudis/neo4j-php-client": "Neo4j-PHP-Client is the most advanced PHP Client for Neo4j",
-        "ext-sockets": "Needed when using the Bolt\\connection\\Socket",
+        "ext-sockets": "Needed when using Socket connection class",
         "ext-openssl": "Needed when using StreamSocket connection class with SSL"
     },
     "scripts": {

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

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'],

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'],

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;

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;
 

src/connection/Socket.php

@@ -15,7 +15,6 @@
  */
 class Socket extends AConnection
 {
-
     /**
      * @var resource|object|bool
      */