Merge pull request #103 from auraphp/making80compat

Making compatible with PHP 7.4 and 8.0.

.github/workflows/continuous-integration.yml

@@ -0,0 +1,87 @@
+on:
+  pull_request:
+  push:
+    branches:
+      - '**'
+
+name: "Continuous Integration"
+
+jobs:
+  unit-tests:
+    name: "Unit Tests"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          - "8.0"
+          - "8.1"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP with extensions"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          ini-values: "memory_limit=-1"
+          php-version: "${{ matrix.php-version }}"
+
+      - name: "Determine composer cache directory"
+        id: "determine-composer-cache-directory"
+        run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+
+      - name: "Cache dependencies installed with composer"
+        uses: "actions/cache@v1"
+        with:
+          path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
+          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-"
+
+      - name: "Install dependencies with composer"
+        run: "composer install --no-interaction --no-progress --no-suggest"
+
+      - name: "Run tests with phpunit/phpunit"
+        run: "vendor/bin/phpunit"
+
+  psalm-tests:
+    name: "Psalm Tests"
+    runs-on: "ubuntu-latest"
+
+    strategy:
+      matrix:
+        php-version:
+          - "8.1"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+
+      - name: "Install PHP with extensions"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          ini-values: "memory_limit=-1"
+          php-version: "${{ matrix.php-version }}"
+
+      - name: "Determine composer cache directory"
+        id: "determine-composer-cache-directory"
+        run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
+
+      - name: "Cache dependencies installed with composer"
+        uses: "actions/cache@v1"
+        with:
+          path: "${{ steps.determine-composer-cache-directory.outputs.directory }}"
+          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-"
+
+      - name: "Install dependencies with composer"
+        run: "composer install --no-interaction --no-progress --no-suggest"
+
+      - name: "Run tests with Psalm"
+        run: "vendor/bin/psalm"
+

.gitignore

@@ -1,2 +1,4 @@
 /vendor
 /composer.lock
+.phpunit.result.cache
+phpunit.xml

composer.json

@@ -33,11 +33,11 @@
         }
     },
 
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require-dev": {
         "acclimate/container": "^2",
-        "aura/di": "~4.0",
-        "phpunit/phpunit": "~7"
+        "phpunit/phpunit": "~8",
+        "vimeo/psalm": "~v4.15"
     },
     "autoload-dev": {
         "psr-4": {

psalm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/Verifier/PasswordVerifier.php

@@ -53,7 +53,7 @@ public function __construct($algo)
      */
     public function verify($plaintext, $hashvalue, array $extra = array())
     {
-        if (is_string($this->algo)) {
+        if (is_string($this->algo) && $this->algo !== PASSWORD_BCRYPT) {
             return hash($this->algo, $plaintext) === $hashvalue;
         } else {
             return password_verify($plaintext, $hashvalue);

tests/Adapter/HtpasswdAdapterTest.php

@@ -7,7 +7,7 @@ class HtpasswdAdapterTest extends \PHPUnit\Framework\TestCase
 {
     protected $adapter;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $file = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'fake.htpasswd';
         $this->setAdapter($file);

tests/Adapter/ImapAdapterTest.php

@@ -9,7 +9,7 @@ class ImapAdapterTest extends \PHPUnit\Framework\TestCase
 
     protected $adapter;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->phpfunc = $this->getMockBuilder('Aura\Auth\Phpfunc')
              ->setMethods(array(

tests/Adapter/LdapAdapterTest.php

@@ -9,7 +9,7 @@ class LdapAdapterTest extends \PHPUnit\Framework\TestCase
 
     protected $phpfunc;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->phpfunc = $this->getMockBuilder('Aura\Auth\Phpfunc')
              ->setMethods(array(

tests/Adapter/NullAdapterTest.php

@@ -5,7 +5,7 @@ class NullAdapterTest extends \PHPUnit\Framework\TestCase
 {
     protected $adapter;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->adapter = new NullAdapter;
     }

tests/Adapter/PdoAdapterTest.php

@@ -10,7 +10,7 @@ class PdoAdapterTest extends \PHPUnit\Framework\TestCase
 
     protected $pdo;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         if (false === extension_loaded('pdo_sqlite')) {
             $this->markTestSkipped("Cannot test this adapter with pdo_sqlite extension disabled.");

tests/AuthFactoryTest.php

@@ -10,7 +10,7 @@ class AuthFactoryTest extends \PHPUnit\Framework\TestCase
 {
     protected $factory;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->factory = new AuthFactory($_COOKIE);
     }

tests/AuthTest.php

@@ -10,7 +10,7 @@ class AuthTest extends \PHPUnit\Framework\TestCase
 
     protected $segment;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->segment = new FakeSegment;
         $this->auth = new Auth($this->segment);

tests/PhpfuncTest.php

@@ -5,7 +5,7 @@ class PhpfuncTest extends \PHPUnit\Framework\TestCase
 {
     protected $phpfunc;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->phpfunc = new Phpfunc;
     }

tests/Service/LoginServiceTest.php

@@ -20,7 +20,7 @@ class LoginServiceTest extends \PHPUnit\Framework\TestCase
 
     protected $login_service;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->segment = new FakeSegment;
         $this->session = new FakeSession;

tests/Service/LogoutServiceTest.php

@@ -22,7 +22,7 @@ class LogoutServiceTest extends \PHPUnit\Framework\TestCase
 
     protected $logout_service;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->segment = new FakeSegment;
         $this->session = new FakeSession;

tests/Service/ResumeServiceTest.php

@@ -26,7 +26,7 @@ class ResumeServiceTest extends \PHPUnit\Framework\TestCase
 
     protected $resume_service;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->segment = new FakeSegment;
         $this->session = new FakeSession;

tests/Session/NullSegmentTest.php

@@ -5,7 +5,7 @@ class NullSegmentTest extends \PHPUnit\Framework\TestCase
 {
     protected $segment;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->segment = new NullSegment;
     }

tests/Session/NullSessionTest.php

@@ -5,7 +5,7 @@ class NullSessionTest extends \PHPUnit\Framework\TestCase
 {
     protected $session;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->session = new NullSession;
     }

tests/Session/SegmentTest.php

@@ -5,7 +5,7 @@ class SegmentTest extends \PHPUnit\Framework\TestCase
 {
     protected $segment;
 
-    public function setUp()
+    public function setUp() : void
     {
         $this->segment = new Segment(__CLASS__);
     }

tests/Session/SessionTest.php

@@ -6,7 +6,7 @@
  */
 class SessionTest extends \PHPUnit\Framework\TestCase
 {
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->setSession();
     }

tests/Session/TimerTest.php

@@ -7,7 +7,7 @@ class TimerTest extends \PHPUnit\Framework\TestCase
 {
     protected $timer;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->timer = new Timer(3600, 86400);
     }

tests/Verifier/HtpasswdVerifierTest.php

@@ -3,7 +3,7 @@
 
 class HtpasswdVerifierTest extends \PHPUnit\Framework\TestCase
 {
-    public function setUp()
+    public function setUp() : void
     {
         $this->verifier = new HtpasswdVerifier;
     }