correct the check if 28C is null or is zero (#32)

a fix for #31
sandermarechal · Jun 10, 2020 · df28b8d · df28b8d
1 parent 9e06d67
commit df28b8d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -4,11 +4,18 @@
     "description": "An MT940 bank statement parser for PHP",
     "keywords": ["mt940", "parser", "parsing"],
     "license": "MIT",
-    "authors": [{
-        "name": "Sander Marechal",
-        "email": "[email protected]",
-        "homepage": "http://www.jejik.com"
-    }],
+    "authors": [
+        {
+            "name": "Sander Marechal",
+            "email": "[email protected]",
+            "homepage": "http://www.jejik.com"
+        },
+        {
+            "name": "Powercloud GmbH / Dominic Richter",
+            "email": "[email protected]",
+            "homepage": "https://www.powercloud.de"
+        }
+    ],
     "require": {
         "php": ">=7.1.0"
     },

diff --git a/lib/Jejik/MT940/Parser/AbstractParser.php b/lib/Jejik/MT940/Parser/AbstractParser.php
@@ -88,7 +88,8 @@ public function getTransactionReferenceNumber(string $text): string
     public function isBLZAllowed($text): bool
     {
         $this->checkCRLF($text);
-        if ($account = $this->getLine('25', $text)) {
+        $account = $this->getLine('25', $text);
+        if (!is_null($account)) {
             $accountExploded = explode('/', $account);
             if (isset($accountExploded[0]) && in_array($accountExploded[0], $this->getAllowedBLZ())) {
                 return true;
@@ -143,7 +144,7 @@ protected function getLine(
         int $offset = 0,
         int &$position = null,
         int &$length = null
-    ): string {
+    ): ?string {
         $pcre = '/(?:^|\r\n)\:(' . $id . ')\:'   // ":<id>:" at the start of a line
             . '(.+)'                           // Contents of the line
             . '(:?$|\r\n\:[[:alnum:]]{2,3}\:)' // End of the text or next ":<id>:"
@@ -160,8 +161,7 @@ protected function getLine(
             }
         }
 
-
-        return '';
+        return null;
     }
 
     /**
@@ -301,7 +301,8 @@ protected function statementBody(string $text): ?Statement
      */
     protected function statementNumber(string $text): ?string
     {
-        if ($number = $this->getLine('28|28C', $text)) {
+        $number = $this->getLine('28|28C', $text);
+        if (!is_null($number)) {
             return $number;
         }
 

diff --git a/lib/Jejik/MT940/Reader.php b/lib/Jejik/MT940/Reader.php
@@ -490,7 +490,7 @@ public function createClosingBalance(): BalanceInterface
      * @param mixed $interface The interface the class must implement //TODO mixed is a workaround for StdClass
      * @param array $params Parameters to pass to the callable
      *
-     * @return object An object that implements the interface
+     * @return Account|Statement|Balance An object that implements the interface
      */
     protected function createObject($className, $interface, $params = [])
     {