remove flexible font locator, only allow fixed path

Author: uyab

CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+## 2.0.0
+* support plain PHP project
+* remove support for php 5.x
+* remove font folder publishing (Laravel version)
+* remove `setFontFolder`
+* `fonts` config only accept full path

README.md

@@ -97,8 +97,7 @@ return [
 
     // Fonts used to render text.
     // If contains more than one fonts, randomly selected based on name supplied
-    // You can provide absolute path, path relative to folder resources/laravolt/avatar/fonts/, or mixed.    
-    'fonts'    => ['OpenSans-Bold.ttf', 'rockwell.ttf'],
+    'fonts'    => ['path/to/OpenSans-Bold.ttf', 'path/to/rockwell.ttf'],
 
     // List of foreground colors to be used, randomly selected based on name supplied
     'foregrounds'   => [

config/config.php

@@ -41,8 +41,7 @@
 
     // Fonts used to render text.
     // If contains more than one fonts, randomly selected based on name supplied
-    // You can provide absolute path, path relative to folder resources/laravolt/avatar/fonts/, or mixed.
-    'fonts'    => ['OpenSans-Bold.ttf', 'rockwell.ttf'],
+    'fonts'    => [__DIR__.'/../fonts/OpenSans-Bold.ttf', __DIR__.'/../fonts/rockwell.ttf'],
 
     // List of foreground colors to be used, randomly selected based on name supplied
     'foregrounds'   => [

resources/assets/fonts/OpenSans-Bold.ttf renamed to fonts/OpenSans-Bold.ttf

@@ -35,8 +35,7 @@ class Avatar
 
     protected $initialGenerator;
 
-    protected $fontFolder;
-    protected $defaultFont = __DIR__.'/../resources/assets/fonts/OpenSans-Bold.ttf';
+    protected $defaultFont = __DIR__.'/../fonts/OpenSans-Bold.ttf';
 
     /**
      * Avatar constructor.
@@ -73,8 +72,8 @@ public function __construct(array $config = [], Repository $cache = null, Initia
         $this->availableBackgrounds = $config['backgrounds'];
         $this->availableForegrounds = $config['foregrounds'];
         $this->fonts = $config['fonts'];
+        $this->font = $this->defaultFont;
         $this->fontSize = $config['fontSize'];
-        $this->fontFolder = [__DIR__.'/../resources/assets/fonts/'];
         $this->width = $config['width'];
         $this->height = $config['height'];
         $this->ascii = $config['ascii'];
@@ -101,28 +100,19 @@ public function __construct(array $config = [], Repository $cache = null, Initia
      */
     public function __toString()
     {
-        return (string) $this->toBase64();
+        return (string)$this->toBase64();
     }
 
     public function create($name)
     {
         $this->name = $name;
 
-        $this->initialGenerator->setName($name);
-        $this->initialGenerator->setLength($this->chars);
-        $this->initials = $this->initialGenerator->make();
-
         $this->setForeground($this->getRandomForeground());
         $this->setBackground($this->getRandomBackground());
 
         return $this;
     }
 
-    public function setFontFolder($folders)
-    {
-        $this->fontFolder = $folders;
-    }
-
     public function setFont($font)
     {
         if (is_file($font)) {
@@ -222,26 +212,9 @@ protected function getRandomForeground()
 
     protected function setRandomFont()
     {
-        $this->font = $this->defaultFont;
-
-        $initials = $this->getInitial();
-
-        if ($initials) {
-            $number = ord($initials[0]);
-            $font = $this->fonts[$number % count($this->fonts)];
+        $randomFont = $this->getRandomElement($this->fonts, $this->defaultFont);
 
-            if (!is_array($this->fontFolder)) {
-                throw new \Exception('Font folder not set');
-            }
-
-            foreach ($this->fontFolder as $folder) {
-                $fontFile = $folder.$font;
-                if (is_file($fontFile)) {
-                    $this->font = $fontFile;
-                    break;
-                }
-            }
-        }
+        $this->setFont($randomFont);
     }
 
     protected function getBorderColor()
@@ -258,6 +231,8 @@ protected function getBorderColor()
 
     protected function buildAvatar()
     {
+        $this->buildInitial();
+
         $x = $this->width / 2;
         $y = $this->height / 2;
 
@@ -350,7 +325,7 @@ protected function cacheKey()
 
     protected function getRandomElement($array, $default)
     {
-        if (strlen($this->name) == 0) {
+        if (strlen($this->name) == 0 || count($array) == 0) {
             return $default;
         }
 
@@ -371,4 +346,11 @@ protected function chooseFont()
             $this->setRandomFont();
         }
     }
+
+    protected function buildInitial()
+    {
+        $this->initialGenerator->setName($this->name);
+        $this->initialGenerator->setLength($this->chars);
+        $this->initials = $this->initialGenerator->make();
+    }
 }

resources/assets/fonts/rockwell.ttf renamed to fonts/rockwell.ttf

@@ -27,20 +27,6 @@ public function register()
 
             $avatar = new Avatar($config->get('avatar'), $cache, new InitialGenerator());
 
-            // list of folder to scan where font located, order by priority
-            $fontFolder = [
-                // no folder at all, allow developer to supply full path to file in their configuration
-                '',
-
-                // find file located in published asset folder
-                base_path('resources/laravolt/avatar/fonts/'),
-
-                // find font included by default in package
-                __DIR__.'/../resources/assets/fonts/',
-            ];
-
-            $avatar->setFontFolder($fontFolder);
-
             return $avatar;
         });
     }
@@ -52,20 +38,9 @@ public function register()
      */
     public function boot()
     {
-        $this->registerAssets();
         $this->registerConfigurations();
     }
 
-    /**
-     * Register the package public assets.
-     *
-     * @return void
-     */
-    protected function registerAssets()
-    {
-        $this->publishes([$this->packagePath('resources/assets') => base_path('resources/laravolt/avatar')], 'assets');
-    }
-
     /**
      * Register the package configurations.
      *