Is this what the StyleCI wants?

yakatz · yakatz · commit 3142ba49457b · 2020-09-16T01:29:40.000-04:00
diff --git a/src/InitialAvatar.php b/src/InitialAvatar.php
@@ -42,21 +42,21 @@ class InitialAvatar
     protected $preferBold = false;
 
     /**
-     * Language eg.en zh-CN
+     * Language eg.en zh-CN.
      *
      * @var string
      */
     protected $language = 'en';
 
     /**
-     * Role translator
+     * Role translator.
      *
      * @var Base
      */
     protected $translator;
 
     /**
-     * Language related to translator
+     * Language related to translator.
      *
      * @var array
      */
@@ -72,7 +72,7 @@ public function __construct()
     }
 
     /**
-     * Create a ImageManager instance
+     * Create a ImageManager instance.
      */
     protected function setupImageManager()
     {
@@ -89,14 +89,14 @@ protected function setupImageManager()
     public function name($nameOrInitials)
     {
         $nameOrInitials = $this->translate($nameOrInitials);
-        $this->name     = $nameOrInitials;
+        $this->name = $nameOrInitials;
         $this->initials_generator->name($nameOrInitials);
 
         return $this;
     }
 
     /**
-     * Transforms a unicode string to the proper format
+     * Transforms a unicode string to the proper format.
      *
      * @param string $char the code to be converted (e.g., f007 would mean the "user" symbol)
      *
@@ -133,7 +133,7 @@ public function length($length = 2)
      */
     public function size($size)
     {
-        $this->width  = (int) $size;
+        $this->width = (int) $size;
         $this->height = (int) $size;
 
         return $this;
@@ -168,7 +168,7 @@ public function width($width)
     }
 
     /**
-     * Prefer bold fonts (if possible)
+     * Prefer bold fonts (if possible).
      *
      * @return $this
      */
@@ -180,7 +180,7 @@ public function preferBold()
     }
 
     /**
-     * Prefer regular fonts (if possible)
+     * Prefer regular fonts (if possible).
      *
      * @return $this
      */
@@ -220,16 +220,15 @@ public function color($color)
     }
 
     /**
-     * Automatically set a font and/or background color based on the supplied name
-     * 
+     * Automatically set a font and/or background color based on the supplied name.
+     *
      * @param bool $foreground
      * @param bool $background
-     * 
+     *
      * @return $this
      */
     public function autoColor(bool $foreground = true, bool $background = true, int $saturation = 85, int $luminance = 60)
     {
-
         $hue = (crc32($this->name) % 360) / 360;
         $saturation /= 100;
         $luminance /= 100;
@@ -255,7 +254,7 @@ public function font($font)
     }
 
     /**
-     * Set the font name
+     * Set the font name.
      *
      * Example: "Open Sans"
      *
@@ -356,7 +355,7 @@ public function keepCase($keepCase = true)
     }
 
     /**
-     * Set if should allow (or remove) special characters
+     * Set if should allow (or remove) special characters.
      *
      * @param bool $allowSpecialCharacters
      *
@@ -394,7 +393,7 @@ public function fontSize($size = 0.5)
     public function generate($name = null)
     {
         if ($name !== null) {
-            $this->name               = $name;
+            $this->name = $name;
             $this->generated_initials = $this->initials_generator->keepCase($this->getKeepCase())
                 ->allowSpecialCharacters($this->getAllowSpecialCharacters())
                 ->generate($name);
@@ -413,7 +412,7 @@ public function generate($name = null)
     public function generateSvg($name = null)
     {
         if ($name !== null) {
-            $this->name               = $name;
+            $this->name = $name;
             $this->generated_initials = $this->initials_generator->keepCase($this->getKeepCase())
                 ->allowSpecialCharacters($this->getAllowSpecialCharacters())
                 ->generate($name);
@@ -546,7 +545,7 @@ public function getHeight()
     /**
      * Will return the keepCase parameter.
      *
-     * @return boolean
+     * @return bool
      */
     public function getKeepCase()
     {
@@ -556,7 +555,7 @@ public function getKeepCase()
     /**
      * Will return the allowSpecialCharacters parameter.
      *
-     * @return boolean
+     * @return bool
      */
     public function getAllowSpecialCharacters()
     {
@@ -578,7 +577,7 @@ public function getAutoFont()
      * ```php
      * $avatar->language('en')->name('Mr Green'); // Right
      * $avatar->name('Mr Green')->language('en'); // Wrong
-     * ```
+     * ```.
      *
      * @param string $language
      *
@@ -592,15 +591,15 @@ public function language($language)
     }
 
     /**
-     * Add new translators designed by user
+     * Add new translators designed by user..
      *
      * @param array $translatorMap
-     *     ```php
-     *     $translatorMap = [
-     *     'fr' => 'foo\bar\Fr',
-     *     'zh-TW' => 'foo\bar\ZhTW'
-     *     ];
-     *     ```
+     *                             ```php
+     *                             $translatorMap = [
+     *                             'fr' => 'foo\bar\Fr',
+     *                             'zh-TW' => 'foo\bar\ZhTW'
+     *                             ];
+     *                             ```
      *
      * @return $this
      */
@@ -611,16 +610,13 @@ public function addTranslators($translatorMap)
         return $this;
     }
 
-    /**
-     * @inheritdoc
-     */
     protected function translate($nameOrInitials)
     {
         return $this->getTranslator()->translate($nameOrInitials);
     }
 
     /**
-     * Instance the translator by language
+     * Instance the translator by language.
      *
      * @return Base
      */
@@ -642,12 +638,12 @@ protected function getTranslator()
      */
     protected function makeAvatar($image)
     {
-        $width    = $this->getWidth();
-        $height   = $this->getHeight();
-        $bgColor  = $this->getBackgroundColor();
-        $name     = $this->getInitials();
+        $width = $this->getWidth();
+        $height = $this->getHeight();
+        $bgColor = $this->getBackgroundColor();
+        $name = $this->getInitials();
         $fontFile = $this->findFontFile();
-        $color    = $this->getColor();
+        $color = $this->getColor();
         $fontSize = $this->getFontSize();
 
         if ($this->getRounded() && $this->getSmooth()) {
@@ -684,7 +680,7 @@ protected function makeAvatar($image)
     protected function makeSvgAvatar()
     {
         // Original document
-        $image    = new SVG($this->getWidth(), $this->getHeight());
+        $image = new SVG($this->getWidth(), $this->getHeight());
         $document = $image->getDocument();
 
         // Background
@@ -745,12 +741,12 @@ protected function findFontFile()
                 return $fontFile;
             }
 
-            if (file_exists(__DIR__ . $fontFile)) {
-                return __DIR__ . $fontFile;
+            if (file_exists(__DIR__.$fontFile)) {
+                return __DIR__.$fontFile;
             }
 
-            if (file_exists(__DIR__ . '/' . $fontFile)) {
-                return __DIR__ . '/' . $fontFile;
+            if (file_exists(__DIR__.'/'.$fontFile)) {
+                return __DIR__.'/'.$fontFile;
             }
         }
 
@@ -761,54 +757,54 @@ protected function getFontByScript()
     {
         // Arabic
         if (StringScript::isArabic($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-Arabic-Regular.ttf';
+            return __DIR__.'/fonts/script/Noto-Arabic-Regular.ttf';
         }
 
         // Armenian
         if (StringScript::isArmenian($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-Armenian-Regular.ttf';
+            return __DIR__.'/fonts/script/Noto-Armenian-Regular.ttf';
         }
 
         // Bengali
         if (StringScript::isBengali($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-Bengali-Regular.ttf';
+            return __DIR__.'/fonts/script/Noto-Bengali-Regular.ttf';
         }
 
         // Georgian
         if (StringScript::isGeorgian($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-Georgian-Regular.ttf';
+            return __DIR__.'/fonts/script/Noto-Georgian-Regular.ttf';
         }
 
         // Hebrew
         if (StringScript::isHebrew($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-Hebrew-Regular.ttf';
+            return __DIR__.'/fonts/script/Noto-Hebrew-Regular.ttf';
         }
 
         // Mongolian
         if (StringScript::isMongolian($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-Mongolian-Regular.ttf';
+            return __DIR__.'/fonts/script/Noto-Mongolian-Regular.ttf';
         }
 
         // Thai
         if (StringScript::isThai($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-Thai-Regular.ttf';
+            return __DIR__.'/fonts/script/Noto-Thai-Regular.ttf';
         }
 
         // Tibetan
         if (StringScript::isTibetan($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-Tibetan-Regular.ttf';
+            return __DIR__.'/fonts/script/Noto-Tibetan-Regular.ttf';
         }
 
         // Chinese & Japanese
         if (StringScript::isJapanese($this->getInitials()) || StringScript::isChinese($this->getInitials())) {
-            return __DIR__ . '/fonts/script/Noto-CJKJP-Regular.otf';
+            return __DIR__.'/fonts/script/Noto-CJKJP-Regular.otf';
         }
 
         return $this->getFontFile();
     }
 
     /**
-     * Convert HSL color value produced by autoColor() to RGB value expected by image driver
+     * Convert HSL color value produced by autoColor() to RGB value expected by image driver.
      */
     protected function convertHSLtoRGB($h, $s, $l, $toHex = true)
     {
@@ -868,17 +864,18 @@ protected function convertHSLtoRGB($h, $s, $l, $toHex = true)
         $blue = round($blue * 255, 0);
 
         if ($toHex) {
-            $red = ($red < 15) ? '0' . dechex($red) : dechex($red);
-            $green = ($green < 15) ? '0' . dechex($green) : dechex($green);
-            $blue = ($blue < 15) ? '0' . dechex($blue) : dechex($blue);
+            $red = ($red < 15) ? '0'.dechex($red) : dechex($red);
+            $green = ($green < 15) ? '0'.dechex($green) : dechex($green);
+            $blue = ($blue < 15) ? '0'.dechex($blue) : dechex($blue);
+
             return "#{$red}{$green}{$blue}";
         } else {
             return ['red' => $red, 'green' => $green, 'blue' => $blue];
         }
     }
 
     /**
-     * Get contrasting foreground color for autoColor background
+     * Get contrasting foreground color for autoColor background.
      */
     protected function getContrastColor($hexColor)
     {
@@ -889,7 +886,7 @@ protected function getContrastColor($hexColor)
         $B1 = hexdec(substr($hexColor, 5, 2));
 
         // Black RGB
-        $blackColor = "#000000";
+        $blackColor = '#000000';
         $R2BlackColor = hexdec(substr($blackColor, 1, 2));
         $G2BlackColor = hexdec(substr($blackColor, 3, 2));
         $B2BlackColor = hexdec(substr($blackColor, 5, 2));
@@ -905,9 +902,9 @@ protected function getContrastColor($hexColor)
 
         $contrastRatio = 0;
         if ($L1 > $L2) {
-            $contrastRatio = (int)(($L1 + 0.05) / ($L2 + 0.05));
+            $contrastRatio = (int) (($L1 + 0.05) / ($L2 + 0.05));
         } else {
-            $contrastRatio = (int)(($L2 + 0.05) / ($L1 + 0.05));
+            $contrastRatio = (int) (($L2 + 0.05) / ($L1 + 0.05));
         }
 
         // If contrast is more than 5, return black color
diff --git a/tests/AutoColorUtilsTest.php b/tests/AutoColorUtilsTest.php
@@ -24,6 +24,6 @@ public function can_create_all_colors()
 
         $avatar->name('D')->autoColor();
         $this->assertEquals('#f04293', $avatar->getBackgroundColor());
-        $this->assertEquals('#ffffff', $avatar->getColor());
+        $this->assertEquals('#FFFFFF', $avatar->getColor());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,21 +42,21 @@ class InitialAvatar`
`42`	`42`	`protected $preferBold = false;`
`43`	`43`
`44`	`44`	`/**`
`45`		`- * Language eg.en zh-CN`
	`45`	`+ * Language eg.en zh-CN.`
`46`	`46`	`*`
`47`	`47`	`* @var string`
`48`	`48`	`*/`
`49`	`49`	`protected $language = 'en';`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * Role translator`
	`52`	`+ * Role translator.`
`53`	`53`	`*`
`54`	`54`	`* @var Base`
`55`	`55`	`*/`
`56`	`56`	`protected $translator;`
`57`	`57`
`58`	`58`	`/**`
`59`		`- * Language related to translator`
	`59`	`+ * Language related to translator.`
`60`	`60`	`*`
`61`	`61`	`* @var array`
`62`	`62`	`*/`
`@@ -72,7 +72,7 @@ public function __construct()`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * Create a ImageManager instance`
	`75`	`+ * Create a ImageManager instance.`
`76`	`76`	`*/`
`77`	`77`	`protected function setupImageManager()`
`78`	`78`	`{`
`@@ -89,14 +89,14 @@ protected function setupImageManager()`
`89`	`89`	`public function name($nameOrInitials)`
`90`	`90`	`{`
`91`	`91`	`$nameOrInitials = $this->translate($nameOrInitials);`
`92`		`- $this->name = $nameOrInitials;`
	`92`	`+ $this->name = $nameOrInitials;`
`93`	`93`	`$this->initials_generator->name($nameOrInitials);`
`94`	`94`
`95`	`95`	`return $this;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`99`		`- * Transforms a unicode string to the proper format`
	`99`	`+ * Transforms a unicode string to the proper format.`
`100`	`100`	`*`
`101`	`101`	`* @param string $char the code to be converted (e.g., f007 would mean the "user" symbol)`
`102`	`102`	`*`
`@@ -133,7 +133,7 @@ public function length($length = 2)`
`133`	`133`	`*/`
`134`	`134`	`public function size($size)`
`135`	`135`	`{`
`136`		`- $this->width = (int) $size;`
	`136`	`+ $this->width = (int) $size;`
`137`	`137`	`$this->height = (int) $size;`
`138`	`138`
`139`	`139`	`return $this;`
`@@ -168,7 +168,7 @@ public function width($width)`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/**`
`171`		`- * Prefer bold fonts (if possible)`
	`171`	`+ * Prefer bold fonts (if possible).`
`172`	`172`	`*`
`173`	`173`	`* @return $this`
`174`	`174`	`*/`
`@@ -180,7 +180,7 @@ public function preferBold()`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`/**`
`183`		`- * Prefer regular fonts (if possible)`
	`183`	`+ * Prefer regular fonts (if possible).`
`184`	`184`	`*`
`185`	`185`	`* @return $this`
`186`	`186`	`*/`
`@@ -220,16 +220,15 @@ public function color($color)`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`
`223`		`- * Automatically set a font and/or background color based on the supplied name`
`224`		`- *`
	`223`	`+ * Automatically set a font and/or background color based on the supplied name.`
	`224`	`+ *`
`225`	`225`	`* @param bool $foreground`
`226`	`226`	`* @param bool $background`
`227`		`- *`
	`227`	`+ *`
`228`	`228`	`* @return $this`
`229`	`229`	`*/`
`230`	`230`	`public function autoColor(bool $foreground = true, bool $background = true, int $saturation = 85, int $luminance = 60)`
`231`	`231`	`{`
`232`		`-`
`233`	`232`	`$hue = (crc32($this->name) % 360) / 360;`
`234`	`233`	`$saturation /= 100;`
`235`	`234`	`$luminance /= 100;`
`@@ -255,7 +254,7 @@ public function font($font)`
`255`	`254`	`}`
`256`	`255`
`257`	`256`	`/**`
`258`		`- * Set the font name`
	`257`	`+ * Set the font name.`
`259`	`258`	`*`
`260`	`259`	`* Example: "Open Sans"`
`261`	`260`	`*`
`@@ -356,7 +355,7 @@ public function keepCase($keepCase = true)`
`356`	`355`	`}`
`357`	`356`
`358`	`357`	`/**`
`359`		`- * Set if should allow (or remove) special characters`
	`358`	`+ * Set if should allow (or remove) special characters.`
`360`	`359`	`*`
`361`	`360`	`* @param bool $allowSpecialCharacters`
`362`	`361`	`*`
`@@ -394,7 +393,7 @@ public function fontSize($size = 0.5)`
`394`	`393`	`public function generate($name = null)`
`395`	`394`	`{`
`396`	`395`	`if ($name !== null) {`
`397`		`- $this->name = $name;`
	`396`	`+ $this->name = $name;`
`398`	`397`	`$this->generated_initials = $this->initials_generator->keepCase($this->getKeepCase())`
`399`	`398`	`->allowSpecialCharacters($this->getAllowSpecialCharacters())`
`400`	`399`	`->generate($name);`
`@@ -413,7 +412,7 @@ public function generate($name = null)`
`413`	`412`	`public function generateSvg($name = null)`
`414`	`413`	`{`
`415`	`414`	`if ($name !== null) {`
`416`		`- $this->name = $name;`
	`415`	`+ $this->name = $name;`
`417`	`416`	`$this->generated_initials = $this->initials_generator->keepCase($this->getKeepCase())`
`418`	`417`	`->allowSpecialCharacters($this->getAllowSpecialCharacters())`
`419`	`418`	`->generate($name);`
`@@ -546,7 +545,7 @@ public function getHeight()`
`546`	`545`	`/**`
`547`	`546`	`* Will return the keepCase parameter.`
`548`	`547`	`*`
`549`		`- * @return boolean`
	`548`	`+ * @return bool`
`550`	`549`	`*/`
`551`	`550`	`public function getKeepCase()`
`552`	`551`	`{`
`@@ -556,7 +555,7 @@ public function getKeepCase()`
`556`	`555`	`/**`
`557`	`556`	`* Will return the allowSpecialCharacters parameter.`
`558`	`557`	`*`
`559`		`- * @return boolean`
	`558`	`+ * @return bool`
`560`	`559`	`*/`
`561`	`560`	`public function getAllowSpecialCharacters()`
`562`	`561`	`{`
`@@ -578,7 +577,7 @@ public function getAutoFont()`
`578`	`577`	* ```php
`579`	`578`	`* $avatar->language('en')->name('Mr Green'); // Right`
`580`	`579`	`* $avatar->name('Mr Green')->language('en'); // Wrong`
`581`		- * ```
	`580`	+ * ```.
`582`	`581`	`*`
`583`	`582`	`* @param string $language`
`584`	`583`	`*`
`@@ -592,15 +591,15 @@ public function language($language)`
`592`	`591`	`}`
`593`	`592`
`594`	`593`	`/**`
`595`		`- * Add new translators designed by user`
	`594`	`+ * Add new translators designed by user..`
`596`	`595`	`*`
`597`	`596`	`* @param array $translatorMap`
`598`		- * ```php
`599`		`- * $translatorMap = [`
`600`		`- * 'fr' => 'foo\bar\Fr',`
`601`		`- * 'zh-TW' => 'foo\bar\ZhTW'`
`602`		`- * ];`
`603`		- * ```
	`597`	+ * ```php
	`598`	`+ * $translatorMap = [`
	`599`	`+ * 'fr' => 'foo\bar\Fr',`
	`600`	`+ * 'zh-TW' => 'foo\bar\ZhTW'`
	`601`	`+ * ];`
	`602`	+ * ```
`604`	`603`	`*`
`605`	`604`	`* @return $this`
`606`	`605`	`*/`
`@@ -611,16 +610,13 @@ public function addTranslators($translatorMap)`
`611`	`610`	`return $this;`
`612`	`611`	`}`
`613`	`612`
`614`		`- /**`
`615`		`- * @inheritdoc`
`616`		`- */`
`617`	`613`	`protected function translate($nameOrInitials)`
`618`	`614`	`{`
`619`	`615`	`return $this->getTranslator()->translate($nameOrInitials);`
`620`	`616`	`}`
`621`	`617`
`622`	`618`	`/**`
`623`		`- * Instance the translator by language`
	`619`	`+ * Instance the translator by language.`
`624`	`620`	`*`
`625`	`621`	`* @return Base`
`626`	`622`	`*/`
`@@ -642,12 +638,12 @@ protected function getTranslator()`
`642`	`638`	`*/`
`643`	`639`	`protected function makeAvatar($image)`
`644`	`640`	`{`
`645`		`- $width = $this->getWidth();`
`646`		`- $height = $this->getHeight();`
`647`		`- $bgColor = $this->getBackgroundColor();`
`648`		`- $name = $this->getInitials();`
	`641`	`+ $width = $this->getWidth();`
	`642`	`+ $height = $this->getHeight();`
	`643`	`+ $bgColor = $this->getBackgroundColor();`
	`644`	`+ $name = $this->getInitials();`
`649`	`645`	`$fontFile = $this->findFontFile();`
`650`		`- $color = $this->getColor();`
	`646`	`+ $color = $this->getColor();`
`651`	`647`	`$fontSize = $this->getFontSize();`
`652`	`648`
`653`	`649`	`if ($this->getRounded() && $this->getSmooth()) {`
`@@ -684,7 +680,7 @@ protected function makeAvatar($image)`
`684`	`680`	`protected function makeSvgAvatar()`
`685`	`681`	`{`
`686`	`682`	`// Original document`
`687`		`- $image = new SVG($this->getWidth(), $this->getHeight());`
	`683`	`+ $image = new SVG($this->getWidth(), $this->getHeight());`
`688`	`684`	`$document = $image->getDocument();`
`689`	`685`
`690`	`686`	`// Background`
`@@ -745,12 +741,12 @@ protected function findFontFile()`
`745`	`741`	`return $fontFile;`
`746`	`742`	`}`
`747`	`743`
`748`		`- if (file_exists(__DIR__ . $fontFile)) {`
`749`		`- return __DIR__ . $fontFile;`
	`744`	`+ if (file_exists(__DIR__.$fontFile)) {`
	`745`	`+ return __DIR__.$fontFile;`
`750`	`746`	`}`
`751`	`747`
`752`		`- if (file_exists(__DIR__ . '/' . $fontFile)) {`
`753`		`- return __DIR__ . '/' . $fontFile;`
	`748`	`+ if (file_exists(__DIR__.'/'.$fontFile)) {`
	`749`	`+ return __DIR__.'/'.$fontFile;`
`754`	`750`	`}`
`755`	`751`	`}`
`756`	`752`
`@@ -761,54 +757,54 @@ protected function getFontByScript()`
`761`	`757`	`{`
`762`	`758`	`// Arabic`
`763`	`759`	`if (StringScript::isArabic($this->getInitials())) {`
`764`		`- return __DIR__ . '/fonts/script/Noto-Arabic-Regular.ttf';`
	`760`	`+ return __DIR__.'/fonts/script/Noto-Arabic-Regular.ttf';`
`765`	`761`	`}`
`766`	`762`
`767`	`763`	`// Armenian`
`768`	`764`	`if (StringScript::isArmenian($this->getInitials())) {`
`769`		`- return __DIR__ . '/fonts/script/Noto-Armenian-Regular.ttf';`
	`765`	`+ return __DIR__.'/fonts/script/Noto-Armenian-Regular.ttf';`
`770`	`766`	`}`
`771`	`767`
`772`	`768`	`// Bengali`
`773`	`769`	`if (StringScript::isBengali($this->getInitials())) {`
`774`		`- return __DIR__ . '/fonts/script/Noto-Bengali-Regular.ttf';`
	`770`	`+ return __DIR__.'/fonts/script/Noto-Bengali-Regular.ttf';`
`775`	`771`	`}`
`776`	`772`
`777`	`773`	`// Georgian`
`778`	`774`	`if (StringScript::isGeorgian($this->getInitials())) {`
`779`		`- return __DIR__ . '/fonts/script/Noto-Georgian-Regular.ttf';`
	`775`	`+ return __DIR__.'/fonts/script/Noto-Georgian-Regular.ttf';`
`780`	`776`	`}`
`781`	`777`
`782`	`778`	`// Hebrew`
`783`	`779`	`if (StringScript::isHebrew($this->getInitials())) {`
`784`		`- return __DIR__ . '/fonts/script/Noto-Hebrew-Regular.ttf';`
	`780`	`+ return __DIR__.'/fonts/script/Noto-Hebrew-Regular.ttf';`
`785`	`781`	`}`
`786`	`782`
`787`	`783`	`// Mongolian`
`788`	`784`	`if (StringScript::isMongolian($this->getInitials())) {`
`789`		`- return __DIR__ . '/fonts/script/Noto-Mongolian-Regular.ttf';`
	`785`	`+ return __DIR__.'/fonts/script/Noto-Mongolian-Regular.ttf';`
`790`	`786`	`}`
`791`	`787`
`792`	`788`	`// Thai`
`793`	`789`	`if (StringScript::isThai($this->getInitials())) {`
`794`		`- return __DIR__ . '/fonts/script/Noto-Thai-Regular.ttf';`
	`790`	`+ return __DIR__.'/fonts/script/Noto-Thai-Regular.ttf';`
`795`	`791`	`}`
`796`	`792`
`797`	`793`	`// Tibetan`
`798`	`794`	`if (StringScript::isTibetan($this->getInitials())) {`
`799`		`- return __DIR__ . '/fonts/script/Noto-Tibetan-Regular.ttf';`
	`795`	`+ return __DIR__.'/fonts/script/Noto-Tibetan-Regular.ttf';`
`800`	`796`	`}`
`801`	`797`
`802`	`798`	`// Chinese & Japanese`
`803`	`799`	`if (StringScript::isJapanese($this->getInitials()) \|\| StringScript::isChinese($this->getInitials())) {`
`804`		`- return __DIR__ . '/fonts/script/Noto-CJKJP-Regular.otf';`
	`800`	`+ return __DIR__.'/fonts/script/Noto-CJKJP-Regular.otf';`
`805`	`801`	`}`
`806`	`802`
`807`	`803`	`return $this->getFontFile();`
`808`	`804`	`}`
`809`	`805`
`810`	`806`	`/**`
`811`		`- * Convert HSL color value produced by autoColor() to RGB value expected by image driver`
	`807`	`+ * Convert HSL color value produced by autoColor() to RGB value expected by image driver.`
`812`	`808`	`*/`
`813`	`809`	`protected function convertHSLtoRGB($h, $s, $l, $toHex = true)`
`814`	`810`	`{`
`@@ -868,17 +864,18 @@ protected function convertHSLtoRGB($h, $s, $l, $toHex = true)`
`868`	`864`	`$blue = round($blue * 255, 0);`
`869`	`865`
`870`	`866`	`if ($toHex) {`
`871`		`- $red = ($red < 15) ? '0' . dechex($red) : dechex($red);`
`872`		`- $green = ($green < 15) ? '0' . dechex($green) : dechex($green);`
`873`		`- $blue = ($blue < 15) ? '0' . dechex($blue) : dechex($blue);`
	`867`	`+ $red = ($red < 15) ? '0'.dechex($red) : dechex($red);`
	`868`	`+ $green = ($green < 15) ? '0'.dechex($green) : dechex($green);`
	`869`	`+ $blue = ($blue < 15) ? '0'.dechex($blue) : dechex($blue);`
	`870`	`+`
`874`	`871`	`return "#{$red}{$green}{$blue}";`
`875`	`872`	`} else {`
`876`	`873`	`return ['red' => $red, 'green' => $green, 'blue' => $blue];`
`877`	`874`	`}`
`878`	`875`	`}`
`879`	`876`
`880`	`877`	`/**`
`881`		`- * Get contrasting foreground color for autoColor background`
	`878`	`+ * Get contrasting foreground color for autoColor background.`
`882`	`879`	`*/`
`883`	`880`	`protected function getContrastColor($hexColor)`
`884`	`881`	`{`
`@@ -889,7 +886,7 @@ protected function getContrastColor($hexColor)`
`889`	`886`	`$B1 = hexdec(substr($hexColor, 5, 2));`
`890`	`887`
`891`	`888`	`// Black RGB`
`892`		`- $blackColor = "#000000";`
	`889`	`+ $blackColor = '#000000';`
`893`	`890`	`$R2BlackColor = hexdec(substr($blackColor, 1, 2));`
`894`	`891`	`$G2BlackColor = hexdec(substr($blackColor, 3, 2));`
`895`	`892`	`$B2BlackColor = hexdec(substr($blackColor, 5, 2));`
`@@ -905,9 +902,9 @@ protected function getContrastColor($hexColor)`
`905`	`902`
`906`	`903`	`$contrastRatio = 0;`
`907`	`904`	`if ($L1 > $L2) {`
`908`		`- $contrastRatio = (int)(($L1 + 0.05) / ($L2 + 0.05));`
	`905`	`+ $contrastRatio = (int) (($L1 + 0.05) / ($L2 + 0.05));`
`909`	`906`	`} else {`
`910`		`- $contrastRatio = (int)(($L2 + 0.05) / ($L1 + 0.05));`
	`907`	`+ $contrastRatio = (int) (($L2 + 0.05) / ($L1 + 0.05));`
`911`	`908`	`}`
`912`	`909`
`913`	`910`	`// If contrast is more than 5, return black color`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,6 @@ public function can_create_all_colors()`
`24`	`24`
`25`	`25`	`$avatar->name('D')->autoColor();`
`26`	`26`	`$this->assertEquals('#f04293', $avatar->getBackgroundColor());`
`27`		`- $this->assertEquals('#ffffff', $avatar->getColor());`
	`27`	`+ $this->assertEquals('#FFFFFF', $avatar->getColor());`
`28`	`28`	`}`
`29`	`29`	`}`