Merge pull request #16 from fruitl00p/version_bump

Version bump
fruitl00p · Jul 20, 2015 · aa1ac13 · aa1ac13
2 parents 940f922 + b61e91f
commit aa1ac13
Show file tree

Hide file tree

Showing 19 changed files with 121 additions and 114 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ cache:
     - $HOME/.composer/cache
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
 	{ "name": "Robin Speekenbrink", "email": "[email protected]" }
   ],
   "require": {
-	"php": ">=5.4"
+	"php": ">=5.5"
   },
   "require-dev": {
 	"phpunit/phpunit": "4.4.*",

diff --git a/src/Banking/Statement.php b/src/Banking/Statement.php
@@ -12,7 +12,7 @@ class Statement implements \JsonSerializable
 {
     private $bank = '';
     private $account = '';
-    private $transactions = array();
+    private $transactions = [];
     private $startPrice = 0.0;
     private $endPrice = 0.0;
     private $timestamp = 0;

diff --git a/src/Parser/Banking.php b/src/Parser/Banking.php
@@ -18,6 +18,6 @@ class Banking
      */
     public function parse($string)
     {
-        return array();
+        return [];
     }
 }
diff --git a/src/Parser/Banking/Mt940.php b/src/Parser/Banking/Mt940.php
@@ -20,20 +20,27 @@ class Mt940 extends Banking
      * Parse the given string into an array of Banking\Statement objects
      *
      * @param string $string
+     * @param Banking\Mt940\Engine $engine
      *
      * @return \Kingsquare\Banking\Statement[]
      */
-    public function parse($string)
+    public function parse($string, Banking\Mt940\Engine $engine = null)
     {
         if (!empty($string)) {
             // load engine
-            $this->engine = Banking\Mt940\Engine::__getInstance($string);
+            if ($engine === null) {
+                $engine = Banking\Mt940\Engine::__getInstance($string);
+            }
+
+            $this->engine = $engine;
+
             if ($this->engine instanceof Banking\Mt940\Engine) {
                 // parse using the engine
+                $this->engine->loadString($string);
                 return $this->engine->parse();
             }
         }
 
-        return array();
+        return [];
     }
 }
diff --git a/src/Parser/Banking/Mt940/Engine.php b/src/Parser/Banking/Mt940/Engine.php
@@ -89,7 +89,7 @@ public function loadString($string)
      */
     public function parse()
     {
-        $results = array();
+        $results = [];
         foreach ($this->parseStatementData() as $this->currentStatementData) {
             $statement = new Statement();
             if ($this->debug) {
@@ -145,10 +145,10 @@ protected function parseStatementData()
      */
     protected function parseTransactionData()
     {
-        $results = array();
+        $results = [];
         preg_match_all('/^:61:(.*?)(?=^:61:|^-X{,3}$|\Z)/sm', $this->getCurrentStatementData(), $results);
 
-        return ((!empty($results[0])) ? $results[0] : array());
+        return ((!empty($results[0])) ? $results[0] : []);
     }
 
     /**
@@ -195,7 +195,7 @@ protected function parseStatementBank()
      */
     protected function parseStatementAccount()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:25:([\d\.]+)*/', $this->getCurrentStatementData(), $results)
                 && !empty($results[1])
         ) {
@@ -218,7 +218,7 @@ protected function parseStatementAccount()
      */
     protected function parseStatementStartPrice()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:60F:.*EUR([\d,\.]+)*/', $this->getCurrentStatementData(), $results)
                 && !empty($results[1])
         ) {
@@ -234,7 +234,7 @@ protected function parseStatementStartPrice()
      */
     protected function parseStatementEndPrice()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:62F:.*EUR([\d,\.]+)*/', $this->getCurrentStatementData(), $results)
                 && !empty($results[1])
         ) {
@@ -250,7 +250,7 @@ protected function parseStatementEndPrice()
      */
     protected function parseStatementTimestamp()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:60F:[C|D](\d{6})*/', $this->getCurrentStatementData(), $results)
                 && !empty($results[1])
         ) {
@@ -266,7 +266,7 @@ protected function parseStatementTimestamp()
      */
     protected function parseStatementNumber()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:28C?:(.*)/', $this->getCurrentStatementData(), $results)
                 && !empty($results[1])
         ) {
@@ -283,7 +283,7 @@ protected function parseStatementNumber()
      */
     protected function parseTransactionAccount()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:86: ?([\d\.]+)\s/im', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {
@@ -299,7 +299,7 @@ protected function parseTransactionAccount()
      */
     protected function parseTransactionAccountName()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:86: ?[\d\.]+ (.+)/', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {
@@ -315,7 +315,7 @@ protected function parseTransactionAccountName()
      */
     protected function parseTransactionPrice()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:.*[CD]([\d,\.]+)N/i', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {
@@ -331,7 +331,7 @@ protected function parseTransactionPrice()
      */
     protected function parseTransactionDebitCredit()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:\d+([CD])\d+/', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {
@@ -347,7 +347,7 @@ protected function parseTransactionDebitCredit()
      */
     protected function parseTransactionDescription()
     {
-        $results = array();
+        $results = [];
         if (preg_match_all('/[\n]:86:(.*?)(?=\n(:6(1|2))|$)/s', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {
@@ -363,7 +363,7 @@ protected function parseTransactionDescription()
      */
     protected function parseTransactionEntryTimestamp()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:(\d{6})/', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {
@@ -379,7 +379,7 @@ protected function parseTransactionEntryTimestamp()
      */
     protected function parseTransactionValueTimestamp()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:(\d{6})/', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {
@@ -395,7 +395,7 @@ protected function parseTransactionValueTimestamp()
      */
     protected function parseTransactionCode()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:.*?N(.{3}).*/', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {
@@ -412,11 +412,11 @@ protected function parseTransactionCode()
      */
     protected function sanitizeAccount($string)
     {
-        static $crudeReplacements = array(
+        static $crudeReplacements = [
                 '.' => '',
                 ' ' => '',
                 'GIRO' => 'P',
-        );
+        ];
 
         // crude IBAN to 'old' converter
         if (Mt940::$removeIBAN

diff --git a/src/Parser/Banking/Mt940/Engine/Abn.php b/src/Parser/Banking/Mt940/Engine/Abn.php
@@ -30,7 +30,7 @@ protected function parseTransactionAccount()
         $results = parent::parseTransactionAccount();
 
         if (empty($results)) {
-            $giroMatch = $ibanMatch = array();
+            $giroMatch = $ibanMatch = [];
             if (preg_match('/^:86:GIRO(.{9})/im', $this->getCurrentTransactionData(), $giroMatch)
                     && !empty($giroMatch[1])
             ) {
@@ -58,7 +58,7 @@ protected function parseTransactionAccountName()
             return $results;
         }
 
-        $results = array();
+        $results = [];
         if (preg_match('/:86:(GIRO|BGC\.)\s+[\d]+ (.+)/', $this->getCurrentTransactionData(), $results)
                 && !empty($results[2])
         ) {
@@ -82,7 +82,7 @@ protected function parseTransactionAccountName()
      */
     protected function parseTransactionEntryTimestamp()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:\d{6}(\d{4})[C|D]/', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
         ) {

diff --git a/src/Parser/Banking/Mt940/Engine/Rabo.php b/src/Parser/Banking/Mt940/Engine/Rabo.php
@@ -25,7 +25,7 @@ protected function parseStatementBank()
      */
     protected function parseTransactionAccount()
     {
-        $results = array();
+        $results = [];
         // SEPA MT940 Structured
         if (preg_match('/^:61:.*\n(.*?)(\n|\:8)/im', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
@@ -47,7 +47,7 @@ protected function parseTransactionAccount()
      */
     protected function parseTransactionAccountName()
     {
-        $results = array();
+        $results = [];
         // SEPA MT940 Structured
         if (preg_match('#/NAME/(.*?)/(REMI|ADDR)/#ms', $this->getCurrentTransactionData(), $results)
                 && !empty($results[1])
@@ -74,7 +74,7 @@ protected function parseTransactionAccountName()
      */
     protected function parseTransactionEntryTimestamp()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:60F:[C|D]([\d]{6})/m', $this->getCurrentStatementData(), $results) && !empty($results[1])) {
             return $this->sanitizeTimestamp($results[1], 'ymd');
         }
@@ -88,7 +88,7 @@ protected function parseTransactionEntryTimestamp()
      */
     protected function parseTransactionValueTimestamp()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:([\d]{6})[C|D]/', $this->getCurrentTransactionData(), $results) && !empty($results[1])) {
             return $this->sanitizeTimestamp($results[1], 'ymd');
         }

diff --git a/src/Parser/Banking/Mt940/Engine/Spk.php b/src/Parser/Banking/Mt940/Engine/Spk.php
@@ -29,7 +29,7 @@ protected function parseStatementBank()
      */
     protected function parseStatementStartPrice()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:60[FM]:.*EUR([\d,\.]+)*/', $this->getCurrentStatementData(), $results)
                 && !empty($results[1])
         ) {
@@ -45,7 +45,7 @@ protected function parseStatementStartPrice()
      */
     protected function parseStatementTimestamp()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:60[FM]:[C|D](\d{6})*/', $this->getCurrentStatementData(), $results)
                 && !empty($results[1])
         ) {
@@ -61,7 +61,7 @@ protected function parseStatementTimestamp()
      */
     protected function parseStatementEndPrice()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/:62[FM]:.*EUR([\d,\.]+)*/', $this->getCurrentStatementData(), $results)
                 && !empty($results[1])
         ) {
@@ -77,7 +77,7 @@ protected function parseStatementEndPrice()
      */
     protected function parseTransactionPrice()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:.*[CD].?([\d,\.]+)N/i', $this->getCurrentTransactionData(), $results)
             && !empty($results[1])
         ) {
@@ -93,7 +93,7 @@ protected function parseTransactionPrice()
      */
     protected function parseTransactionDebitCredit()
     {
-        $results = array();
+        $results = [];
         if (preg_match('/^:61:\d+R?([CD]).?\d+/', $this->getCurrentTransactionData(), $results)
             && !empty($results[1])
         ) {

diff --git a/src/Parser/Banking/Mt940/Engine/Triodos.php b/src/Parser/Banking/Mt940/Engine/Triodos.php
@@ -27,7 +27,7 @@ protected function parseStatementBank()
      */
     protected function parseStatementAccount()
     {
-        $results = array();
+        $results = [];
         if (preg_match('#:25:TRIODOSBANK/([\d\.]+)#', $this->getCurrentStatementData(), $results) && !empty($results[1])
         ) {
             return $this->sanitizeAccount($results[1]);
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ cache: @@
         - $HOME/.composer/cache
     php:
-      - 5.4
       - 5.5
       - 5.6
       - 7
@@ Expand Down @@