Bump PHP version to 8.1

cybercog · Dec 10, 2023 · acaa2b4 · acaa2b4
1 parent 7171590
commit acaa2b4
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 185 deletions.
diff --git a/.docker/php/Dockerfile b/.docker/php/Dockerfile
@@ -1,7 +1,7 @@
 # ----------------------
 # The FPM base container
 # ----------------------
-FROM php:7.4-fpm-alpine AS dev
+FROM php:8.1-cli-alpine AS dev
 
 RUN apk add --no-cache --virtual .build-deps \
     $PHPIZE_DEPS \

diff --git a/.docker/php/www.conf b/.docker/php/www.conf
diff --git a/composer.json b/composer.json
@@ -28,13 +28,13 @@
         }
     },
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.1",
         "cybercog/php-unicode": "dev-master"
     },
     "require-dev": {
         "ext-simplexml": "*",
         "ext-xmlreader": "*",
-        "phpunit/phpunit": "^9.0|^10.0"
+        "phpunit/phpunit": "^10.0"
     },
     "suggest": {
         "ext-simplexml": "*",

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -6,8 +6,7 @@ services:
     build:
       context: ./
       dockerfile: ./.docker/php/Dockerfile
-    restart: unless-stopped
+    tty: true
     working_dir: /app
     volumes:
       - ./:/app
-      - ./.docker/php/www.conf:/usr/local/etc/php-fpm.d/www.conf:ro
diff --git a/src/Font.php b/src/Font.php
@@ -11,64 +11,42 @@ final class Font
 {
     private const UNICODE_CODE_POINT_LINE_FEED = 10;
 
-    private string $id;
-
-    private int $horizontalAdvance;
-
-    private FontFace $fontFace;
-
-    private MissingGlyph $missingGlyph;
-
-    /** @var array<int, Glyph> $glyphs */
-    private array $glyphs;
-
     /**
      * @param array<int, Glyph> $glyphs
      */
     public function __construct(
-        string $id,
-        int $horizontalAdvance,
-        FontFace $fontFace,
-        MissingGlyph $missingGlyph,
-        array $glyphs = []
+        public readonly string $id,
+        private readonly int $horizontalAdvance,
+        private readonly FontFace $fontFace,
+        private readonly MissingGlyph $missingGlyph,
+        private readonly array $glyphs = [],
     ) {
-        $this->id = $id;
-        $this->horizontalAdvance = $horizontalAdvance;
-        $this->fontFace = $fontFace;
-        $this->missingGlyph = $missingGlyph;
-        $this->glyphs = $glyphs;
-
         if ($horizontalAdvance < 0) {
             throw new \InvalidArgumentException(
                 "Font with id `$id` has negative horizontal advance",
             );
         }
     }
 
-    public function id(): string
-    {
-        return $this->id;
-    }
-
     public function computeCharacterWidth(
         Character $character,
         int $size,
         float $letterSpacing = 0.0
     ): float {
-        $size = $size / $this->fontFace->unitsPerEm();
+        $size = $size / $this->fontFace->unitsPerEm;
 
         $glyphHorizontalAdvance = $this->getGlyphHorizontalAdvance($character);
 
         $glyphWidth = $glyphHorizontalAdvance * $size;
-        $letterSpacingWidth = $this->fontFace->unitsPerEm() * $letterSpacing * $size;
+        $letterSpacingWidth = $this->fontFace->unitsPerEm * $letterSpacing * $size;
 
         return $glyphWidth + $letterSpacingWidth;
     }
 
     public function computeStringWidth(
         UnicodeString $string,
         int $size,
-        float $letterSpacing = 0.0
+        float $letterSpacing = 0.0,
     ): float {
         $maxLineWidth = $lineWidth = 0;
 
@@ -88,14 +66,14 @@ public function computeStringWidth(
     }
 
     private function getGlyphHorizontalAdvance(
-        Character $character
+        Character $character,
     ): int {
         if (!isset($this->glyphs[strval($character)])) {
-            return $this->missingGlyph->horizontalAdvance()
+            return $this->missingGlyph->horizontalAdvance
                 ?? $this->horizontalAdvance;
         }
 
-        return $this->glyphs[strval($character)]->horizontalAdvance()
+        return $this->glyphs[strval($character)]->horizontalAdvance
             ?? $this->horizontalAdvance;
     }
 }
diff --git a/src/FontFace.php b/src/FontFace.php
@@ -8,16 +8,8 @@ final class FontFace
 {
     private const DEFAULT_UNITS_PER_EM = 1000;
 
-    private int $unitsPerEm;
-
     public function __construct(
-        int $unitsPerEm = null
+        public readonly int | null $unitsPerEm = self::DEFAULT_UNITS_PER_EM,
     ) {
-        $this->unitsPerEm = $unitsPerEm ?? self::DEFAULT_UNITS_PER_EM;
-    }
-
-    public function unitsPerEm(): int
-    {
-        return $this->unitsPerEm;
     }
 }
diff --git a/src/FontList.php b/src/FontList.php
@@ -9,22 +9,19 @@
 
 final class FontList
 {
-    private array $fontList;
-
     /**
      * @param list<Font> $fontList
      */
     private function __construct(
-        array $fontList
+        private readonly array $fontList,
     ) {
-        $this->fontList = $fontList;
     }
 
     /**
      * @param list<Font> $fontList
      */
     public static function of(
-        array $fontList
+        array $fontList,
     ): self {
         foreach ($fontList as $font) {
             if (!($font instanceof Font)) {
@@ -41,7 +38,7 @@ public static function of(
 
     public static function ofFile(
         string $filePath,
-        SvgFontFileParserInterface $fontFileParser = null
+        SvgFontFileParserInterface $fontFileParser = null,
     ): self {
         if ($fontFileParser === null) {
             $fontFileParser = new SimpleXmlSvgFontFileParser();
@@ -59,10 +56,10 @@ public static function ofFile(
     }
 
     public function getById(
-        string $id
+        string $id,
     ): Font {
         foreach ($this->fontList as $font) {
-            if ($font->id() === $id) {
+            if ($font->id === $id) {
                 return $font;
             }
         }

diff --git a/src/Glyph.php b/src/Glyph.php
@@ -8,40 +8,15 @@
 
 final class Glyph
 {
-    private Character $character;
-
-    private ?string $name;
-
-    private ?int $horizontalAdvance;
-
     public function __construct(
-        Character $character,
-        ?string $name = null,
-        ?int $horizontalAdvance = null
+        public readonly Character $character,
+        public readonly string | null $name = null,
+        public readonly int | null $horizontalAdvance = null,
     ) {
-        $this->name = $name;
-        $this->horizontalAdvance = $horizontalAdvance;
-
         if ($horizontalAdvance !== null && $horizontalAdvance < 0) {
             throw new \InvalidArgumentException(
                 "Glyph with unicode `$character` has negative horizontal advance",
             );
         }
-        $this->character = $character;
-    }
-
-    public function character(): Character
-    {
-        return $this->character;
-    }
-
-    public function name(): ?string
-    {
-        return $this->name;
-    }
-
-    public function horizontalAdvance(): ?int
-    {
-        return $this->horizontalAdvance;
     }
 }
diff --git a/src/MissingGlyph.php b/src/MissingGlyph.php
@@ -6,16 +6,8 @@
 
 final class MissingGlyph
 {
-    private ?int $horizontalAdvance;
-
     public function __construct(
-        ?int $horizontalAdvance = null
+        public readonly int | null $horizontalAdvance = null,
     ) {
-        $this->horizontalAdvance = $horizontalAdvance;
-    }
-
-    public function horizontalAdvance(): ?int
-    {
-        return $this->horizontalAdvance;
     }
 }
diff --git a/src/Parser/SimpleXmlSvgFontFileParser.php b/src/Parser/SimpleXmlSvgFontFileParser.php
@@ -34,7 +34,7 @@ public function __construct()
      * @inheritDoc
      */
     public function parseFile(
-        string $filePath
+        string $filePath,
     ): array {
         $xml = simplexml_load_file($filePath);
         $xml->registerXPathNamespace('svg', 'http://www.w3.org/2000/svg');
@@ -51,7 +51,7 @@ public function parseFile(
     }
 
     private function initFont(
-        \SimpleXMLElement $fontElement
+        \SimpleXMLElement $fontElement,
     ): Font {
         $fontId = strval($fontElement[self::ATTRIBUTE_ID]);
         $defaultHorizontalAdvance = intval($fontElement[self::ATTRIBUTE_HORIZ_ADV_X]);
@@ -102,7 +102,7 @@ private function initFont(
     }
 
     private function initFontFace(
-        \SimpleXMLElement $fontFaceElement
+        \SimpleXMLElement $fontFaceElement,
     ): FontFace {
         $unitsPerEm = intval($fontFaceElement[self::ATTRIBUTE_UNITS_PER_EM]);
 
@@ -139,7 +139,7 @@ private function initGlyph(
     }
 
     private function initMissingGlyph(
-        \SimpleXMLElement $missingGlyphElement
+        \SimpleXMLElement $missingGlyphElement,
     ): MissingGlyph {
         $horizontalAdvance = intval($missingGlyphElement[self::ATTRIBUTE_HORIZ_ADV_X]);
 

diff --git a/src/Parser/SvgFontFileParserInterface.php b/src/Parser/SvgFontFileParserInterface.php
@@ -15,6 +15,6 @@ interface SvgFontFileParserInterface
      * @return list<Font>
      */
     public function parseFile(
-        string $filePath
+        string $filePath,
     ): array;
 }