Add PHP 8.1 support

Author: javer

.github/workflows/phpunit.yml

@@ -37,9 +37,13 @@ jobs:
             phpseclib: '^3.0'
             composer: 'composer:v2'
             coverage: none
+          - php: '8.1'
+            phpseclib: '^3.0'
+            composer: 'composer:v2'
+            coverage: none
     services:
       rabbitmq:
-        image: rabbitmq:3-management
+        image: rabbitmq:3.8-management
         ports:
           - 5671:5671
           - 5672:5672
@@ -53,7 +57,7 @@ jobs:
           RABBITMQ_SSL_KEYFILE: /src/tests/certs/server_key.pem
           RABBITMQ_SSL_VERIFY: verify_peer
           RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT: 0
-    name: PHP ${{ matrix.php }} Test on ${{ matrix.operating-system }}
+    name: PHP ${{ matrix.php }} + phpseclib ${{ matrix.phpseclib }}
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -70,7 +74,7 @@ jobs:
       run: php tests/phpinfo.php
 
     - name: Start broker service
-      run: docker start ${{ job.services.rabbitmq.id }}
+      run: docker restart ${{ job.services.rabbitmq.id }}
 
     - name: Composer install
       run: composer require --prefer-dist --no-progress --no-suggest phpseclib/phpseclib ${{ matrix.phpseclib }}

PhpAmqpLib/Wire/AMQPAbstractCollection.php

@@ -196,23 +196,27 @@ final protected function decodeCollection(array $val)
         return $val;
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->data[$offset]);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         $value = isset($this->data[$offset]) ? $this->data[$offset] : null;
 
         return is_array($value) ? $value[1] : $value;
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->setValue($value, null, $offset);
     }
 
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->data[$offset]);
@@ -467,26 +471,31 @@ final public static function getDataTypeForSymbol($symbol)
         return $symbols[$symbol];
     }
 
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function next()
     {
         next($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         reset($this->data);
     }
 
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         return key($this->data) !== null;

PhpAmqpLib/Wire/AMQPWriter.php

@@ -283,6 +283,12 @@ public function write_signed_longlong($n)
      */
     public function write_shortstr($s)
     {
+        if ($s === null) {
+            $this->write_octet(0);
+
+            return $this;
+        }
+
         $len = mb_strlen($s, 'ASCII');
         if ($len > 255) {
             throw new AMQPInvalidArgumentException('String too long');
@@ -302,6 +308,12 @@ public function write_shortstr($s)
      */
     public function write_longstr($s)
     {
+        if ($s === null) {
+            $this->write_long(0);
+
+            return $this;
+        }
+
         $this->write_long(mb_strlen($s, 'ASCII'));
         $this->out .= $s;
 

PhpAmqpLib/Wire/IO/StreamIO.php

@@ -344,6 +344,10 @@ protected function do_select($sec, $usec)
         $write = null;
         $except = null;
 
+        if ($sec === null && PHP_VERSION_ID >= 80100) {
+            $usec = null;
+        }
+
         return stream_select($read, $write, $except, $sec, $usec);
     }
 

composer.json

@@ -29,7 +29,7 @@
         }
     ],
     "require": {
-        "php": "^7.0||~8.0.0",
+        "php": "^7.0||^8.0",
         "ext-sockets": "*",
         "ext-mbstring": "*",
         "phpseclib/phpseclib": "^2.0|^3.0"

tests/Unit/Wire/AMQPWriterTest.php

@@ -123,6 +123,20 @@ public function write_table_with_invalid_type()
         ]);
     }
 
+    /**
+     * @test
+     */
+    public function write_table_with_null_strings()
+    {
+        $this->writer->write_table([
+            'x-long-str' => ['S', null],
+            'x-short-str' => ['s', null],
+        ]);
+
+        $expected = "\x00\x00\x00\x1e\x0ax-long-strS\x00\x00\x00\x00\x0bx-short-strs\x00";
+        $this->assertEquals($expected, $this->writer->getvalue());
+    }
+
     protected function setProtoVersion($proto)
     {
         $r = new \ReflectionProperty('\\PhpAmqpLib\\Wire\\AMQPAbstractCollection', 'protocol');