Merge pull request #8 from 123inkt/update_packages

Update packages

Author: RubenKluft

README.md

@@ -2,6 +2,8 @@
 
 # Digitalrevolution IPP library
 
+A library to aid using the [ipp protocol](https://datatracker.ietf.org/doc/html/rfc8010/) in php, for example to send print jobs to print servers that support the protocol
+
 ## Installation
 
 ```bash
@@ -48,7 +50,7 @@ composer require digitalrevolution/ipp
     $printer->setDeviceUri('my.uri');
     $printer->setLocation('location');
 
-    $ipp->createPrinter($printer);
+    $ipp->printerAdministration()->createPrinter($printer);
 ```
 
 ### Delete a printer
@@ -57,7 +59,7 @@ composer require digitalrevolution/ipp
     $printer = new IppPrinter();
     $printer->setHostname('my.printer');
 
-    $ipp->deletePrinter($printer);
+    $ipp->printerAdministration()->deletePrinter($printer);
 ```
 
 ### Contributing

composer.json

@@ -27,9 +27,9 @@
         "digitalrevolution/php-codesniffer-baseline": "^1.1",
         "phpmd/phpmd": "^2.12",
         "phpstan/extension-installer": "^1.2",
-        "phpstan/phpstan": "^1.9.1",
-        "phpstan/phpstan-phpunit": "^1.2.2",
-        "phpunit/phpunit": "^11.5",
+        "phpstan/phpstan": "^2.0.0",
+        "phpstan/phpstan-phpunit": "^2.0.0",
+        "phpunit/phpunit": "^12.0",
         "roave/security-advisories": "dev-latest",
         "squizlabs/php_codesniffer": "^3.7",
         "slevomat/coding-standard": "^8.16"

src/Protocol/IppAttribute.php

@@ -43,7 +43,7 @@ public function __toString(): string
         } elseif ($this->type === IppTypeEnum::Bool) {
             $binary .= pack('n', 1) . pack('c', (int)Assert::boolean($this->value));
         } else {
-            $binary .= pack('n', strlen(Assert::string($this->value))) . $this->value;
+            $binary .= pack('n', strlen(Assert::string($this->value))) . Assert::string($this->value);
         }
 
         return $binary;

src/Protocol/IppResponseParser.php

@@ -94,6 +94,7 @@ private function consume(string $response, int $length, ?IppTypeEnum $type): arr
     private function unpackDateTime(string $response): DateTime
     {
         // Datetime in rfc2579 format: https://datatracker.ietf.org/doc/html/rfc2579
+        /** @var array{year: int, month: int, day: int, hour: int, min: int, sec: int, int, tz: string, tzhour:int, tzmin: int}|false $dateTime */
         $dateTime = @unpack('nyear/cmonth/cday/chour/cmin/csec/c/atz/ctzhour/ctzmin', $response);
         if ($dateTime === false) {
             throw new RuntimeException('Failed to unpack IPP datetime');
@@ -113,7 +114,7 @@ private function unpackDateTime(string $response): DateTime
     private function unpack(string $unpack, string $string): string|int
     {
         $data = @unpack($unpack, $string);
-        if ($data === false || isset($data[1]) === false) {
+        if ($data === false || isset($data[1]) === false || (is_string($data[1]) === false && is_int($data[1]) === false)) {
             throw new RuntimeException();
         }