Merge pull request #20 from samsonasik/php8

Add PHP 8 support

Author: samsonasik

.travis.yml

@@ -1,22 +1,35 @@
 language: php
 
 php:
-  - 7.1
-  - 7.2
   - 7.3
   - 7.4
+  - 8.0
+
+env:
+  - XDEBUG_MODE=coverage
 
 before_script:
   - mkdir -p build/logs
   - composer self-update
-  - travis_retry composer install --prefer-source --no-interaction
+  - |
+    if [ $(phpenv version-name) != '8.0' ]; then
+      travis_retry composer install --prefer-source --no-interaction
+    fi
+    if [ $(phpenv version-name) == '8.0' ]; then
+      travis_retry composer install --prefer-source --no-interaction --ignore-platform-req=php
+    fi
   - composer dump-autoload -o
 
 script:
   - composer cs-check
   - bin/phpstan analyse src/ --level=max
-  - bin/kahlan --coverage=4 --reporter=verbose --clover=build/logs/clover.xml
-  - bin/php-coveralls -v --exclude-no-stmt
+  - |
+    if [ $(phpenv version-name) != '8.0' ]; then
+      bin/kahlan --coverage=4 --reporter=verbose --clover=build/logs/clover.xml && bin/php-coveralls -v --exclude-no-stmt
+    fi
+    if [ $(phpenv version-name) == '8.0' ]; then
+      bin/kahlan --reporter=verbose
+    fi
 
 notifications:
     email: false

README.md

@@ -2,7 +2,7 @@ ForceHttpsModule
 ================
 
 [![Latest Version](https://img.shields.io/github/release/samsonasik/ForceHttpsModule.svg?style=flat-square)](https://github.com/samsonasik/ForceHttpsModule/releases)
-[![Build Status](https://travis-ci.org/samsonasik/ForceHttpsModule.svg?branch=master)](https://travis-ci.org/samsonasik/ForceHttpsModule)
+[![Build Status](https://travis-ci.com/samsonasik/ForceHttpsModule.svg?branch=master)](https://travis-ci.org/samsonasik/ForceHttpsModule)
 [![Coverage Status](https://coveralls.io/repos/github/samsonasik/ForceHttpsModule/badge.svg?branch=master)](https://coveralls.io/github/samsonasik/ForceHttpsModule?branch=master)
 [![PHPStan](https://img.shields.io/badge/PHPStan-enabled-brightgreen.svg?style=flat)](https://github.com/phpstan/phpstan)
 [![Downloads](https://poser.pugx.org/samsonasik/force-https-module/downloads)](https://packagist.org/packages/samsonasik/force-https-module)

composer.json

@@ -24,19 +24,18 @@
         }
     ],
     "require": {
-        "php": "^7.1",
-        "webmozart/assert": "^1.4",
-        "laminas/laminas-console": "^2.5"
+        "php": "^7.3|~8.0",
+        "webmozart/assert": "^1.9"
     },
     "conflict": {
         "mezzio/mezzio": "<3.0",
         "laminas/laminas-mvc": "<3.0"
     },
     "require-dev": {
-        "kahlan/kahlan": "^4.0",
+        "kahlan/kahlan": "^5.0",
         "php-coveralls/php-coveralls": "^2.1",
-        "phpstan/phpstan": "^0.10.8",
-        "phpstan/phpstan-webmozart-assert": "^0.10.0",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-webmozart-assert": "^0.12",
         "laminas/laminas-coding-standard": "^2.0",
         "mezzio/mezzio": "^3.0",
         "laminas/laminas-mvc": "^3.0"

phpstan.neon

@@ -1,3 +1,6 @@
 includes:
 	- vendor/phpstan/phpstan-webmozart-assert/extension.neon
 
+parameters:
+	checkMissingIterableValueType: false
+

spec/Listener/ForceHttpsSpec.php

@@ -24,7 +24,7 @@
 
         it('not attach on route on console', function () {
 
-            Console::overrideIsConsole(true);
+            allow(ForceHttps::class)->toReceive('isInConsole')->andReturn(true);
             $listener = new ForceHttps([
                 'enable'                => true,
                 'force_all_routes'      => true,
@@ -40,7 +40,7 @@
 
         it('not attach when not enabled', function () {
 
-            Console::overrideIsConsole(false);
+            allow(ForceHttps::class)->toReceive('isInConsole')->andReturn(false);
             $listener = new ForceHttps([
                 'enable'                => false,
                 'force_all_routes'      => true,
@@ -56,7 +56,7 @@
 
         it('attach on route event on non-console and enable', function () {
 
-            Console::overrideIsConsole(false);
+            allow(ForceHttps::class)->toReceive('isInConsole')->andReturn(false);
             $listener = new ForceHttps([
                 'enable'                => true,
                 'force_all_routes'      => true,

src/Listener/ForceHttps.php

@@ -5,16 +5,18 @@
 namespace ForceHttpsModule\Listener;
 
 use ForceHttpsModule\HttpsTrait;
-use Laminas\Console\Console;
 use Laminas\EventManager\AbstractListenerAggregate;
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\Http\PhpEnvironment\Request;
 use Laminas\Http\PhpEnvironment\Response;
 use Laminas\Mvc\MvcEvent;
 use Laminas\Router\RouteMatch;
 
+use function defined;
 use function sprintf;
 
+use const PHP_SAPI;
+
 class ForceHttps extends AbstractListenerAggregate
 {
     use HttpsTrait;
@@ -32,7 +34,7 @@ public function __construct(array $config)
      */
     public function attach(EventManagerInterface $events, $priority = 1): void
     {
-        if (Console::isConsole() || ! $this->config['enable']) {
+        if ($this->isInConsole() || ! $this->config['enable']) {
             return;
         }
 
@@ -105,4 +107,12 @@ public function forceHttpsScheme(MvcEvent $e): void
 
         exit(0);
     }
+
+    /**
+     * Check if currently running in console
+     */
+    private function isInConsole(): bool
+    {
+        return PHP_SAPI === 'cli' || defined('STDIN');
+    }
 }