mschindler83 / fints-hbci-php

lib/Fhp/Model/StatementOfAccount/Statement.php

Indentation +131 added lines, -131 removed lines

@@ -8,136 +8,136 @@
  */
 class Statement
 {
-	const CD_CREDIT = 'credit';
-	const CD_DEBIT = 'debit';
-
-	/**
-	 * @var array of Transaction
-	 */
-	protected $transactions = array();
-
-	/**
-	 * @var float
-	 */
-	protected $startBalance = 0.0;
-
-	/**
-	 * @var string
-	 */
-	protected $creditDebit;
-
-	/**
-	 * @var \DateTime|null
-	 */
-	protected $date;
-
-	/**
-	 * Get transactions
-	 *
-	 * @return Transaction[]
-	 */
-	public function getTransactions()
-	{
-		return $this->transactions;
-	}
-
-	/**
-	 * Set transactions
-	 *
-	 * @param array $transactions
-	 *
-	 * @return $this
-	 */
-	public function setTransactions(array $transactions = null)
-	{
-		$this->transactions = $transactions;
-
-		return $this;
-	}
-
-	public function addTransaction(Transaction $transaction)
-	{
-		$this->transactions[] = $transaction;
-	}
-
-	/**
-	 * Get startBalance
-	 *
-	 * @return float
-	 */
-	public function getStartBalance()
-	{
-		return $this->startBalance;
-	}
-
-	public function getSignedStartBalance()
-	{
-		$s = 1;
-		if ($this->getCreditDebit() == self::CD_DEBIT) $s = -1;
-		return $s * $this->getStartBalance();
-
-	}
-
-	/**
-	 * Set startBalance
-	 *
-	 * @param float $startBalance
-	 *
-	 * @return $this
-	 */
-	public function setStartBalance($startBalance)
-	{
-		$this->startBalance = (float) $startBalance;
-
-		return $this;
-	}
-
-	/**
-	 * Get creditDebit
-	 *
-	 * @return string
-	 */
-	public function getCreditDebit()
-	{
-		return $this->creditDebit;
-	}
-
-	/**
-	 * Set creditDebit
-	 *
-	 * @param string|null $creditDebit
-	 *
-	 * @return $this
-	 */
-	public function setCreditDebit($creditDebit)
-	{
-		$this->creditDebit = $creditDebit;
-
-		return $this;
-	}
-
-	/**
-	 * Get date
-	 *
-	 * @return \DateTime
-	 */
-	public function getDate()
-	{
-		return $this->date;
-	}
-
-	/**
-	 * Set date
-	 *
-	 * @param \DateTime $date
-	 *
-	 * @return $this
-	 */
-	public function setDate(\DateTime $date)
-	{
-		$this->date = $date;
-
-		return $this;
-	}
+    const CD_CREDIT = 'credit';
+    const CD_DEBIT = 'debit';
+
+    /**
+     * @var array of Transaction
+     */
+    protected $transactions = array();
+
+    /**
+     * @var float
+     */
+    protected $startBalance = 0.0;
+
+    /**
+     * @var string
+     */
+    protected $creditDebit;
+
+    /**
+     * @var \DateTime|null
+     */
+    protected $date;
+
+    /**
+     * Get transactions
+     *
+     * @return Transaction[]
+     */
+    public function getTransactions()
+    {
+        return $this->transactions;
+    }
+
+    /**
+     * Set transactions
+     *
+     * @param array $transactions
+     *
+     * @return $this
+     */
+    public function setTransactions(array $transactions = null)
+    {
+        $this->transactions = $transactions;
+
+        return $this;
+    }
+
+    public function addTransaction(Transaction $transaction)
+    {
+        $this->transactions[] = $transaction;
+    }
+
+    /**
+     * Get startBalance
+     *
+     * @return float
+     */
+    public function getStartBalance()
+    {
+        return $this->startBalance;
+    }
+
+    public function getSignedStartBalance()
+    {
+        $s = 1;
+        if ($this->getCreditDebit() == self::CD_DEBIT) $s = -1;
+        return $s * $this->getStartBalance();
+
+    }
+
+    /**
+     * Set startBalance
+     *
+     * @param float $startBalance
+     *
+     * @return $this
+     */
+    public function setStartBalance($startBalance)
+    {
+        $this->startBalance = (float) $startBalance;
+
+        return $this;
+    }
+
+    /**
+     * Get creditDebit
+     *
+     * @return string
+     */
+    public function getCreditDebit()
+    {
+        return $this->creditDebit;
+    }
+
+    /**
+     * Set creditDebit
+     *
+     * @param string|null $creditDebit
+     *
+     * @return $this
+     */
+    public function setCreditDebit($creditDebit)
+    {
+        $this->creditDebit = $creditDebit;
+
+        return $this;
+    }
+
+    /**
+     * Get date
+     *
+     * @return \DateTime
+     */
+    public function getDate()
+    {
+        return $this->date;
+    }
+
+    /**
+     * Set date
+     *
+     * @param \DateTime $date
+     *
+     * @return $this
+     */
+    public function setDate(\DateTime $date)
+    {
+        $this->date = $date;
+
+        return $this;
+    }
 }
 

Braces +3 added lines, -1 removed lines

@@ -73,7 +73,9 @@
 	public function getSignedStartBalance()
 	{
 		$s = 1;
-		if ($this->getCreditDebit() == self::CD_DEBIT) $s = -1;
+		if ($this->getCreditDebit() == self::CD_DEBIT) {
+		    $s = -1;
+		}
 		return $s * $this->getStartBalance();
 
 	}

lib/Fhp/Response/GetStatementOfAccount.php

Indentation +22 added lines, -22 removed lines

@@ -55,29 +55,29 @@
     protected static function addFromArray(array $array, StatementOfAccount $statementOfAccount)
     {
         foreach ($array as $statement) {
-					$statementModel = new Statement();
-					$statementModel->setDate(new \DateTime($statement['date']));
-					$statementModel->setStartBalance((float) $statement['start_balance']['amount']);
-					$statementModel->setCreditDebit($statement['start_balance']['credit_debit']);
-					$statementOfAccount->addStatement($statementModel);
+                    $statementModel = new Statement();
+                    $statementModel->setDate(new \DateTime($statement['date']));
+                    $statementModel->setStartBalance((float) $statement['start_balance']['amount']);
+                    $statementModel->setCreditDebit($statement['start_balance']['credit_debit']);
+                    $statementOfAccount->addStatement($statementModel);
 
-					foreach ($statement['transactions'] as $trx) {
-						$transaction = new Transaction();
-						$transaction->setBookingDate(new \DateTime($trx['booking_date']));
-						$transaction->setValutaDate(new \DateTime($trx['valuta_date']));
-						$transaction->setCreditDebit($trx['credit_debit']);
-						$transaction->setAmount($trx['amount']);
-						$transaction->setTransactionCode($trx['transaction_code']);
-						$transaction->setBookingText($trx['description']['booking_text']);
-						$transaction->setDescription1($trx['description']['description_1']);
-						$transaction->setDescription2($trx['description']['description_2']);
-						$transaction->setStructuredDescription($trx['description']['description']);
-						$transaction->setBankCode($trx['description']['bank_code']);
-						$transaction->setAccountNumber($trx['description']['account_number']);
-						$transaction->setName($trx['description']['name']);
-						$statementModel->addTransaction($transaction);
-					}
-				}
+                    foreach ($statement['transactions'] as $trx) {
+                        $transaction = new Transaction();
+                        $transaction->setBookingDate(new \DateTime($trx['booking_date']));
+                        $transaction->setValutaDate(new \DateTime($trx['valuta_date']));
+                        $transaction->setCreditDebit($trx['credit_debit']);
+                        $transaction->setAmount($trx['amount']);
+                        $transaction->setTransactionCode($trx['transaction_code']);
+                        $transaction->setBookingText($trx['description']['booking_text']);
+                        $transaction->setDescription1($trx['description']['description_1']);
+                        $transaction->setDescription2($trx['description']['description_2']);
+                        $transaction->setStructuredDescription($trx['description']['description']);
+                        $transaction->setBankCode($trx['description']['bank_code']);
+                        $transaction->setAccountNumber($trx['description']['account_number']);
+                        $transaction->setName($trx['description']['name']);
+                        $statementModel->addTransaction($transaction);
+                    }
+                }
 
         return $statementOfAccount;
     }

lib/Fhp/Parser/MT940.php

Indentation +229 added lines, -229 removed lines

@@ -10,233 +10,233 @@
  */
 class MT940
 {
-	const TARGET_ARRAY = 0;
-
-	const CD_CREDIT = 'credit';
-	const CD_DEBIT = 'debit';
-	const CD_CREDIT_CANCELLATION = 'credit_cancellation';
-	const CD_DEBIT_CANCELLATION = 'debit_cancellation';
-
-	/** @var string */
-	protected $rawData;
-	/** @var string */
-	protected $soaDate;
-
-	/**
-	 * MT940 constructor.
-	 *
-	 * @param string $rawData
-	 */
-	public function __construct($rawData)
-	{
-		$this->rawData = (string) $rawData;
-	}
-
-	/**
-	 * @param string $target
-	 * @return array
-	 * @throws MT940Exception
-	 */
-	public function parse($target)
-	{
-		switch ($target) {
-		case static::TARGET_ARRAY:
-			return $this->parseToArray();
-			break;
-		default:
-			throw new MT940Exception('Invalid parse type provided');
-		}
-	}
-
-	/**
-	 * @return array
-	 * @throws MT940Exception
-	 */
-	protected function parseToArray()
-	{
-		// The divider can be either \r\n or @@
-
-		$divider = "(@@|\r\n)";
-		$result = array();
-		$days = preg_split('/' . $divider . '-' . $divider . '/', $this->rawData);
-
-		foreach ($days as $day) {
-			$day = preg_split('/' . $divider . ':/', $day);
-			$statement = array();
-			$transactions = array();
-			$cnt = 0;
-			for ($i = 0, $cnt = count($day); $i < $cnt; $i++) {
-				// handle start balance
-				// 60F:C160401EUR1234,56
-				if (preg_match('/^60(F|M):/', $day[$i])) {
-					// remove 60(F|M): for better parsing
-					$day[$i] = substr($day[$i], 4);
-					$this->soaDate = $this->getDate(substr($day[$i], 1, 6));
-
-					$amount = str_replace(',', '.', substr($day[$i], 10));
-					$statement['start_balance'] = array(
-						'amount' => $amount,
-						'credit_debit' => (substr($day[$i], 0, 1) == 'C') ? static::CD_CREDIT : static::CD_DEBIT
-					);
-					$statement['date'] = $this->soaDate;
-				} elseif (
-					// found transaction
-					// trx:61:1603310331DR637,39N033NONREF
-					0 === strpos($day[$i], '61:')
-					&& isset($day[$i + 1])
-					&& 0 === strpos($day[$i + 1], '86:')
-				) {
-					$transaction = substr($day[$i], 3);
-					$description = substr($day[$i + 1], 3);
-
-					$currentTrx = array();
-
-					preg_match('/^\d{6}(\d{4})?(C|D|RC|RD)[A-Z]?([^N]+)N/', $transaction, $matches);
-
-					switch($matches[2]) {
-					case 'C':
-						$currentTrx['credit_debit'] = static::CD_CREDIT;
-						break;
-					case 'D':
-						$currentTrx['credit_debit'] = static::CD_DEBIT;
-						break;
-					case 'RC':
-						$currentTrx['credit_debit'] = static::CD_CREDIT_CANCELLATION;
-						break;
-					case 'RD':
-						$currentTrx['credit_debit'] = static::CD_DEBIT_CANCELLATION;
-						break;
-					default:
-						throw new MT940Exception('c/d/rc/rd mark not found in: ' . $transaction);
-					}
-
-					$amount = $matches[3];
-					$amount = str_replace(',', '.', $amount);
-					$currentTrx['amount'] = floatval($amount);
-
-					$currentTrx['transaction_code'] = substr($description, 0, 3);
-
-					$description = $this->parseDescription($description);
-					$currentTrx['description'] = $description;
-
-					// :61:1605110509D198,02NMSCNONREF
-					// 16 = year
-					// 0511 = valuta date
-					// 0509 = booking date
-					$year = substr($transaction, 0, 2);
-					$valutaDate = $this->getDate($year . substr($transaction, 2, 4));
-
-					$bookingDate = substr($transaction, 6, 4);
-					if (preg_match('/^\d{4}$/', $bookingDate)) {
-						// if valuta date is earlier than booking date, then it must be in the new year.
-						if (substr($transaction, 2, 2) == '12' && substr($transaction, 6, 2) == '01') {
-							$year++;
-						} elseif (substr($transaction, 2, 2) == '01' && substr($transaction, 6, 2) == '12') {
-							$year--;
-						}
-						$bookingDate = $this->getDate($year . $bookingDate);
-					} else {
-						// if booking date not set in :61, then we have to take it from :60F
-						$bookingDate = $this->soaDate;
-					}
-
-					$currentTrx['booking_date'] = $bookingDate;
-					$currentTrx['valuta_date'] = $valutaDate;
-
-					$transactions[] = $currentTrx;
-				}
-			}
-			$statement['transactions'] = $transactions;
-			if (count($transactions) > 0) $result[] = $statement;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param string $descr
-	 * @return array
-	 */
-	protected function parseDescription($descr)
-	{
-		$prepared = array();
-		$result = array();
-
-		// prefill with empty values
-		for ($i = 0; $i <= 63; $i++) {
-			$prepared[$i] = null;
-		}
-
-		$descr = str_replace("\r\n", '', $descr);
-		$descr = str_replace('? ', '?', $descr);
-		preg_match_all('/\?[\r\n]*(\d{2})([^\?]+)/', $descr, $matches, PREG_SET_ORDER);
-
-		$descriptionLines = array();
-		$description1 = ''; // Legacy, could be removed.
-		$description2 = ''; // Legacy, could be removed.
-		foreach ($matches as $m) {
-			$index = (int) $m[1];
-			if ((20 <= $index && $index <= 29) || (60 <= $index && $index <= 63)) {
-				if (20 <= $index && $index <= 29) {
-					$description1 .= $m[2];
-				} else {
-					$description2 .= $m[2];
-				}
-				$m[2] = trim($m[2]);
-				if (!empty($m[2])) {
-					$descriptionLines[] = $m[2];
-				}
-			} else {
-				$prepared[$index] = $m[2];
-			}
-		}
-
-		$description = array();
-		if (empty($descriptionLines) || strlen($descriptionLines[0]) < 5 || $descriptionLines[0][4] !== '+') {
-			$description['SVWZ'] = implode('', $descriptionLines);
-		} else {
-			$lastType = null;
-			foreach ($descriptionLines as $line) {
-				if (strlen($line) > 5 && $line[4] === '+') {
-					if ($lastType != null) {
-						$description[$lastType] = trim($description[$lastType]);
-					}
-					$lastType = substr($line, 0, 4);
-					$description[$lastType] = substr($line, 5);
-				} else {
-					$description[$lastType] .= $line;
-				}
-				if (strlen($line) < 27) {
-					// Usually, lines are 27 characters long. In case characters are missing, then it's either the end
-					// of the current type or spaces have been trimmed from the end. We want to collapse multiple spaces
-					// into one and we don't want to leave trailing spaces behind. So add a single space here to make up
-					// for possibly missing spaces, and if it's the end of the type, it will be trimmed off later.
-					$description[$lastType] .= ' ';
-				}
-			}
-			$description[$lastType] = trim($description[$lastType]);
-		}
-
-		$result['description']       = $description;
-		$result['booking_text']      = trim($prepared[0]);
-		$result['primanoten_nr']     = trim($prepared[10]);
-		$result['description_1']     = trim($description1);
-		$result['bank_code']         = trim($prepared[30]);
-		$result['account_number']    = trim($prepared[31]);
-		$result['name']              = trim($prepared[32] . $prepared[33]);
-		$result['text_key_addition'] = trim($prepared[34]);
-		$result['description_2']     = trim($description2);
-		return $result;
-	}
-
-	/**
-	 * @param string $val
-	 * @return string
-	 */
-	protected function getDate($val)
-	{
-		$val = '20' . $val;
-		preg_match('/(\d{4})(\d{2})(\d{2})/', $val, $m);
-		return $m[1] . '-' . $m[2] . '-' . $m[3];
-	}
+    const TARGET_ARRAY = 0;
+
+    const CD_CREDIT = 'credit';
+    const CD_DEBIT = 'debit';
+    const CD_CREDIT_CANCELLATION = 'credit_cancellation';
+    const CD_DEBIT_CANCELLATION = 'debit_cancellation';
+
+    /** @var string */
+    protected $rawData;
+    /** @var string */
+    protected $soaDate;
+
+    /**
+     * MT940 constructor.
+     *
+     * @param string $rawData
+     */
+    public function __construct($rawData)
+    {
+        $this->rawData = (string) $rawData;
+    }
+
+    /**
+     * @param string $target
+     * @return array
+     * @throws MT940Exception
+     */
+    public function parse($target)
+    {
+        switch ($target) {
+        case static::TARGET_ARRAY:
+            return $this->parseToArray();
+            break;
+        default:
+            throw new MT940Exception('Invalid parse type provided');
+        }
+    }
+
+    /**
+     * @return array
+     * @throws MT940Exception
+     */
+    protected function parseToArray()
+    {
+        // The divider can be either \r\n or @@
+
+        $divider = "(@@|\r\n)";
+        $result = array();
+        $days = preg_split('/' . $divider . '-' . $divider . '/', $this->rawData);
+
+        foreach ($days as $day) {
+            $day = preg_split('/' . $divider . ':/', $day);
+            $statement = array();
+            $transactions = array();
+            $cnt = 0;
+            for ($i = 0, $cnt = count($day); $i < $cnt; $i++) {
+                // handle start balance
+                // 60F:C160401EUR1234,56
+                if (preg_match('/^60(F|M):/', $day[$i])) {
+                    // remove 60(F|M): for better parsing
+                    $day[$i] = substr($day[$i], 4);
+                    $this->soaDate = $this->getDate(substr($day[$i], 1, 6));
+
+                    $amount = str_replace(',', '.', substr($day[$i], 10));
+                    $statement['start_balance'] = array(
+                        'amount' => $amount,
+                        'credit_debit' => (substr($day[$i], 0, 1) == 'C') ? static::CD_CREDIT : static::CD_DEBIT
+                    );
+                    $statement['date'] = $this->soaDate;
+                } elseif (
+                    // found transaction
+                    // trx:61:1603310331DR637,39N033NONREF
+                    0 === strpos($day[$i], '61:')
+                    && isset($day[$i + 1])
+                    && 0 === strpos($day[$i + 1], '86:')
+                ) {
+                    $transaction = substr($day[$i], 3);
+                    $description = substr($day[$i + 1], 3);
+
+                    $currentTrx = array();
+
+                    preg_match('/^\d{6}(\d{4})?(C|D|RC|RD)[A-Z]?([^N]+)N/', $transaction, $matches);
+
+                    switch($matches[2]) {
+                    case 'C':
+                        $currentTrx['credit_debit'] = static::CD_CREDIT;
+                        break;
+                    case 'D':
+                        $currentTrx['credit_debit'] = static::CD_DEBIT;
+                        break;
+                    case 'RC':
+                        $currentTrx['credit_debit'] = static::CD_CREDIT_CANCELLATION;
+                        break;
+                    case 'RD':
+                        $currentTrx['credit_debit'] = static::CD_DEBIT_CANCELLATION;
+                        break;
+                    default:
+                        throw new MT940Exception('c/d/rc/rd mark not found in: ' . $transaction);
+                    }
+
+                    $amount = $matches[3];
+                    $amount = str_replace(',', '.', $amount);
+                    $currentTrx['amount'] = floatval($amount);
+
+                    $currentTrx['transaction_code'] = substr($description, 0, 3);
+
+                    $description = $this->parseDescription($description);
+                    $currentTrx['description'] = $description;
+
+                    // :61:1605110509D198,02NMSCNONREF
+                    // 16 = year
+                    // 0511 = valuta date
+                    // 0509 = booking date
+                    $year = substr($transaction, 0, 2);
+                    $valutaDate = $this->getDate($year . substr($transaction, 2, 4));
+
+                    $bookingDate = substr($transaction, 6, 4);
+                    if (preg_match('/^\d{4}$/', $bookingDate)) {
+                        // if valuta date is earlier than booking date, then it must be in the new year.
+                        if (substr($transaction, 2, 2) == '12' && substr($transaction, 6, 2) == '01') {
+                            $year++;
+                        } elseif (substr($transaction, 2, 2) == '01' && substr($transaction, 6, 2) == '12') {
+                            $year--;
+                        }
+                        $bookingDate = $this->getDate($year . $bookingDate);
+                    } else {
+                        // if booking date not set in :61, then we have to take it from :60F
+                        $bookingDate = $this->soaDate;
+                    }
+
+                    $currentTrx['booking_date'] = $bookingDate;
+                    $currentTrx['valuta_date'] = $valutaDate;
+
+                    $transactions[] = $currentTrx;
+                }
+            }
+            $statement['transactions'] = $transactions;
+            if (count($transactions) > 0) $result[] = $statement;
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param string $descr
+     * @return array
+     */
+    protected function parseDescription($descr)
+    {
+        $prepared = array();
+        $result = array();
+
+        // prefill with empty values
+        for ($i = 0; $i <= 63; $i++) {
+            $prepared[$i] = null;
+        }
+
+        $descr = str_replace("\r\n", '', $descr);
+        $descr = str_replace('? ', '?', $descr);
+        preg_match_all('/\?[\r\n]*(\d{2})([^\?]+)/', $descr, $matches, PREG_SET_ORDER);
+
+        $descriptionLines = array();
+        $description1 = ''; // Legacy, could be removed.
+        $description2 = ''; // Legacy, could be removed.
+        foreach ($matches as $m) {
+            $index = (int) $m[1];
+            if ((20 <= $index && $index <= 29) || (60 <= $index && $index <= 63)) {
+                if (20 <= $index && $index <= 29) {
+                    $description1 .= $m[2];
+                } else {
+                    $description2 .= $m[2];
+                }
+                $m[2] = trim($m[2]);
+                if (!empty($m[2])) {
+                    $descriptionLines[] = $m[2];
+                }
+            } else {
+                $prepared[$index] = $m[2];
+            }
+        }
+
+        $description = array();
+        if (empty($descriptionLines) || strlen($descriptionLines[0]) < 5 || $descriptionLines[0][4] !== '+') {
+            $description['SVWZ'] = implode('', $descriptionLines);
+        } else {
+            $lastType = null;
+            foreach ($descriptionLines as $line) {
+                if (strlen($line) > 5 && $line[4] === '+') {
+                    if ($lastType != null) {
+                        $description[$lastType] = trim($description[$lastType]);
+                    }
+                    $lastType = substr($line, 0, 4);
+                    $description[$lastType] = substr($line, 5);
+                } else {
+                    $description[$lastType] .= $line;
+                }
+                if (strlen($line) < 27) {
+                    // Usually, lines are 27 characters long. In case characters are missing, then it's either the end
+                    // of the current type or spaces have been trimmed from the end. We want to collapse multiple spaces
+                    // into one and we don't want to leave trailing spaces behind. So add a single space here to make up
+                    // for possibly missing spaces, and if it's the end of the type, it will be trimmed off later.
+                    $description[$lastType] .= ' ';
+                }
+            }
+            $description[$lastType] = trim($description[$lastType]);
+        }
+
+        $result['description']       = $description;
+        $result['booking_text']      = trim($prepared[0]);
+        $result['primanoten_nr']     = trim($prepared[10]);
+        $result['description_1']     = trim($description1);
+        $result['bank_code']         = trim($prepared[30]);
+        $result['account_number']    = trim($prepared[31]);
+        $result['name']              = trim($prepared[32] . $prepared[33]);
+        $result['text_key_addition'] = trim($prepared[34]);
+        $result['description_2']     = trim($description2);
+        return $result;
+    }
+
+    /**
+     * @param string $val
+     * @return string
+     */
+    protected function getDate($val)
+    {
+        $val = '20' . $val;
+        preg_match('/(\d{4})(\d{2})(\d{2})/', $val, $m);
+        return $m[1] . '-' . $m[2] . '-' . $m[3];
+    }
 }

Switch Indentation +19 added lines, -19 removed lines

@@ -40,11 +40,11 @@ 
 	public function parse($target)
 	{
 		switch ($target) {
-		case static::TARGET_ARRAY:
-			return $this->parseToArray();
-			break;
-		default:
-			throw new MT940Exception('Invalid parse type provided');
+		    case static::TARGET_ARRAY:
+			    return $this->parseToArray();
+			    break;
+		    default:
+			    throw new MT940Exception('Invalid parse type provided');
 		}
 	}
 
@@ -94,20 +94,20 @@ 
 					preg_match('/^\d{6}(\d{4})?(C|D|RC|RD)[A-Z]?([^N]+)N/', $transaction, $matches);
 
 					switch($matches[2]) {
-					case 'C':
-						$currentTrx['credit_debit'] = static::CD_CREDIT;
-						break;
-					case 'D':
-						$currentTrx['credit_debit'] = static::CD_DEBIT;
-						break;
-					case 'RC':
-						$currentTrx['credit_debit'] = static::CD_CREDIT_CANCELLATION;
-						break;
-					case 'RD':
-						$currentTrx['credit_debit'] = static::CD_DEBIT_CANCELLATION;
-						break;
-					default:
-						throw new MT940Exception('c/d/rc/rd mark not found in: ' . $transaction);
+					    case 'C':
+						    $currentTrx['credit_debit'] = static::CD_CREDIT;
+						    break;
+					    case 'D':
+						    $currentTrx['credit_debit'] = static::CD_DEBIT;
+						    break;
+					    case 'RC':
+						    $currentTrx['credit_debit'] = static::CD_CREDIT_CANCELLATION;
+						    break;
+					    case 'RD':
+						    $currentTrx['credit_debit'] = static::CD_DEBIT_CANCELLATION;
+						    break;
+					    default:
+						    throw new MT940Exception('c/d/rc/rd mark not found in: ' . $transaction);
 					}
 
 					$amount = $matches[3];

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 
 					preg_match('/^\d{6}(\d{4})?(C|D|RC|RD)[A-Z]?([^N]+)N/', $transaction, $matches);
 
-					switch($matches[2]) {
+					switch ($matches[2]) {
 					case 'C':
 						$currentTrx['credit_debit'] = static::CD_CREDIT;
 						break;

Braces +3 added lines, -1 removed lines

@@ -147,7 +147,9 @@
 				}
 			}
 			$statement['transactions'] = $transactions;
-			if (count($transactions) > 0) $result[] = $statement;
+			if (count($transactions) > 0) {
+			    $result[] = $statement;
+			}
 		}
 
 		return $result;

lib/Tests/Fhp/Parser/MT940Test.php

Indentation +32 added lines, -32 removed lines

@@ -6,37 +6,37 @@
 
 class MT940Test extends \PHPUnit_Framework_TestCase
 {
-	/**
-	 * Parser must be able to parse description lines starting with "-".
-	 */
-	public function testParseDescriptionLines()
-	{
-		$rawData = [
-			":20:STARTUMSE",
-			":25:00000000/0221122370",
-			":28C:00000/001",
-			":60F:C170428EUR6670,54",
-			":61:1705030503CR223,72N062NONREF",
-			":86:166?00GUTSCHRIFT?109251?20EREF+CCB.122.UE.266455?21SVWZ+Re 17",
-			"-H-0005 vom 24.04?22.2017?30DRESDEFF850?31DE00000000000000000000?",
-			"32TEST TEST GBR",
-			":62F:C170503EUR6894,26",
-			"-"
-		];
+    /**
+     * Parser must be able to parse description lines starting with "-".
+     */
+    public function testParseDescriptionLines()
+    {
+        $rawData = [
+            ":20:STARTUMSE",
+            ":25:00000000/0221122370",
+            ":28C:00000/001",
+            ":60F:C170428EUR6670,54",
+            ":61:1705030503CR223,72N062NONREF",
+            ":86:166?00GUTSCHRIFT?109251?20EREF+CCB.122.UE.266455?21SVWZ+Re 17",
+            "-H-0005 vom 24.04?22.2017?30DRESDEFF850?31DE00000000000000000000?",
+            "32TEST TEST GBR",
+            ":62F:C170503EUR6894,26",
+            "-"
+        ];
 
-		$parser = new MT940(implode("\r\n", $rawData));
-		$result = $parser->parse(MT940::TARGET_ARRAY);
-		$this->assertEquals(
-			'EREF+CCB.122.UE.266455SVWZ+Re 17-H-0005 vom 24.04.2017',
-			$result[0]['transactions'][0]['description']['description_1']
-		);
-		$this->assertEquals(
-			'166',
-			$result[0]['transactions'][0]['transaction_code']
-		);
-		$this->assertEquals(
-			'223.72',
-			$result[0]['transactions'][0]['amount']
-		);
-	}
+        $parser = new MT940(implode("\r\n", $rawData));
+        $result = $parser->parse(MT940::TARGET_ARRAY);
+        $this->assertEquals(
+            'EREF+CCB.122.UE.266455SVWZ+Re 17-H-0005 vom 24.04.2017',
+            $result[0]['transactions'][0]['description']['description_1']
+        );
+        $this->assertEquals(
+            '166',
+            $result[0]['transactions'][0]['transaction_code']
+        );
+        $this->assertEquals(
+            '223.72',
+            $result[0]['transactions'][0]['amount']
+        );
+    }
 }