mschindler83 / fints-hbci-php

lib/Fhp/Model/StatementOfAccount/StatementOfAccount.php

Indentation +63 added lines, -63 removed lines

@@ -8,76 +8,76 @@
  */
 class StatementOfAccount
 {
-	/**
-	 * @var Statement[]
-	 */
-	protected $statements = array();
+    /**
+     * @var Statement[]
+     */
+    protected $statements = array();
 
-	/**
-	 * Get statements
-	 *
-	 * @return Statement[]
-	 */
-	public function getStatements()
-	{
-		return $this->statements;
-	}
+    /**
+     * Get statements
+     *
+     * @return Statement[]
+     */
+    public function getStatements()
+    {
+        return $this->statements;
+    }
 
-	/**
-	 * Set statements
-	 *
-	 * @param array $statements
-	 *
-	 * @return $this
-	 */
-	public function setStatements(array $statements = null)
-	{
-		$this->statements = null == $statements ? array() : $statements;
+    /**
+     * Set statements
+     *
+     * @param array $statements
+     *
+     * @return $this
+     */
+    public function setStatements(array $statements = null)
+    {
+        $this->statements = null == $statements ? array() : $statements;
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * @param Statement $statement
-	 */
-	public function addStatement(Statement $statement)
-	{
-		$this->statements[] = $statement;
-	}
+    /**
+     * @param Statement $statement
+     */
+    public function addStatement(Statement $statement)
+    {
+        $this->statements[] = $statement;
+    }
 
-	/**
-	 * Gets statement for given date.
-	 *
-	 * @param string|\DateTime $date
-	 * @return Statement|null
-	 */
-	public function getStatementForDate($date)
-	{
-		if (is_string($date)) {
-			$date = new \DateTime($date);
-		}
+    /**
+     * Gets statement for given date.
+     *
+     * @param string|\DateTime $date
+     * @return Statement|null
+     */
+    public function getStatementForDate($date)
+    {
+        if (is_string($date)) {
+            $date = new \DateTime($date);
+        }
 
-		foreach ($this->statements as $stmt) {
-			if ($stmt->getDate() == $date) {
-				return $stmt;
-			}
-		}
+        foreach ($this->statements as $stmt) {
+            if ($stmt->getDate() == $date) {
+                return $stmt;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * Checks if a statement with given date exists.
-	 *
-	 * @param string|\DateTime $date
-	 * @return bool
-	 */
-	public function hasStatementForDate($date)
-	{
-		if (is_string($date)) {
-			$date = new \DateTime($date);
-		}
+    /**
+     * Checks if a statement with given date exists.
+     *
+     * @param string|\DateTime $date
+     * @return bool
+     */
+    public function hasStatementForDate($date)
+    {
+        if (is_string($date)) {
+            $date = new \DateTime($date);
+        }
 
-		return null !== $this->getStatementForDate($date);
-	}
+        return null !== $this->getStatementForDate($date);
+    }
 }

lib/Fhp/Model/StatementOfAccount/Transaction.php

Indentation +396 added lines, -396 removed lines

@@ -8,400 +8,400 @@
  */
 class Transaction
 {
-	const CD_CREDIT = 'credit';
-	const CD_DEBIT = 'debit';
-	const CD_CREDIT_CANCELLATION = 'credit_cancellation';
-	const CD_DEBIT_CANCELLATION = 'debit_cancellation';
-
-	/**
-	 * @var \DateTime|null
-	 */
-	protected $bookingDate;
-
-	/**
-	 * @var \DateTime|null
-	 */
-	protected $valutaDate;
-
-	/**
-	 * @var float
-	 */
-	protected $amount;
-
-	/**
-	 * @var string
-	 */
-	protected $creditDebit;
-
-	/**
-	 * @var string
-	 */
-	protected $bookingText;
-
-	/**
-	 * @var string
-	 */
-	protected $description1;
-
-	/**
-	 * @var string
-	 */
-	protected $description2;
-
-	/**
-	 * Array keys are identifiers like "SVWZ" for the main description.
-	 * @var string[]
-	 */
-	protected $structuredDescription;
-
-	/**
-	 * @var string
-	 */
-	protected $bankCode;
-
-	/**
-	 * @var string
-	 */
-	protected $accountNumber;
-
-	/**
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * See https://www.bayernlb.de/internet/media/de/ir/downloads_1/zahlungsverkehr/formate_1/MT940_942.pdf page 451 / 8.2.6 Geschäftsvorfallcodes
-	 * @var string
-	 */
-	protected $transactionCode;
-
-	/**
-	 * Get booking date.
-	 *
-	 * @deprecated Use getBookingDate() instead
-	 * @codeCoverageIgnore
-	 * @return \DateTime|null
-	 */
-	public function getDate()
-	{
-		return $this->getBookingDate();
-	}
-
-	/**
-	 * Get booking date
-	 *
-	 * @return \DateTime|null
-	 */
-	public function getBookingDate()
-	{
-		return $this->bookingDate;
-	}
-
-	/**
-	 * Get date
-	 *
-	 * @return \DateTime|null
-	 */
-	public function getValutaDate()
-	{
-		return $this->valutaDate;
-	}
-
-	/**
-	 * Set booking date
-	 *
-	 * @param \DateTime|null $date
-	 *
-	 * @return $this
-	 */
-	public function setBookingDate(\DateTime $date = null)
-	{
-		$this->bookingDate = $date;
-
-		return $this;
-	}
-
-	/**
-	 * Set valuta date
-	 *
-	 * @param \DateTime|null $date
-	 *
-	 * @return $this
-	 */
-	public function setValutaDate(\DateTime $date = null)
-	{
-		$this->valutaDate = $date;
-
-		return $this;
-	}
-
-	/**
-	 * Get the signed amount based on credit/debit setting.
-	 * Debits and canceled credits have a negative sign.
-	 * @return float
-	 */
-	public function getSignedAmount()
-	{
-		switch ($this->creditDebit) {
-			case Transaction::CD_DEBIT:
-			case Transaction::CD_CREDIT_CANCELLATION:
-				return -1 * $this->amount;
-			default:
-				return $this->amount;
-		}
-	}
-
-	/**
-	 * Get amount
-	 *
-	 * @return float
-	 */
-	public function getAmount()
-	{
-		return $this->amount;
-	}
-
-	/**
-	 * Set amount
-	 *
-	 * @param float $amount
-	 *
-	 * @return $this
-	 */
-	public function setAmount($amount)
-	{
-		$this->amount = (float) $amount;
-
-		return $this;
-	}
-
-	/**
-	 * Get creditDebit
-	 *
-	 * @return string
-	 */
-	public function getCreditDebit()
-	{
-		return $this->creditDebit;
-	}
-
-	/**
-	 * Set creditDebit
-	 *
-	 * @param string $creditDebit
-	 *
-	 * @return $this
-	 */
-	public function setCreditDebit($creditDebit)
-	{
-		$this->creditDebit = $creditDebit;
-
-		return $this;
-	}
-
-	/**
-	 * Get bookingText
-	 *
-	 * @return string
-	 */
-	public function getBookingText()
-	{
-		return $this->bookingText;
-	}
-
-	/**
-	 * Set bookingText
-	 *
-	 * @param string $bookingText
-	 *
-	 * @return $this
-	 */
-	public function setBookingText($bookingText)
-	{
-		$this->bookingText = (string) $bookingText;
-
-		return $this;
-	}
-
-	/**
-	 * Get description1
-	 *
-	 * @return string
-	 */
-	public function getDescription1()
-	{
-		return $this->description1;
-	}
-
-	/**
-	 * Set description1
-	 *
-	 * @param string $description1
-	 *
-	 * @return $this
-	 */
-	public function setDescription1($description1)
-	{
-		$this->description1 = (string) $description1;
-
-		return $this;
-	}
-
-	/**
-	 * Get description2
-	 *
-	 * @return string
-	 */
-	public function getDescription2()
-	{
-		return $this->description2;
-	}
-
-	/**
-	 * Set description2
-	 *
-	 * @param string $description2
-	 *
-	 * @return $this
-	 */
-	public function setDescription2($description2)
-	{
-		$this->description2 = (string) $description2;
-
-		return $this;
-	}
-
-	/**
-	 * Get structuredDescription
-	 *
-	 * @return string[]
-	 */
-	public function getStructuredDescription()
-	{
-		return $this->structuredDescription;
-	}
-
-	/**
-	 * Set structuredDescription
-	 *
-	 * @param string[] $structuredDescription
-	 *
-	 * @return $this
-	 */
-	public function setStructuredDescription($structuredDescription)
-	{
-		$this->structuredDescription = $structuredDescription;
-
-		return $this;
-	}
-
-	/**
-	 * Get the main description (SVWZ)
-	 *
-	 * @return string
-	 */
-	public function getMainDescription()
-	{
-		if (array_key_exists('SVWZ', $this->structuredDescription)) {
-			return $this->structuredDescription['SVWZ'];
-		} else {
-			return '';
-		}
-	}
-
-	/**
-	 * Get bankCode
-	 *
-	 * @return string
-	 */
-	public function getBankCode()
-	{
-		return $this->bankCode;
-	}
-
-	/**
-	 * Set bankCode
-	 *
-	 * @param string $bankCode
-	 *
-	 * @return $this
-	 */
-	public function setBankCode($bankCode)
-	{
-		$this->bankCode = (string) $bankCode;
-
-		return $this;
-	}
-
-	/**
-	 * Get accountNumber
-	 *
-	 * @return string
-	 */
-	public function getAccountNumber()
-	{
-		return $this->accountNumber;
-	}
-
-	/**
-	 * Set accountNumber
-	 *
-	 * @param string $accountNumber
-	 *
-	 * @return $this
-	 */
-	public function setAccountNumber($accountNumber)
-	{
-		$this->accountNumber = (string) $accountNumber;
-
-		return $this;
-	}
-
-	/**
-	 * Get name
-	 *
-	 * @return string
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Set name
-	 *
-	 * @param string $name
-	 *
-	 * @return $this
-	 */
-	public function setName($name)
-	{
-		$this->name = (string) $name;
-
-		return $this;
-	}
-
-	/**
-	 * Get see https://www.bayernlb.de/internet/media/de/ir/downloads_1/zahlungsverkehr/formate_1/MT940_942.pdf page 451 / 8.2.6 Geschäftsvorfallcodes
-	 *
-	 * @return  string
-	 */
-	public function getTransactionCode()
-	{
-		return $this->transactionCode;
-	}
-
-	/**
-	 * Set see https://www.bayernlb.de/internet/media/de/ir/downloads_1/zahlungsverkehr/formate_1/MT940_942.pdf page 451 / 8.2.6 Geschäftsvorfallcodes
-	 *
-	 * @param  string  $transactionCode  See https://www.bayernlb.de/internet/media/de/ir/downloads_1/zahlungsverkehr/formate_1/MT940_942.pdf page 451 / 8.2.6 Geschäftsvorfallcodes
-	 *
-	 * @return  self
-	 */
-	public function setTransactionCode($transactionCode)
-	{
-		$this->transactionCode = $transactionCode;
-
-		return $this;
-	}
+    const CD_CREDIT = 'credit';
+    const CD_DEBIT = 'debit';
+    const CD_CREDIT_CANCELLATION = 'credit_cancellation';
+    const CD_DEBIT_CANCELLATION = 'debit_cancellation';
+
+    /**
+     * @var \DateTime|null
+     */
+    protected $bookingDate;
+
+    /**
+     * @var \DateTime|null
+     */
+    protected $valutaDate;
+
+    /**
+     * @var float
+     */
+    protected $amount;
+
+    /**
+     * @var string
+     */
+    protected $creditDebit;
+
+    /**
+     * @var string
+     */
+    protected $bookingText;
+
+    /**
+     * @var string
+     */
+    protected $description1;
+
+    /**
+     * @var string
+     */
+    protected $description2;
+
+    /**
+     * Array keys are identifiers like "SVWZ" for the main description.
+     * @var string[]
+     */
+    protected $structuredDescription;
+
+    /**
+     * @var string
+     */
+    protected $bankCode;
+
+    /**
+     * @var string
+     */
+    protected $accountNumber;
+
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * See https://www.bayernlb.de/internet/media/de/ir/downloads_1/zahlungsverkehr/formate_1/MT940_942.pdf page 451 / 8.2.6 Geschäftsvorfallcodes
+     * @var string
+     */
+    protected $transactionCode;
+
+    /**
+     * Get booking date.
+     *
+     * @deprecated Use getBookingDate() instead
+     * @codeCoverageIgnore
+     * @return \DateTime|null
+     */
+    public function getDate()
+    {
+        return $this->getBookingDate();
+    }
+
+    /**
+     * Get booking date
+     *
+     * @return \DateTime|null
+     */
+    public function getBookingDate()
+    {
+        return $this->bookingDate;
+    }
+
+    /**
+     * Get date
+     *
+     * @return \DateTime|null
+     */
+    public function getValutaDate()
+    {
+        return $this->valutaDate;
+    }
+
+    /**
+     * Set booking date
+     *
+     * @param \DateTime|null $date
+     *
+     * @return $this
+     */
+    public function setBookingDate(\DateTime $date = null)
+    {
+        $this->bookingDate = $date;
+
+        return $this;
+    }
+
+    /**
+     * Set valuta date
+     *
+     * @param \DateTime|null $date
+     *
+     * @return $this
+     */
+    public function setValutaDate(\DateTime $date = null)
+    {
+        $this->valutaDate = $date;
+
+        return $this;
+    }
+
+    /**
+     * Get the signed amount based on credit/debit setting.
+     * Debits and canceled credits have a negative sign.
+     * @return float
+     */
+    public function getSignedAmount()
+    {
+        switch ($this->creditDebit) {
+            case Transaction::CD_DEBIT:
+            case Transaction::CD_CREDIT_CANCELLATION:
+                return -1 * $this->amount;
+            default:
+                return $this->amount;
+        }
+    }
+
+    /**
+     * Get amount
+     *
+     * @return float
+     */
+    public function getAmount()
+    {
+        return $this->amount;
+    }
+
+    /**
+     * Set amount
+     *
+     * @param float $amount
+     *
+     * @return $this
+     */
+    public function setAmount($amount)
+    {
+        $this->amount = (float) $amount;
+
+        return $this;
+    }
+
+    /**
+     * Get creditDebit
+     *
+     * @return string
+     */
+    public function getCreditDebit()
+    {
+        return $this->creditDebit;
+    }
+
+    /**
+     * Set creditDebit
+     *
+     * @param string $creditDebit
+     *
+     * @return $this
+     */
+    public function setCreditDebit($creditDebit)
+    {
+        $this->creditDebit = $creditDebit;
+
+        return $this;
+    }
+
+    /**
+     * Get bookingText
+     *
+     * @return string
+     */
+    public function getBookingText()
+    {
+        return $this->bookingText;
+    }
+
+    /**
+     * Set bookingText
+     *
+     * @param string $bookingText
+     *
+     * @return $this
+     */
+    public function setBookingText($bookingText)
+    {
+        $this->bookingText = (string) $bookingText;
+
+        return $this;
+    }
+
+    /**
+     * Get description1
+     *
+     * @return string
+     */
+    public function getDescription1()
+    {
+        return $this->description1;
+    }
+
+    /**
+     * Set description1
+     *
+     * @param string $description1
+     *
+     * @return $this
+     */
+    public function setDescription1($description1)
+    {
+        $this->description1 = (string) $description1;
+
+        return $this;
+    }
+
+    /**
+     * Get description2
+     *
+     * @return string
+     */
+    public function getDescription2()
+    {
+        return $this->description2;
+    }
+
+    /**
+     * Set description2
+     *
+     * @param string $description2
+     *
+     * @return $this
+     */
+    public function setDescription2($description2)
+    {
+        $this->description2 = (string) $description2;
+
+        return $this;
+    }
+
+    /**
+     * Get structuredDescription
+     *
+     * @return string[]
+     */
+    public function getStructuredDescription()
+    {
+        return $this->structuredDescription;
+    }
+
+    /**
+     * Set structuredDescription
+     *
+     * @param string[] $structuredDescription
+     *
+     * @return $this
+     */
+    public function setStructuredDescription($structuredDescription)
+    {
+        $this->structuredDescription = $structuredDescription;
+
+        return $this;
+    }
+
+    /**
+     * Get the main description (SVWZ)
+     *
+     * @return string
+     */
+    public function getMainDescription()
+    {
+        if (array_key_exists('SVWZ', $this->structuredDescription)) {
+            return $this->structuredDescription['SVWZ'];
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Get bankCode
+     *
+     * @return string
+     */
+    public function getBankCode()
+    {
+        return $this->bankCode;
+    }
+
+    /**
+     * Set bankCode
+     *
+     * @param string $bankCode
+     *
+     * @return $this
+     */
+    public function setBankCode($bankCode)
+    {
+        $this->bankCode = (string) $bankCode;
+
+        return $this;
+    }
+
+    /**
+     * Get accountNumber
+     *
+     * @return string
+     */
+    public function getAccountNumber()
+    {
+        return $this->accountNumber;
+    }
+
+    /**
+     * Set accountNumber
+     *
+     * @param string $accountNumber
+     *
+     * @return $this
+     */
+    public function setAccountNumber($accountNumber)
+    {
+        $this->accountNumber = (string) $accountNumber;
+
+        return $this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set name
+     *
+     * @param string $name
+     *
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->name = (string) $name;
+
+        return $this;
+    }
+
+    /**
+     * Get see https://www.bayernlb.de/internet/media/de/ir/downloads_1/zahlungsverkehr/formate_1/MT940_942.pdf page 451 / 8.2.6 Geschäftsvorfallcodes
+     *
+     * @return  string
+     */
+    public function getTransactionCode()
+    {
+        return $this->transactionCode;
+    }
+
+    /**
+     * Set see https://www.bayernlb.de/internet/media/de/ir/downloads_1/zahlungsverkehr/formate_1/MT940_942.pdf page 451 / 8.2.6 Geschäftsvorfallcodes
+     *
+     * @param  string  $transactionCode  See https://www.bayernlb.de/internet/media/de/ir/downloads_1/zahlungsverkehr/formate_1/MT940_942.pdf page 451 / 8.2.6 Geschäftsvorfallcodes
+     *
+     * @return  self
+     */
+    public function setTransactionCode($transactionCode)
+    {
+        $this->transactionCode = $transactionCode;
+
+        return $this;
+    }
 }

lib/Fhp/Model/StatementOfAccount/Statement.php

Indentation +132 added lines, -132 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;
+    }
 }

lib/Fhp/Parser/MT940.php

Indentation +231 added lines, -231 removed lines

@@ -10,235 +10,235 @@
  */
 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];

lib/Tests/Fhp/Model/StatementOfAccount/TransactionTest.php

Indentation +34 added lines, -34 removed lines

@@ -6,41 +6,41 @@
 
 class TransactionTest extends \PHPUnit_Framework_TestCase
 {
-	public function test_getter_and_setter()
-	{
-		$obj = new Transaction();
+    public function test_getter_and_setter()
+    {
+        $obj = new Transaction();
 
-		$this->assertNull($obj->getAccountNumber());
-		$this->assertNull($obj->getAmount());
-		$this->assertNull($obj->getBankCode());
-		$this->assertNull($obj->getBookingDate());
-		$this->assertNull($obj->getBookingText());
-		$this->assertNull($obj->getCreditDebit());
-		$this->assertNull($obj->getDescription1());
-		$this->assertNull($obj->getDescription2());
-		$this->assertNull($obj->getName());
-		$this->assertNull($obj->getValutaDate());
+        $this->assertNull($obj->getAccountNumber());
+        $this->assertNull($obj->getAmount());
+        $this->assertNull($obj->getBankCode());
+        $this->assertNull($obj->getBookingDate());
+        $this->assertNull($obj->getBookingText());
+        $this->assertNull($obj->getCreditDebit());
+        $this->assertNull($obj->getDescription1());
+        $this->assertNull($obj->getDescription2());
+        $this->assertNull($obj->getName());
+        $this->assertNull($obj->getValutaDate());
 
-		$date = new \DateTime();
-		$this->assertSame('123456789', $obj->setAccountNumber('123456789')->getAccountNumber());
-		$this->assertSame(20.00, $obj->setAmount(20.00)->getAmount());
-		$this->assertSame('123456789', $obj->setBankCode('123456789')->getBankCode());
-		$this->assertSame($date, $obj->setBookingDate($date)->getBookingDate());
-		$this->assertSame($date, $obj->setValutaDate($date)->getValutaDate());
-		$this->assertSame('text', $obj->setBookingText('text')->getBookingText());
-		$this->assertSame(Transaction::CD_DEBIT, $obj->setCreditDebit(Transaction::CD_DEBIT)->getCreditDebit());
-		$this->assertSame(Transaction::CD_CREDIT, $obj->setCreditDebit(Transaction::CD_CREDIT)->getCreditDebit());
-		$this->assertSame('desc1', $obj->setDescription1('desc1')->getDescription1());
-		$this->assertSame('desc2', $obj->setDescription2('desc2')->getDescription2());
-		$this->assertSame('name', $obj->setName('name')->getName());
-	}
+        $date = new \DateTime();
+        $this->assertSame('123456789', $obj->setAccountNumber('123456789')->getAccountNumber());
+        $this->assertSame(20.00, $obj->setAmount(20.00)->getAmount());
+        $this->assertSame('123456789', $obj->setBankCode('123456789')->getBankCode());
+        $this->assertSame($date, $obj->setBookingDate($date)->getBookingDate());
+        $this->assertSame($date, $obj->setValutaDate($date)->getValutaDate());
+        $this->assertSame('text', $obj->setBookingText('text')->getBookingText());
+        $this->assertSame(Transaction::CD_DEBIT, $obj->setCreditDebit(Transaction::CD_DEBIT)->getCreditDebit());
+        $this->assertSame(Transaction::CD_CREDIT, $obj->setCreditDebit(Transaction::CD_CREDIT)->getCreditDebit());
+        $this->assertSame('desc1', $obj->setDescription1('desc1')->getDescription1());
+        $this->assertSame('desc2', $obj->setDescription2('desc2')->getDescription2());
+        $this->assertSame('name', $obj->setName('name')->getName());
+    }
 	
-	public function test_get_signed_amount()
-	{
-		$obj = new Transaction();
-		$this->assertSame(-20.00, $obj->setCreditDebit(Transaction::CD_DEBIT)->setAmount(20.00)->getSignedAmount());
-		$this->assertSame(-20.00, $obj->setCreditDebit(Transaction::CD_CREDIT_CANCELLATION)->setAmount(20.00)->getSignedAmount());
-		$this->assertSame(20.00, $obj->setCreditDebit(Transaction::CD_CREDIT)->setAmount(20.00)->getSignedAmount());
-		$this->assertSame(20.00, $obj->setCreditDebit(Transaction::CD_DEBIT_CANCELLATION)->setAmount(20.00)->getSignedAmount());
-	}
+    public function test_get_signed_amount()
+    {
+        $obj = new Transaction();
+        $this->assertSame(-20.00, $obj->setCreditDebit(Transaction::CD_DEBIT)->setAmount(20.00)->getSignedAmount());
+        $this->assertSame(-20.00, $obj->setCreditDebit(Transaction::CD_CREDIT_CANCELLATION)->setAmount(20.00)->getSignedAmount());
+        $this->assertSame(20.00, $obj->setCreditDebit(Transaction::CD_CREDIT)->setAmount(20.00)->getSignedAmount());
+        $this->assertSame(20.00, $obj->setCreditDebit(Transaction::CD_DEBIT_CANCELLATION)->setAmount(20.00)->getSignedAmount());
+    }
 }