Merge pull request #9 from cashlink/php-8

PHP 8 compatibility, update PHPUnit
cashlink · Aug 22, 2022 · 81ad350 · 81ad350
2 parents dabd9a9 + 3379d25
commit 81ad350
Show file tree

Hide file tree

Showing 169 changed files with 224 additions and 248 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
 
     steps:
 

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 nbproject
 .settings
 .buildpath
+.phpunit.result.cache
 .project
 .idea
 vendor

diff --git a/classes/dataBackend/file/download/Downloader.php b/classes/dataBackend/file/download/Downloader.php
@@ -25,7 +25,7 @@ class Downloader
     public function __construct()
     {
         $this->handle = curl_init();
-        if (! is_resource($this->handle)) {
+        if ($this->handle === false) {
             throw new DownloaderException("Failed initializing curl");
 
         }
@@ -36,8 +36,8 @@ public function __construct()
     /**
      * Execute the curl call.
      *
+     * @return bool|string
      * @throws DownloaderException
-     * @return mixed
      */
     private function download($uri)
     {
@@ -62,7 +62,7 @@ private function download($uri)
      *
      * @param string $uri URI
      * @return string Content of the page
-     * @throws DownloaderException
+     * @throws DownloaderException|DataBackendIOException
      */
     public function downloadContent($uri)
     {
@@ -81,7 +81,7 @@ public function downloadContent($uri)
      *
      * @param string $uri URI
      * @return string local path to downloaded file.
-     * @throws DownloaderException
+     * @throws DownloaderException|NoTempDirectoryException
      */
     public function downloadFile($uri)
     {
@@ -90,15 +90,13 @@ public function downloadFile($uri)
         $fp   = fopen($file, 'w');
         if (! ($file && $fp)) {
             throw new DownloaderException("Failed opening a temporary file");
-
         }
         curl_setopt($this->handle, CURLOPT_FILE, $fp);
 
         if (! $this->download($uri)) {
             fclose($fp);
             unlink($file);
             throw new DownloaderException(curl_error($this->handle), curl_errno($this->handle));
-
         }
         return $file;
     }

diff --git a/composer.json b/composer.json
@@ -3,33 +3,39 @@
     "type": "library",
     "description": "BAV provides validation for German Bank Accounts (Konto)",
     "keywords": ["bank", "account", "bankaccount", "validation", "check", "konto"],
-    "homepage": "http://bav.malkusch.de/",
+    "homepage": "https://github.com/cashlink/bav",
     "license": "WTFPL",
     "authors": [
         {
             "name": "Markus Malkusch",
             "email": "[email protected]",
-            "homepage": "http://markus.malkusch.de",
             "role": "Developer"
+        },
+        {
+            "name": "Clemens Weiß",
+            "email": "[email protected]",
+            "role": "Maintainer"
         }
     ],
     "autoload": {
         "files": ["autoloader/autoloader.php"]
     },
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.3",
         "cashlink/php-index": "~1.0.0"
     },
     "suggest": {
         "ext-PDO": "Allows storing bank information in a database",
         "ext-mbstring": "Enables UTF-8 support",
         "ext-dom": "Enables picking the download URI by xpath",
-        "lib-curl": "Enables API for downloading the bank file",
+        "ext-curl": "Enables API for downloading the bank file",
         "doctrine/orm": "Support for Doctrine ORM data backend"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7",
-        "doctrine/orm": "^2"
+        "phpunit/phpunit": "~9.5",
+        "doctrine/orm": "^2",
+        "doctrine/dbal": "^2",
+        "symfony/cache": "^4.4 || ^5.4 || ^6.0"
     },
     "archive": {
         "exclude": [

diff --git a/tests/integration/AgencyQueryTest.php b/tests/integration/AgencyQueryTest.php
@@ -4,8 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__ . "/../bootstrap.php";
-
 /**
  * Test SQLDataBackend::getAgencies($sql)
  *
@@ -66,18 +64,18 @@ public function testNoBank(SQLDataBackend $backend)
 
     /**
      * @dataProvider provideBackends
-     * @expectedException malkusch\bav\MissingAttributesDataBackendIOException
      */
     public function testNoID(SQLDataBackend $backend)
     {
+        $this->expectException(MissingAttributesDataBackendIOException::class);
         $result = $backend->getAgencies(
             'SELECT name, postcode, city, shortTerm, pan, bic, bank FROM bav_agency LIMIT 1'
         );
     }
 
     private function assertAgencies(Array $agencies, $count)
     {
-        $this->assertEquals($count, count($agencies));
+        $this->assertCount($count, $agencies);
 
         foreach ($agencies as $agency) {
             if ($agency->isMainAgency()) {

diff --git a/tests/integration/BackendTest.php b/tests/integration/BackendTest.php
@@ -2,7 +2,7 @@
 
 namespace malkusch\bav;
 
-require_once __DIR__ . "/../bootstrap.php";
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests the Backends.
@@ -11,7 +11,7 @@
  * @license WTFPL
  * @author Markus Malkusch <[email protected]>
  */
-class BackendTest extends \PHPUnit_Framework_TestCase
+class BackendTest extends TestCase
 {
 
     /**

diff --git a/tests/integration/CrossProjectTest.php b/tests/integration/CrossProjectTest.php
@@ -2,7 +2,7 @@
 
 namespace malkusch\bav;
 
-require_once __DIR__ . "/../bootstrap.php";
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests the values between different projects.
@@ -18,7 +18,7 @@
  * @license WTFPL
  * @large
  */
-class CrossProjectTest extends \PHPUnit_Framework_TestCase
+class CrossProjectTest extends TestCase
 {
 
     /**

diff --git a/tests/integration/DataConstraintTest.php b/tests/integration/DataConstraintTest.php
@@ -3,8 +3,7 @@
 namespace malkusch\bav;
 
 use PHPUnit\Framework\TestCase;
-
-require_once __DIR__ . "/../bootstrap.php";
+use RuntimeException;
 
 /**
  * Test if the banklist.txt fits into the model.
@@ -17,7 +16,7 @@ class DataConstraintTest extends TestCase
      */
     private static $pdo;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         // FIXME: this very MySQL specific
         return;
@@ -87,7 +86,7 @@ public static function setUpBeforeClass()
     }
 
     /**
-     * @return Array
+     * @return array
      */
     public function provideParsedLines()
     {
@@ -110,8 +109,8 @@ public function provideParsedLines()
      */
     public function testParser($blz, $type)
     {
-        $this->assertRegExp('~^\d{8}$~', $blz);
-        $this->assertRegExp('~^[\dA-Z]\d$~', $type);
+        $this->assertMatchesRegularExpression('~^\d{8}$~', $blz);
+        $this->assertMatchesRegularExpression('~^[\dA-Z]\d$~', $type);
     }
 
     /**

diff --git a/tests/integration/StatementContainerTest.php b/tests/integration/StatementContainerTest.php
@@ -4,8 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__ . "/../bootstrap.php";
-
 /**
  * Tests StatementContainer.
  *
@@ -21,7 +19,7 @@ class StatementContainerTest extends TestCase
      */
     private $statementContainer;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->statementContainer = new StatementContainer(PDOFactory::makePDO());
     }

diff --git a/tests/unit/00UpdatePlanTest.php b/tests/unit/00UpdatePlanTest.php
@@ -4,8 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__ . "/../bootstrap.php";
-
 /**
  * Tests UpdatePlan
  *
@@ -66,33 +64,31 @@ public function testIsOutdated($mtime, $time, $expectedIsOutdated)
         TimeMock::disable();
     }
 
-    /**
-     * @expectedException \PHPUnit_Framework_Error_Warning
-     */
     public function testLogUpdatePlan()
     {
+        $this->expectWarning();
         $updatePlan = new LogUpdatePlan();
         $updatePlan->perform(new FileDataBackend());
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_Error_Notice
      * @medium
      */
     public function testAutomaticUpdatePlanNotice()
     {
+        $this->expectNotice();
         $fileUtil = new FileUtil();
         $file = tempnam($fileUtil->getTempDirectory(), 'bavtest');
         $updatePlan = new AutomaticUpdatePlan();
         $updatePlan->perform(new FileDataBackend($file));
     }
 
     /**
-     * @expectedException \PHPUnit_Framework_Error_Notice
      * @medium
      */
     public function testAutomaticUpdatePlan()
     {
+        $this->expectNotice();
         $fileUtil = new FileUtil();
         $file = tempnam($fileUtil->getTempDirectory(), 'bavtest');
         touch($file, strtotime("-1 year"));

diff --git a/tests/unit/BAVFacadeTest.php b/tests/unit/BAVFacadeTest.php
@@ -4,8 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__ . "/../bootstrap.php";
-
 /**
  * Tests the facade BAV.
  *
@@ -31,23 +29,23 @@ public function testGetBank()
     /**
      * Tests BAV::getBank();
      *
-     * @expectedException malkusch\bav\BankNotFoundException
      * @see BAV::getBank();
      */
     public function testFailGetBank()
     {
+        $this->expectException(BankNotFoundException::class);
         $bav = new BAV();
         $bav->getBank("12345678");
     }
 
     /**
      * Tests BAV::getAgencies();
      *
-     * @expectedException malkusch\bav\BankNotFoundException
      * @see BAV::getAgencies();
      */
     public function testFailGetAgencies()
     {
+        $this->expectException(BankNotFoundException::class);
         $bav = new BAV();
         $bav->getAgencies("12345678");
     }
@@ -95,11 +93,11 @@ public function testGetMainAgency()
     /**
      * Tests BAV::getMainAgency();
      *
-     * @expectedException malkusch\bav\BankNotFoundException
      * @see BAV::getMainAgency();
      */
     public function testFailGetMainAgency()
     {
+        $this->expectException(BankNotFoundException::class);
         $bav = new BAV();
         $bav->getMainAgency("12345678");
     }

diff --git a/tests/unit/BICUtilTest.php b/tests/unit/BICUtilTest.php
@@ -4,8 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__ . "/../bootstrap.php";
-
 /**
  * Tests BICUtil.
  *

diff --git a/tests/unit/BackendContainerTest.php b/tests/unit/BackendContainerTest.php
@@ -4,8 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__ . "/../bootstrap.php";
-
 /**
  * Tests DataBackendContainer
  *

diff --git a/tests/unit/ConfigurationLocatorTest.php b/tests/unit/ConfigurationLocatorTest.php
@@ -4,8 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 
-require_once __DIR__ . "/../bootstrap.php";
-
 /**
  * Tests ConfigurationLocator
  *
@@ -31,10 +29,10 @@ public function testlocateReturnsNull()
      * locate() should throw an exception
      *
      * @see ConfigurationLocator::locate();
-     * @expectedException malkusch\bav\ConfigurationException
      */
     public function testlocateThrowsException()
     {
+        $this->expectException(ConfigurationException::class);
         $locator = new ConfigurationLocator(array(
             __DIR__ . "/../data/no_configuration.php"
         ));
@@ -84,15 +82,16 @@ public function provideTestLocateFindsAbsolutePath()
      */
     public function testLocateFindsIncludePath($includePath, array $paths)
     {
-        set_include_path(get_include_path() . PATH_SEPARATOR . $includePath);
+        $oldIncludePath = get_include_path();
+        set_include_path($oldIncludePath . PATH_SEPARATOR . $includePath);
 
         $locator = new ConfigurationLocator($paths);
         $configuration = $locator->locate();
 
         $this->assertInstanceOf("malkusch\bav\Configuration", $configuration);
         $this->assertEquals("test", $configuration->getTempDirectory());
 
-        restore_include_path();
+        set_include_path($oldIncludePath);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ jobs: @@
         strategy:
           matrix:
-            php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4']
+            php-versions: ['7.3', '7.4', '8.0', '8.1']
         steps:
@@ Expand Down @@