wip: support for php 8.1

Author: uyab

composer.json

@@ -19,9 +19,9 @@
     ],
     "require": {
         "php": ">=7.3",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/cache": "^6.0|^7.0|^8.0|^9.0",
-        "intervention/image": "^2.5"
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/cache": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "intervention/image": "^2.7"
     },
     "require-dev": {
         "phpunit/phpunit": "~9.0",

src/Avatar.php

@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Cache\Repository;
 use Intervention\Image\AbstractFont;
 use Intervention\Image\AbstractShape;
+use Intervention\Image\Gd\Color;
 use Intervention\Image\ImageManager;
 use Laravolt\Avatar\Concerns\AttributeGetter;
 use Laravolt\Avatar\Concerns\AttributeSetter;
@@ -328,8 +329,8 @@ public function buildAvatar()
 
         $this->image->text(
             $this->initials,
-            $x,
-            $y,
+            (int) $x,
+            (int) $y,
             function (AbstractFont $font) {
                 $font->file($this->font);
                 $font->size($this->fontSize);
@@ -354,19 +355,61 @@ protected function createShape()
 
     protected function createCircleShape()
     {
-        $circleDiameter = $this->width - $this->borderSize;
-        $x = $this->width / 2;
-        $y = $this->height / 2;
-
-        $this->image->circle(
-            $circleDiameter,
-            $x,
-            $y,
-            function (AbstractShape $draw) {
-                $draw->background($this->background);
-                $draw->border($this->borderSize, $this->getBorderColor());
+        $circleDiameter = (int) ($this->width - $this->borderSize);
+        $x = (int) ($this->width / 2);
+        $y = (int) ($this->height / 2);
+
+        if ($this->driver === 'gd') {
+            // parse background color
+            $background = new Color($this->background);
+
+            if ($this->borderSize) {
+                // slightly smaller ellipse to keep 1px bordered edges clean
+                imagefilledellipse(
+                    $this->image->getCore(),
+                    $x,
+                    $y,
+                    $this->width - 1,
+                    $this->height - 1,
+                    $background->getInt()
+                );
+
+                $border_color = new Color($this->getBorderColor());
+                imagesetthickness($this->image->getCore(), $this->borderSize);
+
+                // gd's imageellipse doesn't respect imagesetthickness so i use imagearc with 359.9 degrees here
+                imagearc(
+                    $this->image->getCore(),
+                    $x,
+                    $y,
+                    $circleDiameter,
+                    $circleDiameter,
+                    0,
+                    (int) 359.99,
+                    $border_color->getInt()
+                );
+            } else {
+                imagefilledellipse(
+                    $this->image->getCore(),
+                    $x,
+                    $y,
+                    $circleDiameter,
+                    $circleDiameter,
+                    $background->getInt()
+                );
             }
-        );
+        } else {
+            $this->image->circle(
+                $circleDiameter,
+                $x,
+                $y,
+                function (AbstractShape $draw) {
+                    // $draw->background($this->background);
+                    $draw->border($this->borderSize, $this->getBorderColor());
+                }
+            );
+        }
+
     }
 
     protected function createSquareShape()

src/Generator/DefaultGenerator.php

@@ -13,7 +13,7 @@ public function make($name, $length = 2, $uppercase = false, $ascii = false, $rt
     {
         $this->setName($name, $ascii);
 
-        $words = new Collection(explode(' ', $this->name));
+        $words = new Collection(explode(' ', (string)$this->name));
 
         // if name contains single word, use first N character
         if ($words->count() === 1) {
@@ -61,7 +61,7 @@ protected function getInitialFromOneWord($words, $length)
     {
         $initial = (string)$words->first();
 
-        if (strlen($this->name) >= $length) {
+        if (strlen((string)$this->name) >= $length) {
             $initial = Str::substr($this->name, 0, $length);
         }