Merge branch 'master' of github.com:beyondcode/laravel-favicon

beyondcode · Jan 29, 2019 · a642a68 · a642a68
2 parents bea2ac8 + b7d7cd5
commit a642a68
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,12 @@ Create dynamic favicons based on your environment settings.
 
 ![](https://beyondco.de/github/favicons/screenshot.png)
 
+## Laravel Package Development
+
+[![https://phppackagedevelopment.com](https://beyondco.de/courses/phppd.jpg)](https://phppackagedevelopment.com)
+
+If you want to learn how to create reusable PHP packages yourself, take a look at my upcoming [PHP Package Development](https://phppackagedevelopment.com) video course.
+
 ## Installation
 
 You can install the package via composer:

diff --git a/config/favicon.php b/config/favicon.php
@@ -56,5 +56,4 @@
      */
     'generator' => \BeyondCode\LaravelFavicon\Generators\EnvironmentGenerator::class,
 
-
-];
+];
diff --git a/src/Favicon.php b/src/Favicon.php
@@ -14,16 +14,16 @@ public function __construct(array $config)
 
     public function getFaviconText(string $environment)
     {
-        return array_get($this->config,'enabled_environments.'.$environment.'.text');
+        return array_get($this->config, 'enabled_environments.'.$environment.'.text');
     }
 
     public function getFaviconColor(string $environment)
     {
-        return array_get($this->config,'enabled_environments.'.$environment.'.color');
+        return array_get($this->config, 'enabled_environments.'.$environment.'.color');
     }
 
     public function getFaviconBackgroundColor(string $environment)
     {
-        return array_get($this->config,'enabled_environments.'.$environment.'.background_color');
+        return array_get($this->config, 'enabled_environments.'.$environment.'.background_color');
     }
-}
+}
diff --git a/src/FaviconServiceProvider.php b/src/FaviconServiceProvider.php
@@ -19,7 +19,7 @@ public function boot()
                 __DIR__.'/../config/favicon.php' => config_path('favicon.php'),
             ], 'config');
         }
-        
+
         $this->registerRoutes();
     }
 

diff --git a/src/Generators/EnvironmentGenerator.php b/src/Generators/EnvironmentGenerator.php
@@ -4,8 +4,8 @@
 
 use Illuminate\Http\Response;
 use Intervention\Image\Image;
-use Intervention\Image\ImageManager;
 use Intervention\Image\AbstractFont;
+use Intervention\Image\ImageManager;
 use BeyondCode\LaravelFavicon\Favicon;
 use Intervention\Image\Gd\Font as GdFont;
 use Intervention\Image\Imagick\Font as ImagickFont;
@@ -26,7 +26,7 @@ public function __construct(Favicon $favicon)
         $this->favicon = $favicon;
 
         $this->manager = new ImageManager([
-            'driver' => config('favicon.image_driver')
+            'driver' => config('favicon.image_driver'),
         ]);
 
         $this->environment = config('app.env');
@@ -41,7 +41,7 @@ public function generate(string $icon): Response
 
         $font = $this->getFont($this->favicon->getFaviconText($this->environment));
 
-        $font->file(config('favicon.font') ?? __DIR__ . '/../../resources/fonts/OpenSans-Regular.ttf');
+        $font->file(config('favicon.font') ?? __DIR__.'/../../resources/fonts/OpenSans-Regular.ttf');
 
         $font->valign('top');
 
@@ -73,10 +73,10 @@ protected function calculateDynamicFontSize(AbstractFont $font, Image $icon, $pa
     {
         $size = $font->getBoxSize();
 
-        while ($size["width"] + $paddingX > $icon->width()  && $font->getSize() > 0) {
+        while ($size['width'] + $paddingX > $icon->width() && $font->getSize() > 0) {
             $fontSize = $font->getSize();
 
-            $font->size($fontSize-1);
+            $font->size($fontSize - 1);
 
             $size = $font->getBoxSize();
         }
@@ -97,4 +97,4 @@ public function shouldGenerateFavicon(): bool
     {
         return config('favicon.enabled_environments.'.$this->environment) !== null;
     }
-}
+}
diff --git a/src/Generators/FaviconGenerator.php b/src/Generators/FaviconGenerator.php
@@ -9,4 +9,4 @@ interface FaviconGenerator
     public function generate(string $icon): Response;
 
     public function shouldGenerateFavicon(): bool;
-}
+}
diff --git a/src/Http/Controllers/FaviconController.php b/src/Http/Controllers/FaviconController.php
@@ -11,4 +11,4 @@ public function __invoke(Request $request, FaviconGenerator $generator)
     {
         return $generator->generate($request->route('icon'));
     }
-}
+}
diff --git a/src/helpers.php b/src/helpers.php
@@ -6,7 +6,7 @@
     function favicon($image)
     {
         if (app(FaviconGenerator::class)->shouldGenerateFavicon(app()->environment())) {
-            return "/".config('favicon.url_prefix')."/$image";
+            return '/'.config('favicon.url_prefix')."/$image";
         }
 
         return $image;

diff --git a/tests/EnvironmentGeneratorTest.php b/tests/EnvironmentGeneratorTest.php
@@ -2,13 +2,11 @@
 
 namespace BeyondCode\LaravelFavicon\Tests;
 
-
 use BeyondCode\LaravelFavicon\Favicon;
 use BeyondCode\LaravelFavicon\FaviconServiceProvider;
 
 class EnvironmentGeneratorTest extends \Orchestra\Testbench\TestCase
 {
-
     protected function getPackageProviders($app)
     {
         return [FaviconServiceProvider::class];

diff --git a/tests/FaviconTest.php b/tests/FaviconTest.php
@@ -2,7 +2,6 @@
 
 namespace BeyondCode\LaravelFavicon\Tests;
 
-
 use BeyondCode\LaravelFavicon\Favicon;
 use BeyondCode\LaravelFavicon\FaviconServiceProvider;