Add Support for Laravel 7 (#17)

* Add Support for Laravel 7 * Apply fixes from StyleCI * Fixes some code quality issues
richan-fongdasen · Mar 8, 2020 · 38b0fa6 · 38b0fa6
1 parent 59e5ac0
commit 38b0fa6
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 66 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,20 @@
 language: php
-sudo: false
-dist: trusty
+os: linux
+dist: bionic
 
 matrix:
   fast_finish: true
   include:
     - php: 7.2
       env: LARAVEL=5.8.* ORCHESTRA=3.8.*
-    - php: 7.2
-      env: LARAVEL=^6.0 ORCHESTRA=^4.0 COVERAGE=1
     - php: 7.3
       env: LARAVEL=^6.0 ORCHESTRA=^4.0
+    - php: 7.4
+      env: LARAVEL=^6.0 ORCHESTRA=^4.0
+    - php: 7.3
+      env: LARAVEL=^7.0 ORCHESTRA=^5.0
+    - php: 7.4
+      env: LARAVEL=^7.0 ORCHESTRA=^5.0 COVERAGE=1
 
   allow_failures:
     - env: COVERAGE=1

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "homepage": "https://github.com/richan-fongdasen/laravel-varnishable",
     "keywords": [
         "laravel",
-        "laravel-5-package",
+        "laravel-package",
         "varnish",
         "varnish-cache"
     ],
@@ -23,19 +23,19 @@
     "require": {
         "php": "^7.2",
         "guzzlehttp/guzzle": "~6.0",
-        "illuminate/database": "5.8.*|^6.0",
-        "illuminate/support": "5.8.*|^6.0"
+        "illuminate/database": "5.8.*|^6.0|^7.0",
+        "illuminate/support": "5.8.*|^6.0|^7.0"
     },
     "require-dev": {
         "mockery/mockery": "~1.0",
-        "orchestra/database": "~3.8|~4.0",
-        "orchestra/testbench": "~3.8|~4.0",
-        "phpmd/phpmd": "^2.6",
-        "phpstan/phpstan": "^0.11.15",
-        "phpstan/phpstan-deprecation-rules": "^0.11.2",
-        "phpstan/phpstan-strict-rules": "^0.11.1",
-        "phpunit/phpunit": "^7.5|^8.0",
-        "sebastian/phpcpd": "^4.1"
+        "orchestra/database": "~3.8|~4.0|~5.0",
+        "orchestra/testbench": "~3.8|~4.0|~5.0",
+        "phpmd/phpmd": "^2.8",
+        "phpstan/phpstan": "^0.11|^0.12",
+        "phpstan/phpstan-deprecation-rules": "^0.11|^0.12",
+        "phpstan/phpstan-strict-rules": "^0.11|^0.12",
+        "phpunit/phpunit": "^7.5|^8.0|^9.0",
+        "sebastian/phpcpd": "^4.0|^5.0"
     },
     "config": {
         "sort-packages": true

diff --git a/phpstan.neon b/phpstan.neon
@@ -3,7 +3,7 @@ includes:
     - vendor/phpstan/phpstan-deprecation-rules/rules.neon
 
 parameters:
-    level: 7
+    level: 5
     ignoreErrors:
         - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Builder::withTrashed().#'
 
diff --git a/src/Concerns/InvalidateVarnishCache.php b/src/Concerns/InvalidateVarnishCache.php
@@ -16,7 +16,7 @@ trait InvalidateVarnishCache
      *
      * @return void
      */
-    public function flush(string $hostname) :void
+    public function flush(string $hostname): void
     {
         $this->sendBanRequest([
             'X-Ban-Host' => $hostname,
@@ -34,7 +34,7 @@ public function flush(string $hostname) :void
      *
      * @return void
      */
-    public function banByPattern(string $hostname, string $pattern) :void
+    public function banByPattern(string $hostname, string $pattern): void
     {
         $this->sendBanRequest([
             'X-Ban-Host'  => $hostname,
@@ -53,7 +53,7 @@ public function banByPattern(string $hostname, string $pattern) :void
      *
      * @return void
      */
-    public function banByPatterns(string $hostname, array $patterns) :void
+    public function banByPatterns(string $hostname, array $patterns): void
     {
         foreach ($patterns as $pattern) {
             $this->banByPattern($hostname, $pattern);
@@ -71,7 +71,7 @@ public function banByPatterns(string $hostname, array $patterns) :void
      *
      * @return void
      */
-    public function banByUrl(string $hostname, string $url) :void
+    public function banByUrl(string $hostname, string $url): void
     {
         $this->sendBanRequest([
             'X-Ban-Host' => $hostname,
@@ -90,7 +90,7 @@ public function banByUrl(string $hostname, string $url) :void
      *
      * @return void
      */
-    public function banByUrls(string $hostname, array $urls) :void
+    public function banByUrls(string $hostname, array $urls): void
     {
         foreach ($urls as $url) {
             $this->banByUrl($hostname, $url);
@@ -105,7 +105,7 @@ public function banByUrls(string $hostname, array $urls) :void
      *
      * @return string
      */
-    protected function getVarnishUrl(string $varnishHost) :string
+    protected function getVarnishUrl(string $varnishHost): string
     {
         return 'http://'.$varnishHost.':'.$this->getConfig('varnish_port').'/';
     }
@@ -120,7 +120,7 @@ protected function getVarnishUrl(string $varnishHost) :string
      *
      * @return void
      */
-    protected function sendBanRequest(array $headers, string $method = 'BAN') :void
+    protected function sendBanRequest(array $headers, string $method = 'BAN'): void
     {
         $guzzle = $this->getGuzzle();
 
@@ -145,5 +145,5 @@ abstract public function getConfig($key);
      *
      * @return \GuzzleHttp\Client
      */
-    abstract public function getGuzzle() :Client;
+    abstract public function getGuzzle(): Client;
 }
diff --git a/src/Concerns/ManageEtagHeader.php b/src/Concerns/ManageEtagHeader.php
@@ -13,7 +13,7 @@ trait ManageEtagHeader
      *
      * @return void
      */
-    protected function addEtagHeader(Response $response) :void
+    protected function addEtagHeader(Response $response): void
     {
         $useEtag = (bool) $this->getConfig('use_etag');
         $content = $response->getContent();
@@ -28,7 +28,7 @@ protected function addEtagHeader(Response $response) :void
      *
      * @return void
      */
-    public function disableEtag() :void
+    public function disableEtag(): void
     {
         $this->setConfig('use_etag', false);
     }
@@ -38,7 +38,7 @@ public function disableEtag() :void
      *
      * @return void
      */
-    public function enableEtag() :void
+    public function enableEtag(): void
     {
         $this->setConfig('use_etag', true);
     }
@@ -60,5 +60,5 @@ abstract public function getConfig($key);
      *
      * @return void
      */
-    abstract public function setConfig($key, $value) :void;
+    abstract public function setConfig($key, $value): void;
 }
diff --git a/src/Concerns/ManageLastModifiedHeader.php b/src/Concerns/ManageLastModifiedHeader.php
@@ -22,7 +22,7 @@ trait ManageLastModifiedHeader
      *
      * @return void
      */
-    protected function addLastModifiedHeader(Response $response) :void
+    protected function addLastModifiedHeader(Response $response): void
     {
         $lastModified = $this->getLastModifiedHeader();
 
@@ -36,7 +36,7 @@ protected function addLastModifiedHeader(Response $response) :void
      *
      * @return void
      */
-    public function disableLastModified() :void
+    public function disableLastModified(): void
     {
         $this->setConfig('use_last_modified', false);
     }
@@ -46,7 +46,7 @@ public function disableLastModified() :void
      *
      * @return void
      */
-    public function enableLastModified() :void
+    public function enableLastModified(): void
     {
         $this->setConfig('use_last_modified', true);
     }
@@ -56,7 +56,7 @@ public function enableLastModified() :void
      *
      * @return \Carbon\Carbon|null
      */
-    public function getLastModifiedHeader() :?Carbon
+    public function getLastModifiedHeader(): ?Carbon
     {
         return $this->lastModified;
     }
@@ -70,7 +70,7 @@ public function getLastModifiedHeader() :?Carbon
      *
      * @return void
      */
-    public function setLastModifiedHeader($current) :void
+    public function setLastModifiedHeader($current): void
     {
         if (!($current instanceof Carbon)) {
             $current = new Carbon($current);
@@ -98,5 +98,5 @@ abstract public function getConfig($key);
      *
      * @return void
      */
-    abstract public function setConfig($key, $value) :void;
+    abstract public function setConfig($key, $value): void;
 }
diff --git a/src/Concerns/ManipulateHttpResponse.php b/src/Concerns/ManipulateHttpResponse.php
@@ -22,7 +22,7 @@ trait ManipulateHttpResponse
      *
      * @return void
      */
-    protected function acknowledgeEsiSupport(Response $response) :void
+    protected function acknowledgeEsiSupport(Response $response): void
     {
         $esiHeader = $this->requestHeaders->get($this->getConfig('esi_capability_header'));
 
@@ -39,7 +39,7 @@ protected function acknowledgeEsiSupport(Response $response) :void
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    protected function addCacheableHeader(Response $response) :Response
+    protected function addCacheableHeader(Response $response): Response
     {
         $duration = $this->getCacheDuration();
 
@@ -57,7 +57,7 @@ protected function addCacheableHeader(Response $response) :Response
      *
      * @return void
      */
-    public function addUncacheableHeader(Response $response) :void
+    public function addUncacheableHeader(Response $response): void
     {
         $response->headers->set($this->getConfig('uncacheable_header'), '1');
     }
@@ -80,7 +80,7 @@ protected function getCacheDuration()
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function manipulate(Response $response) :Response
+    public function manipulate(Response $response): Response
     {
         $this->acknowledgeEsiSupport($response);
 
@@ -103,7 +103,7 @@ public function manipulate(Response $response) :Response
      *
      * @return void
      */
-    public function setCacheDuration(int $duration) :void
+    public function setCacheDuration(int $duration): void
     {
         $this->setConfig('cache_duration', $duration);
     }
@@ -115,7 +115,7 @@ public function setCacheDuration(int $duration) :void
      *
      * @return void
      */
-    public function setRequestHeaders(HeaderBag $headers) :void
+    public function setRequestHeaders(HeaderBag $headers): void
     {
         $this->requestHeaders = $headers;
     }
@@ -127,7 +127,7 @@ public function setRequestHeaders(HeaderBag $headers) :void
      *
      * @return bool
      */
-    protected function shouldNotCache(Response $response) :bool
+    protected function shouldNotCache(Response $response): bool
     {
         $headers = (array) $response->headers->get($this->getConfig('uncacheable_header'));
 
@@ -141,7 +141,7 @@ protected function shouldNotCache(Response $response) :bool
      *
      * @return void
      */
-    abstract protected function addEtagHeader(Response $response) :void;
+    abstract protected function addEtagHeader(Response $response): void;
 
     /**
      * Add Last-Modified header to the current response.
@@ -150,7 +150,7 @@ abstract protected function addEtagHeader(Response $response) :void;
      *
      * @return void
      */
-    abstract protected function addLastModifiedHeader(Response $response) :void;
+    abstract protected function addLastModifiedHeader(Response $response): void;
 
     /**
      * Get configuration value for a specific key.
@@ -169,5 +169,5 @@ abstract public function getConfig($key);
      *
      * @return void
      */
-    abstract public function setConfig($key, $value) :void;
+    abstract public function setConfig($key, $value): void;
 }
diff --git a/src/Events/ModelHasUpdated.php b/src/Events/ModelHasUpdated.php
@@ -50,7 +50,7 @@ public function __construct(Model $model)
      *
      * @return \Illuminate\Database\Eloquent\Model
      */
-    protected function createDirtyModel() :Model
+    protected function createDirtyModel(): Model
     {
         $this->model = app($this->modelClass);
         $this->model->fill($this->data);
@@ -69,7 +69,7 @@ protected function createDirtyModel() :Model
      *
      * @return \Illuminate\Database\Eloquent\Builder
      */
-    protected function getQuery(Model $model) :Builder
+    protected function getQuery(Model $model): Builder
     {
         $query = $model->newQuery();
 
@@ -87,7 +87,7 @@ protected function getQuery(Model $model) :Builder
      *
      * @return \Illuminate\Database\Eloquent\Model
      */
-    public function model() :Model
+    public function model(): Model
     {
         return $this->retrieveModel() ?? $this->createDirtyModel();
     }
@@ -98,7 +98,7 @@ public function model() :Model
      *
      * @return \Illuminate\Database\Eloquent\Model|null
      */
-    protected function retrieveModel() :?Model
+    protected function retrieveModel(): ?Model
     {
         if ($this->model !== null) {
             return $this->model;

diff --git a/src/Facade.php b/src/Facade.php
@@ -11,7 +11,7 @@ class Facade extends BaseFacade
      *
      * @return string
      */
-    protected static function getFacadeAccessor() :string
+    protected static function getFacadeAccessor(): string
     {
         return VarnishableService::class;
     }

diff --git a/src/Model/Concerns/Varnishable.php b/src/Model/Concerns/Varnishable.php
@@ -12,7 +12,7 @@ trait Varnishable
      *
      * @return void
      */
-    public static function bootVarnishable() :void
+    public static function bootVarnishable(): void
     {
         static::observe(app(VarnishableObserver::class));
     }
@@ -22,7 +22,7 @@ public static function bootVarnishable() :void
      *
      * @return void
      */
-    public function __wakeup() :void
+    public function __wakeup(): void
     {
         parent::__wakeup();