Remove support for PHP 8.0, cleanup

.github/workflows/run-tests.yml

@@ -9,7 +9,7 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.0]
+                php: [8.1]
                 dependency-version: [prefer-stable, prefer-lowest]
 
         name: P${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}

README.md

@@ -23,7 +23,7 @@ sudo pip install unoserver
 ```
 
 ## Converters
-It's highly recommend using the new `unoconvert` converter. If you are unable to upgrade, we still provide the deprecated `UnoconvConverter` for the time being.
+It's highly recommend using the new `unoconvert` converter. If you are unable to upgrade, we still provide the deprecated `UnoconvConverter` for the time being. `UnoconvConverter` is deprecated and will be removed in 3.0.
 
 ## Server
 Unoserver works together with unoconvert. Unoserver runs as a daemon on the server, and unoconvert connects through it to pass the files. To see why this is more efficient, see https://github.com/unoconv/unoserver/#overview

composer.json

@@ -15,13 +15,13 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "phpoffice/phpword": "^0.18.2",
-        "symfony/process": "^5.0|^6.0"
+        "symfony/process": "^6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
-        "friendsofphp/php-cs-fixer": "^3.0"
+        "phpunit/phpunit": "^9.5",
+        "friendsofphp/php-cs-fixer": "^3.2"
     },
     "autoload": {
         "psr-4": {

src/Converters/AbstractConverter.php

@@ -6,10 +6,7 @@
 
 abstract class AbstractConverter
 {
-    private function __construct(
-        protected DocumentReplacer $documentReplacer,
-        protected array $options
-    ) {
+    private function __construct(protected DocumentReplacer $documentReplacer, protected array $options) {
     }
 
     public static function make(DocumentReplacer $documentReplacer, array $options = []): self

src/Converters/UnoconvConverter.php

@@ -6,6 +6,7 @@
 use Symfony\Component\Process\Process;
 
 /** @deprecated */
+/** Will be removed in 3.0 */
 class UnoconvConverter extends AbstractConverter
 {
     private const BINARY = '/usr/bin/unoconv';

src/DocumentReplacer.php

@@ -9,15 +9,13 @@
 
 class DocumentReplacer
 {
-    private Template $template;
     private TemplateProcessor $templateProcessor;
     private ?string $converter = null;
     private array $converterOptions = [];
 
-    private function __construct(Template $template)
+    private function __construct(private Template $template)
     {
-        $this->template = $template;
-        $this->templateProcessor = new TemplateProcessor($this->template->path());
+        $this->templateProcessor = new TemplateProcessor($template->path());
     }
 
     public function variables(): array

src/Template.php

@@ -6,7 +6,7 @@
 
 class Template
 {
-    private function __construct(string $path)
+    private function __construct(private string $path)
     {
         if (! file_exists($path)) {
             throw new InvalidArgumentException("File at '{$path}' cannot be found.");
@@ -15,8 +15,6 @@ private function __construct(string $path)
         if (! is_file($path)) {
             throw new InvalidArgumentException("File at '{$path}' must be a file.");
         }
-
-        $this->path = $path;
     }
 
     public function path(): string

src/ValueTypes/Image.php

@@ -6,16 +6,13 @@
 
 class Image
 {
-    /** @var string|Closure */
-    private $image;
-
     private ?bool $ratio = null;
     private ?int $width = null;
     private ?int $height = null;
 
-    private function __construct($image)
+    private function __construct(private Closure|string $image)
     {
-        $this->image = $image;
+
     }
 
     public static function forPath(string $path): self
@@ -26,7 +23,7 @@ public static function forPath(string $path): self
     public static function forBase64(string $base64data): self
     {
         // strip out data uri scheme information (see RFC 2397)
-        if (strpos($base64data, ';base64') !== false) {
+        if (str_contains($base64data, ';base64')) {
             [$_, $base64data] = explode(';', $base64data);
             [$_, $base64data] = explode(',', $base64data);
         }
@@ -36,14 +33,14 @@ public static function forBase64(string $base64data): self
 
     public static function forBinary($binary): self
     {
-        // temporarily store the decoded data on the filesystem to be able to pass it trough the template replacer
+        // Temporarily store the decoded data on the filesystem to be able to pass it through the template replacer
         $tmpFile = tempnam(sys_get_temp_dir(), 'document-replacer');
         file_put_contents($tmpFile, $binary);
 
         return new static($tmpFile);
     }
 
-    public static function lazy(Closure $closure)
+    public static function lazy(Closure $closure): self
     {
         return new static($closure);
     }