Release 2.0

.editorconfig

@@ -12,4 +12,4 @@ trim_trailing_whitespace = true
 trim_trailing_whitespace = false
 
 [*.{yml,yaml}]
-indent_size = 2
+indent_size = 2

.github/workflows/php-cs-fixer.yml

@@ -0,0 +1,23 @@
+name: Check & fix styling
+
+on: [push]
+
+jobs:
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+
+      - name: Run PHP CS Fixer
+        uses: docker://oskarstark/php-cs-fixer-ga
+        with:
+          args: --config=.php_cs.dist.php --allow-risky=yes
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Fix styling

.github/workflows/phpstan.yml

@@ -0,0 +1,26 @@
+name: PHPStan
+
+on:
+  push:
+    paths:
+      - '**.php'
+      - 'phpstan.neon.dist'
+
+jobs:
+  phpstan:
+    name: phpstan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+          coverage: none
+
+      - name: Install composer dependencies
+        uses: ramsey/composer-install@v2
+
+      - name: Run PHPStan
+        run: ./vendor/bin/phpstan --error-format=github

.github/workflows/run-tests.yml

@@ -0,0 +1,45 @@
+name: Tests
+
+on: [pull_request]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        php: [8.2, 8.3]
+        laravel: [10.*, 11.*]
+        stability: [prefer-stable]
+        include:
+          - laravel: 10.*
+            testbench: ^8.0
+          - laravel: 11.*
+            testbench: ^9.0
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: none
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: Execute tests
+        run: vendor/bin/pest

.php_cs.dist.php

@@ -0,0 +1,40 @@
+<?php
+
+$finder = Symfony\Component\Finder\Finder::create()
+    ->in([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->name('*.php')
+    ->notName('*.blade.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return (new PhpCsFixer\Config())
+    ->setRules([
+        '@PSR12' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'ordered_imports' => ['sort_algorithm' => 'alpha'],
+        'no_unused_imports' => true,
+        'not_operator_with_successor_space' => true,
+        'trailing_comma_in_multiline' => true,
+        'phpdoc_scalar' => true,
+        'unary_operator_spaces' => true,
+        'binary_operator_spaces' => true,
+        'blank_line_before_statement' => [
+            'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
+        ],
+        'phpdoc_single_line_var_spacing' => true,
+        'phpdoc_var_without_name' => true,
+        'class_attributes_separation' => [
+            'elements' => [
+                'method' => 'one',
+            ],
+        ],
+        'method_argument_space' => [
+            'on_multiline' => 'ensure_fully_multiline',
+            'keep_multiple_spaces_after_comma' => true,
+        ],
+        'single_trait_insert_per_statement' => true,
+    ])
+    ->setFinder($finder);

README.md

@@ -57,7 +57,7 @@ You can completely customize which environments you want to have enabled for the
 
 To modify the default values, publish the package configuration file using:
 
-```
+```bash
 php artisan vendor:publish --provider='BeyondCode\LaravelFavicon\FaviconServiceProvider' --tag='config'
 ```
 

composer.json

@@ -16,14 +16,21 @@
         }
     ],
     "require": {
-        "php": "^7.1|^8.0|^8.1|^8.2|^8.3",
-        "illuminate/http": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|^10.0|^11.0",
-        "illuminate/support": "5.6.*|5.7.*|5.8.*|6.*|7.*|8.*|9.*|^10.0|^11.0",
-        "intervention/image": "^2.4"
+        "php": "^8.1|^8.2|^8.3",
+        "illuminate/http": "^9.0|^10.0|^11.0",
+        "illuminate/support": "^9.0|^10.0|^11.0",
+        "intervention/image": "^2.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0|^8.0|^9.0|^10.0|^11.0",
-        "orchestra/testbench": "^3.7|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0"
+        "nunomaduro/collision": "^7.0",
+        "nunomaduro/larastan": "^2.0.1",
+        "orchestra/testbench": "^8.0|^9.0",
+        "pestphp/pest": "^2.2",
+        "pestphp/pest-plugin-laravel": "^2.0",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpunit/phpunit": "^10.0|^11.0"
     },
     "autoload": {
         "psr-4": {
@@ -39,18 +46,23 @@
         }
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
+        "test": "vendor/bin/pest",
+        "test-coverage": "vendor/bin/pest --coverage"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "pestphp/pest-plugin": true,
+            "phpstan/extension-installer": true
+        }
     },
     "extra": {
         "laravel": {
             "providers": [
                 "BeyondCode\\LaravelFavicon\\FaviconServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/Favicon.php

@@ -6,25 +6,24 @@
 
 class Favicon
 {
-    /** @var array */
-    protected $config;
+    protected array $config;
 
     public function __construct(array $config)
     {
         $this->config = $config;
     }
 
-    public function getFaviconText(string $environment)
+    public function getFaviconText(string $environment): mixed
     {
         return Arr::get($this->config, 'enabled_environments.'.$environment.'.text');
     }
 
-    public function getFaviconColor(string $environment)
+    public function getFaviconColor(string $environment): mixed
     {
         return Arr::get($this->config, 'enabled_environments.'.$environment.'.color');
     }
 
-    public function getFaviconBackgroundColor(string $environment)
+    public function getFaviconBackgroundColor(string $environment): mixed
     {
         return Arr::get($this->config, 'enabled_environments.'.$environment.'.background_color');
     }

src/FaviconServiceProvider.php

@@ -12,7 +12,7 @@ class FaviconServiceProvider extends ServiceProvider
     /**
      * Bootstrap the application services.
      */
-    public function boot()
+    public function boot(): void
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([
@@ -26,7 +26,7 @@ public function boot()
     /**
      * Register the application services.
      */
-    public function register()
+    public function register(): void
     {
         $this->mergeConfigFrom(__DIR__.'/../config/favicon.php', 'favicon');
 
@@ -39,7 +39,7 @@ public function register()
         });
     }
 
-    protected function registerRoutes()
+    protected function registerRoutes(): void
     {
         Route::get(config('favicon.url_prefix').'/{icon}', FaviconController::class)
             ->where('icon', '.*');

src/Generators/EnvironmentGenerator.php

@@ -12,14 +12,11 @@
 
 class EnvironmentGenerator implements FaviconGenerator
 {
-    /** @var Favicon */
-    protected $favicon;
+    protected Favicon $favicon;
 
-    /** @var ImageManager */
-    protected $manager;
+    protected ImageManager $manager;
 
-    /** @var string */
-    protected $environment;
+    protected string $environment;
 
     public function __construct(Favicon $favicon)
     {
@@ -82,7 +79,7 @@ protected function calculateDynamicFontSize(AbstractFont $font, Image $icon, $pa
         }
     }
 
-    protected function createEnvironmentTextImage(AbstractFont $font)
+    protected function createEnvironmentTextImage(AbstractFont $font): Image
     {
         $size = $font->getBoxSize();
 

src/Http/Controllers/FaviconController.php

@@ -4,10 +4,11 @@
 
 use BeyondCode\LaravelFavicon\Generators\FaviconGenerator;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 
 class FaviconController
 {
-    public function __invoke(Request $request, FaviconGenerator $generator)
+    public function __invoke(Request $request, FaviconGenerator $generator): Response
     {
         return $generator->generate($request->route('icon'));
     }

src/helpers.php

@@ -3,7 +3,7 @@
 use BeyondCode\LaravelFavicon\Generators\FaviconGenerator;
 
 if (! function_exists('favicon')) {
-    function favicon($image)
+    function favicon(string $image): string
     {
         if (app(FaviconGenerator::class)->shouldGenerateFavicon(app()->environment())) {
             return rtrim(config('app.url'), '/').'/'.config('favicon.url_prefix')."/$image";