Code quality

archtechx · May 24, 2021 · 2dc7b70 · szepeviktor · Sep 30, 2021 · 2dc7b70
1 parent 0c0cf1e
commit 2dc7b70
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 25 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -9,16 +9,12 @@ parameters:
 
     universalObjectCratesClasses:
         - Illuminate\Routing\Route
+        - ArchTech\SEO\SEOManager
 
     ignoreErrors:
-        # -
-        #     message: '#Offset (.*?) does not exist on array\|null#'
-        #     paths:
-        #         - tests/*
-        # -
-        #    message: '#expects resource, resource\|false given#'
-        #    paths:
-        #        - tests/*
-        # - '#should return \$this#'
+        - '#SEOManager\|array\|string\|null#'
+        - '#string\|false given#'
+        - '#flipp\(\) should return#'
+        - '#\_\_set\(\) has no return typehint specified#'
 
     checkMissingIterableValueType: false
diff --git a/src/SEOManager.php b/src/SEOManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace ArchTech\SEO;
 
 use Illuminate\Support\Str;
@@ -73,9 +75,10 @@ protected function modify(string $key): string|null
     }
 
     /** Set one or more values. */
-    public function set(string|array $key, string|null $value = null): string|array
+    public function set(string|array $key, string|null $value = null): string|array|null
     {
         if (is_array($key)) {
+            /** @var array<string, string> $key */
             foreach ($key as $k => $v) {
                 $this->set($k, $v);
             }
@@ -84,15 +87,15 @@ public function set(string|array $key, string|null $value = null): string|array
                 ->keys()
                 ->mapWithKeys(fn (string $key) => [$key => $this->get($key)])
                 ->toArray();
-        } else {
-            $this->values[$key] = $value;
+        }
 
-            if (Str::contains($key, '.')) {
-                $this->extension(Str::before($key, '.'), enabled: true);
-            }
+        $this->values[$key] = $value;
 
-            return $this->get($key);
+        if (Str::contains($key, '.')) {
+            $this->extension(Str::before($key, '.'), enabled: true);
         }
+
+        return $this->get($key);
     }
 
     /** Resolve a value. */
@@ -124,7 +127,7 @@ public function extensions(): array
             ->filter(fn (bool $enabled) => $enabled)
             ->keys()
             ->mapWithKeys(fn (string $extension) => [
-                $extension => $this->meta("extensions.$extension.view") ?? ("seo::extensions." . $extension)
+                $extension => $this->meta("extensions.$extension.view") ?? ('seo::extensions.' . $extension),
             ])
             ->toArray();
     }
@@ -155,12 +158,13 @@ public function flipp(string $template, string|array $data = null): string|stati
     /**
      * Get or set metadata.
      * @param string|array $key The key or key-value pair being set.
-     * @param string|array|mixed $value The value (if a single key is provided).
-     * @return mixed
+     * @param string|array|null $value The value (if a single key is provided).
+     * @return $this|string
      */
-    public function meta(string|array $key, mixed $value = null): mixed
+    public function meta(string|array $key, string|array $value = null): mixed
     {
         if (is_array($key)) {
+            /** @var array<string, string> $key */
             foreach ($key as $k => $v) {
                 $this->meta($k, $v);
             }
@@ -178,7 +182,7 @@ public function meta(string|array $key, mixed $value = null): mixed
     }
 
     /** Handle magic method calls. */
-    public function __call($name, $arguments)
+    public function __call(string $name, array $arguments): string|array|null|static
     {
         if (isset($this->extensions[$name])) {
             return $this->extension($name, $arguments[0] ?? true);
@@ -209,13 +213,13 @@ public function __call($name, $arguments)
     }
 
     /** Handle magic get. */
-    public function __get(string $key)
+    public function __get(string $key): string|null
     {
         return $this->get(Str::snake($key, '.'));
     }
 
     /** Handle magic set. */
-    public function __set(string $key, mixed $value)
+    public function __set(string $key, string $value)
     {
         return $this->set(Str::snake($key, '.'), $value);
     }

diff --git a/src/SEOServiceProvider.php b/src/SEOServiceProvider.php
@@ -4,15 +4,16 @@
 
 namespace ArchTech\SEO;
 
-use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
+use ImLiam\BladeHelper\BladeHelperServiceProvider;
 use ImLiam\BladeHelper\Facades\BladeHelper;
 
 class SEOServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
         $this->app->singleton('seo', SEOManager::class);
+        $this->app->register(BladeHelperServiceProvider::class);
     }
 
     public function boot(): void

diff --git a/src/helpers.php b/src/helpers.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 use ArchTech\SEO\SEOManager;
 
 if (! function_exists('seo')) {
     function seo(string|array $key = null): SEOManager|string|array|null
     {
         if (! $key) {
             return app('seo');
-        } else if (is_array($key)) {
+        } elseif (is_array($key)) {
             return app('seo')->set($key);
         } else {
             return app('seo')->get($key);

diff --git a/tests/Pest/FlippTest.php b/tests/Pest/FlippTest.php
@@ -1,5 +1,7 @@
 <?php
 
+beforeEach(fn () => config(['services.flipp.key' => 'abc']));
+
 test('flipp templates can be set', function () {
     seo()->flipp('blog', 'abcdefg');