Fix CI and composer dependencies

.github/workflows/analysis.yml

@@ -11,24 +11,24 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: '8.3'
           extensions: openssl,mbstring
           coverage: xdebug
 
       - name: Get Composer Cache Directory
         id: composer-cache
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-      - name: Install Composer Dependencies
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-
       - name: Cache Dependencies
         uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
+      - name: Install Composer Dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
       - name: Run Static Analysis
         run: composer run-script analyse
 

.github/workflows/build.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest, windows-latest]
-        php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+        php-versions: ['8.1', '8.2', '8.3', '8.4', '8.5']
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     steps:
       - name: Checkout
@@ -20,22 +20,18 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
+        shell: bash
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
-      - name: Install Composer dependencies
-        if: ${{ matrix.php-versions != '8.1' }}
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader
-
-      - name: Install Composer dependencies (8.1)
-        if: ${{ matrix.php-versions == '8.1' }}
-        run: composer install --no-progress --no-suggest --prefer-dist --optimize-autoloader --ignore-platform-reqs
-
       - name: Cache dependencies
         uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
+      - name: Install Composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
       - name: Run Specs
         run: composer run-script test

composer.json

@@ -18,10 +18,10 @@
     "php": ">=7.1"
   },
   "require-dev": {
-    "phpspec/phpspec": "^5.1|^6.1|^7.1",
+    "phpspec/phpspec": "^7.1|^8.0",
     "freedsx/asn1": "^0.4.0",
-    "friends-of-phpspec/phpspec-code-coverage": "^4.3|^6.1",
-    "phpstan/phpstan": "^0.12"
+    "friends-of-phpspec/phpspec-code-coverage": "^6.1|^7.0",
+    "phpstan/phpstan": "^2.0"
   },
   "suggest": {
     "ext-openssl": "For SSL/TLS support.",

phpstan.neon

@@ -2,6 +2,5 @@ parameters:
     level: 6
     paths:
         - %currentWorkingDirectory%/src
-    checkMissingIterableValueType: false
-    treatPhpDocTypesAsCertain: false
-    checkGenericClassInNonGenericObjectType: false
+    phpVersion: 70100
+    treatPhpDocTypesAsCertain: false

src/FreeDSx/Socket/Socket.php

@@ -54,7 +54,7 @@ class Socket
     protected $errorNumber;
 
     /**
-     * @var array
+     * @var array<string, string>
      */
     protected $sslOptsMap = [
         'ssl_allow_self_signed' => 'allow_self_signed',
@@ -68,7 +68,7 @@ class Socket
     ];
 
     /**
-     * @var array
+     * @var array<string, bool>
      */
     protected $sslOpts = [
         'allow_self_signed' => false,
@@ -79,7 +79,7 @@ class Socket
     ];
 
     /**
-     * @var array
+     * @var array<string, mixed>
      */
     protected $options = [
         'transport' => 'tcp',
@@ -98,7 +98,7 @@ class Socket
 
     /**
      * @param resource|null $resource
-     * @param array $options
+     * @param array<string, mixed> $options
      */
     public function __construct($resource = null, array $options = [])
     {
@@ -269,7 +269,7 @@ public function connect(string $host)
     /**
      * Get the options set for the socket.
      *
-     * @return array
+     * @return array<string, mixed>
      */
     public function getOptions() : array
     {
@@ -280,7 +280,7 @@ public function getOptions() : array
      * Create a socket by connecting to a specific host.
      *
      * @param string $host
-     * @param array $options
+     * @param array<string, mixed> $options
      * @return Socket
      * @throws ConnectionException
      */
@@ -293,7 +293,7 @@ public static function create(string $host, array $options = []) : Socket
      * Create a UNIX based socket.
      *
      * @param string $file The full path to the unix socket.
-     * @param array $options Any additional options.
+     * @param array<string, mixed> $options Any additional options.
      * @return Socket
      * @throws ConnectionException
      */
@@ -314,7 +314,7 @@ public static function unix(
      * Create a TCP based socket.
      *
      * @param string $host
-     * @param array $options
+     * @param array<string, mixed> $options
      * @return Socket
      * @throws ConnectionException
      */
@@ -327,7 +327,7 @@ public static function tcp(string $host, array $options = []) : Socket
      * Create a UDP based socket.
      *
      * @param string $host
-     * @param array $options
+     * @param array<string, mixed> $options
      * @return Socket
      * @throws ConnectionException
      */

src/FreeDSx/Socket/SocketPool.php

@@ -20,7 +20,7 @@
 class SocketPool
 {
     /**
-     * @var array
+     * @var array<string, mixed>
      */
     protected $options = [
         'servers' => [],
@@ -29,7 +29,7 @@ class SocketPool
     ];
 
     /**
-     * @var array
+     * @var list<string>
      */
     protected $socketOpts = [
         'use_ssl',
@@ -45,7 +45,7 @@ class SocketPool
     ];
 
     /**
-     * @param array $options
+     * @param array<string, mixed> $options
      */
     public function __construct(array $options)
     {
@@ -84,7 +84,7 @@ public function connect(string $hostname = '') : Socket
     }
 
     /**
-     * @return array
+     * @return array<string, mixed>
      */
     protected function getSocketOptions() : array
     {

src/FreeDSx/Socket/SocketServer.php

@@ -29,7 +29,7 @@ class SocketServer extends Socket
     ];
 
     /**
-     * @var array
+     * @var array<string, mixed>
      */
     protected $serverOpts = [
         'use_ssl' => false,
@@ -48,7 +48,7 @@ class SocketServer extends Socket
     protected $clients = [];
 
     /**
-     * @param array $options
+     * @param array<string, mixed> $options
      */
     public function __construct(array $options = [])
     {
@@ -173,7 +173,7 @@ public function removeClient(Socket $socket): void
      *
      * @param string $ip
      * @param int|null $port
-     * @param array $options
+     * @param array<string, mixed> $options
      * @return SocketServer
      * @throws ConnectionException
      */
@@ -193,7 +193,7 @@ public static function bind(
      *
      * @param string $ip
      * @param int $port
-     * @param array $options
+     * @param array<string, mixed> $options
      * @return SocketServer
      * @throws ConnectionException
      */
@@ -217,7 +217,7 @@ public static function bindTcp(
      *
      * @param string $ip
      * @param int $port
-     * @param array $options
+     * @param array<string, mixed> $options
      * @return SocketServer
      * @throws ConnectionException
      */
@@ -240,7 +240,7 @@ public static function bindUdp(
      * Created a UNIX based socket server.
      *
      * @param string $socketFile
-     * @param array $options
+     * @param array<string, mixed> $options
      * @return SocketServer
      * @throws ConnectionException
      */