added some returntypes, and fixes for php 7.4 and higher (#49)

sandermarechal · Feb 6, 2023 · 482bccc · 482bccc
1 parent fba9605
commit 482bccc
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 102 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -7,8 +7,8 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: ['ubuntu-18.04']
-        php-versions: ['7.2', '7.3', '7.4', '8.0']
+        operating-system: ['ubuntu-22.04']
+        php-versions: ['7.4', '8.0']
 
     steps:
       - uses: actions/checkout@v1

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
         {
             "name": "Sander Marechal",
             "email": "[email protected]",
-            "homepage": "http://www.jejik.com"
+            "homepage": "https://www.jejik.com"
         },
         {
             "name": "powercloud GmbH / Dominic Richter",
@@ -17,10 +17,10 @@
         }
     ],
     "require": {
-        "php": ">=7.2.0||^8.0"
+        "php": ">=7.4.0||^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8",
+        "phpunit/phpunit": "^9",
         "squizlabs/php_codesniffer": "3.*"
     },
     "autoload": {

diff --git a/lib/Jejik/MT940/Parser/AbstractParser.php b/lib/Jejik/MT940/Parser/AbstractParser.php
@@ -244,7 +244,7 @@ protected function splitTransactions(string $text): array
      *
      * @throws \Exception
      */
-    protected function statement(string $text): ?Statement
+    protected function statement(string $text): ?StatementInterface
     {
         $text = trim($text);
         if (($pos = strpos($text, ':20:')) === false) {
@@ -272,7 +272,7 @@ protected function statementHeader(string $text): void
      *
      * @throws \Exception
      */
-    protected function statementBody(string $text): ?Statement
+    protected function statementBody(string $text): ?StatementInterface
     {
         $accountNumber = $this->accountNumber($text);
         $accountCurrency = $this->accountCurrency($text);
@@ -351,10 +351,7 @@ protected function accountCurrency($text): ?string
             if ($line60F = $this->getLine('60F', $text)) {
                 $pcreCurrency = '/(C|D)(\d{6})([A-Z]{3})([0-9,]{1,15})/';
                 preg_match($pcreCurrency, $text, $match);
-                if (isset($match[3])) {
-                    return $match[3];
-                }
-                return null;
+                return $match[3] ?? null;
             }
         }
         return $currency;
@@ -468,7 +465,7 @@ protected function transaction(array $lines): TransactionInterface
             $bookDate = $bookDateCollection[min(array_keys($bookDateCollection))];
         }
 
-        $description = isset($lines[1]) ? $lines[1] : null;
+        $description = $lines[1] ?? null;
         $transaction = $this->reader->createTransaction();
         $transaction
             ->setAmount($amount)
@@ -691,47 +688,47 @@ protected function svwz(array $lines): ?string
     {
         return null;
     }
-    
+
     /**
      * Parse purp for provided transaction lines
      */
     protected function purp(array $lines): ?string
     {
         return null;
     }
-    
+
     /**
      * Parse debt for provided transaction lines
      */
     protected function debt(array $lines): ?string
     {
         return null;
     }
-    
+
     /**
      * Parse coam for provided transaction lines
      */
     protected function coam(array $lines): ?string
     {
         return null;
     }
-    
+
     /**
      * Parse oamt for provided transaction lines
      */
     protected function oamt(array $lines): ?string
     {
         return null;
     }
-    
+
     /**
      * Parse abwa for provided transaction lines
      */
     protected function abwa(array $lines): ?string
     {
         return null;
     }
-    
+
     /**
      * Parse abwe for provided transaction lines
      */