Regroup some code under namespaces

Move ParserException to Exception namespace Regroup Money Parsers Regroup formatters Fix namespace Fix exceptions in tests
moneyphp · Feb 3, 2016 · 3a685f1 · 3a685f1
1 parent 9966de0
commit 3a685f1
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 33 deletions.
diff --git a/src/Exception/ParserException.php b/src/Exception/ParserException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Money\Exception;
+
+/**
+ * Thrown when a string cannot be parsed to a Money object.
+ *
+ * @author Frederik Bosch <f.bosch@genkgo.nl>
+ */
+final class ParserException extends \Exception
+{
+}
diff --git a/src/IntlMoneyFormatter.php → src/Formatter/IntlMoneyFormatter.php b/src/IntlMoneyFormatter.php → src/Formatter/IntlMoneyFormatter.php
@@ -1,6 +1,9 @@
 <?php
 
-namespace Money;
+namespace Money\Formatter;
+
+use Money\Money;
+use Money\MoneyFormatter;
 
 /**
  * Formats a Money object using intl extension.
@@ -37,6 +40,7 @@ public function format(Money $money)
 
         $fractionDigits = $this->formatter->getAttribute(\NumberFormatter::FRACTION_DIGITS);
         $valueLength = strlen($valueBase);
+
         if ($valueLength > $fractionDigits) {
             $subunits = substr($valueBase, 0, $valueLength - $fractionDigits).'.';
             $subunits .= substr($valueBase, $valueLength - $fractionDigits);

diff --git a/src/MoneyParser.php b/src/MoneyParser.php
@@ -2,15 +2,22 @@
 
 namespace Money;
 
+/**
+ * Parses a string into a Money object.
+ *
+ * @author Frederik Bosch <f.bosch@genkgo.nl>
+ */
 interface MoneyParser
 {
     /**
-     * @param $formattedMoney
-     * @param null $forceCurrency
+     * Parses a string into a Money object (including currency).
+     *
+     * @param string      $money
+     * @param string|null $forceCurrency
      *
      * @return Money
      *
-     * @throws ParserException
+     * @throws Exception\ParserException
      */
-    public function parse($formattedMoney, $forceCurrency = null);
+    public function parse($money, $forceCurrency = null);
 }
diff --git a/src/IntlMoneyParser.php → src/Parser/IntlMoneyParser.php b/src/IntlMoneyParser.php → src/Parser/IntlMoneyParser.php
@@ -1,6 +1,11 @@
 <?php
 
-namespace Money;
+namespace Money\Parser;
+
+use Money\Currency;
+use Money\Exception\ParserException;
+use Money\Money;
+use Money\MoneyParser;
 
 /**
  * Parses a string into a Money object using intl extension.
@@ -25,16 +30,18 @@ public function __construct(\NumberFormatter $formatter)
     /**
      * {@inheritdoc}
      */
-    public function parse($formattedMoney, $forceCurrency = null)
+    public function parse($money, $forceCurrency = null)
     {
-        $decimal = $this->formatter->parseCurrency($formattedMoney, $currency);
+        $decimal = $this->formatter->parseCurrency($money, $currency);
+
         if ($decimal === false) {
             throw new ParserException(
-                'Cannot parse '.$formattedMoney.' to Money. '.$this->formatter->getErrorMessage()
+                'Cannot parse '.$money.' to Money. '.$this->formatter->getErrorMessage()
             );
         }
 
         $decimal = (string) $decimal;
+
         if (strpos($decimal, '.') !== false) {
             $decimal = str_replace('.', '', $decimal);
         } else {
@@ -48,7 +55,7 @@ public function parse($formattedMoney, $forceCurrency = null)
         }
 
         if ($forceCurrency === null) {
-            return new Money($decimal, new Currency($currency));
+            $forceCurrency = $currency;
         }
 
         return new Money($decimal, new Currency($forceCurrency));

diff --git a/src/StringToUnitsParser.php → src/Parser/StringToUnitsParser.php b/src/StringToUnitsParser.php → src/Parser/StringToUnitsParser.php
@@ -1,7 +1,17 @@
 <?php
 
-namespace Money;
+namespace Money\Parser;
 
+use Money\Currency;
+use Money\Exception\ParserException;
+use Money\Money;
+use Money\MoneyParser;
+
+/**
+ * Parses a string into a Money object regular expressions.
+ *
+ * @author Frederik Bosch <f.bosch@genkgo.nl>
+ */
 final class StringToUnitsParser implements MoneyParser
 {
     /**

diff --git a/src/ParserException.php b/src/ParserException.php
diff --git a/tests/MoneyFormatterTest.php → tests/Formatter/IntlMoneyFormatterTest.php b/tests/MoneyFormatterTest.php → tests/Formatter/IntlMoneyFormatterTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Money;
+namespace Tests\Money\Formatter;
 
 use Money\Currency;
-use Money\IntlMoneyFormatter;
+use Money\Formatter\IntlMoneyFormatter;
 use Money\Money;
 
-final class MoneyFormatterTest extends \PHPUnit_Framework_TestCase
+class IntlMoneyFormatterTest extends \PHPUnit_Framework_TestCase
 {
     public function testRoundMoney()
     {

diff --git a/tests/IntlMoneyParserTest.php → tests/Parser/IntlMoneyParserTest.php b/tests/IntlMoneyParserTest.php → tests/Parser/IntlMoneyParserTest.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace Tests\Money;
+namespace Tests\Money\Parser;
 
-use Money\IntlMoneyParser;
+use Money\Parser\IntlMoneyParser;
 
-final class IntlMoneyParserTest extends \PHPUnit_Framework_TestCase
+class IntlMoneyParserTest extends \PHPUnit_Framework_TestCase
 {
-
     public static function provideFormattedMoney()
     {
         return [
@@ -42,10 +41,11 @@ public function testIntlParser($string, $units)
         $this->assertEquals($units, $parser->parse($string, 'USD')->getAmount());
     }
 
+    /**
+     * @expectedException \Money\Exception\ParserException
+     */
     public function testCannotConvertStringToUnits()
     {
-        $this->setExpectedException('Money\\ParserException');
-
         $formatter = new \NumberFormatter('en_US', \NumberFormatter::CURRENCY);
         $formatter->setPattern("¤#,##0.00;-¤#,##0.00");
 

diff --git a/tests/StringsToUnitParserTest.php → tests/Parser/StringsToUnitParserTest.php b/tests/StringsToUnitParserTest.php → tests/Parser/StringsToUnitParserTest.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace Tests\Money;
+namespace Tests\Money\Parser;
 
-use Money\StringToUnitsParser;
+use Money\Parser\StringToUnitsParser;
 
 final class StringsToUnitParserTest extends \PHPUnit_Framework_TestCase
 {
-
     public static function provideStrings()
     {
         return [
@@ -36,6 +35,7 @@ public static function provideStrings()
     public function testStringToUnits($string, $units)
     {
         $parser = new StringToUnitsParser();
+
         $this->assertEquals($units, $parser->parse($string, 'USD')->getAmount());
     }
 
@@ -45,15 +45,17 @@ public function testStringToUnits($string, $units)
     public function testCannotConvertStringToUnits()
     {
         $parser = new StringToUnitsParser();
+
         $parser->parse('THIS_IS_NOT_CONVERTABLE_TO_UNIT', 'USD');
     }
 
+    /**
+     * @expectedException \Money\Exception\ParserException
+     */
     public function testCannotConvertStringToUnitsWithoutCurrency()
     {
-        $this->setExpectedException('Money\\ParserException');
-
         $parser = new StringToUnitsParser();
+
         $parser->parse('$ 100');
     }
-
 }