Merge pull request #45 from benjam-es/feature/refactor

Clean up service provider and run phpcs
JustSteveKing · Dec 28, 2021 · cf8b869 · cf8b869
2 parents 8146ea6 + e8dc545
commit cf8b869
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/Facades/Postcode.php b/src/Facades/Postcode.php
@@ -15,7 +15,7 @@ class Postcode extends Facade
      *
      * @return string
      */
-    protected static function getFacadeAccessor()
+    protected static function getFacadeAccessor(): string
     {
         return PostcodeService::class;
     }

diff --git a/src/PostcodesServiceProvider.php b/src/PostcodesServiceProvider.php
@@ -5,7 +5,9 @@
 namespace JustSteveKing\LaravelPostcodes;
 
 use GuzzleHttp\Client;
+use Illuminate\Validation\Rule;
 use Illuminate\Support\ServiceProvider;
+use JustSteveKing\LaravelPostcodes\Rules\Postcode;
 use JustSteveKing\LaravelPostcodes\Service\PostcodeService;
 
 class PostcodesServiceProvider extends ServiceProvider
@@ -28,13 +30,8 @@ public function register()
             );
         });
 
-        \Illuminate\Validation\Rule::macro('postcode', function () {
-            return new \JustSteveKing\LaravelPostcodes\Rules\Postcode(resolve(PostcodeService::class));
+        Rule::macro('postcode', function () {
+            return new Postcode(resolve(PostcodeService::class));
         });
     }
-
-    public function boot()
-    {
-        //
-    }
 }
diff --git a/src/Service/PostcodeService.php b/src/Service/PostcodeService.php
@@ -47,7 +47,7 @@ public function __construct(Client $client)
     public function validate(string $postcode, bool $preValidate = false): bool
     {
         if ($preValidate) {
-            return !! preg_match(config('postcodes.regex.postcode'), $postcode);
+            return !!preg_match(config('postcodes.regex.postcode'), $postcode);
         }
 
         return $this->getResponse("postcodes/$postcode/validate");
@@ -62,7 +62,7 @@ public function validate(string $postcode, bool $preValidate = false): bool
      */
     public function validateOutcode(string $postcode): bool
     {
-        return !! preg_match(config('postcodes.regex.outcode'), $postcode);
+        return !!preg_match(config('postcodes.regex.outcode'), $postcode);
     }
 
     /**
@@ -121,7 +121,7 @@ public function getOutwardCode(string $outwardcode): object
      */
     public function getRandomPostcode()
     {
-        return $this->getResponse("random/postcodes");
+        return $this->getResponse('random/postcodes');
     }
 
     /**