Merge branch 'master' into dev-filefilessize

src/Exception/ExceptionInterface.php

@@ -10,4 +10,5 @@
 namespace Zend\I18n\Exception;
 
 interface ExceptionInterface
-{}
+{
+}

src/Exception/ExtensionNotLoadedException.php

@@ -11,6 +11,6 @@
 
 use DomainException;
 
-class ExtensionNotLoadedException extends DomainException implements
-    ExceptionInterface
-{}
+class ExtensionNotLoadedException extends DomainException implements ExceptionInterface
+{
+}

src/Exception/InvalidArgumentException.php

@@ -9,6 +9,6 @@
 
 namespace Zend\I18n\Exception;
 
-class InvalidArgumentException extends \InvalidArgumentException implements
-    ExceptionInterface
-{}
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}

src/Exception/OutOfBoundsException.php

@@ -9,6 +9,6 @@
 
 namespace Zend\I18n\Exception;
 
-class OutOfBoundsException extends \OutOfBoundsException implements
-    ExceptionInterface
-{}
+class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
+{
+}

src/Exception/ParseException.php

@@ -10,4 +10,5 @@
 namespace Zend\I18n\Exception;
 
 class ParseException extends RuntimeException implements ExceptionInterface
-{}
+{
+}

src/Exception/RangeException.php

@@ -10,4 +10,5 @@
 namespace Zend\I18n\Exception;
 
 class RangeException extends \RangeException implements ExceptionInterface
-{}
+{
+}

src/Exception/RuntimeException.php

@@ -10,4 +10,5 @@
 namespace Zend\I18n\Exception;
 
 class RuntimeException extends \RuntimeException implements ExceptionInterface
-{}
+{
+}

src/Filter/NumberFormat.php

@@ -13,7 +13,6 @@
 
 class NumberFormat extends NumberParse
 {
-
     /**
      * Defined by Zend\Filter\FilterInterface
      *

src/Filter/NumberParse.php

@@ -131,7 +131,6 @@ public function getFormatter()
         return $this->formatter;
     }
 
-
     /**
      * Defined by Zend\Filter\FilterInterface
      *

src/Translator/Loader/Ini.php

@@ -45,7 +45,7 @@ public function load($locale, $filename)
 
         $list = $messagesNamespaced;
         if (isset($messagesNamespaced['translation'])) {
-           $list = $messagesNamespaced['translation'];
+            $list = $messagesNamespaced['translation'];
         }
 
         foreach ($list as $message) {

src/Translator/Loader/PhpMemoryArray.php

@@ -40,23 +40,20 @@ public function __construct($messages)
     public function load($locale, $textDomain)
     {
         if (!is_array($this->messages)) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Expected an array, but received %s',
-                gettype($this->messages)
-            ));
+            throw new Exception\InvalidArgumentException(
+                sprintf('Expected an array, but received %s', gettype($this->messages))
+            );
         }
 
         if (!isset($this->messages[$textDomain])) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Expected textdomain "%s" to be an array, but it is not set',
-                $textDomain)
+            throw new Exception\InvalidArgumentException(
+                sprintf('Expected textdomain "%s" to be an array, but it is not set', $textDomain)
             );
         }
 
         if (!isset($this->messages[$textDomain][$locale])) {
-            throw new Exception\InvalidArgumentException(sprintf(
-                'Expected locale "%s" to be an array, but it is not set',
-                $locale)
+            throw new Exception\InvalidArgumentException(
+                sprintf('Expected locale "%s" to be an array, but it is not set', $locale)
             );
         }
 

src/Translator/Plural/Parser.php

@@ -264,10 +264,9 @@ public function expression($rightBindingPower = 0)
     public function advance($id = null)
     {
         if ($id !== null && $this->currentToken->id !== $id) {
-            throw new Exception\ParseException(sprintf(
-                'Expected token with id %s but received %s',
-                $id, $this->currentToken->id
-            ));
+            throw new Exception\ParseException(
+                sprintf('Expected token with id %s but received %s', $id, $this->currentToken->id)
+            );
         }
 
         $this->currentToken = $this->getNextToken();

src/Translator/Plural/Rule.php

@@ -62,10 +62,9 @@ public function evaluate($number)
         $result = $this->evaluateAstPart($this->ast, abs((int) $number));
 
         if ($result < 0 || $result >= $this->numPlurals) {
-            throw new Exception\RangeException(sprintf(
-                'Calculated result %s is between 0 and %d',
-                $result, ($this->numPlurals - 1)
-            ));
+            throw new Exception\RangeException(
+                sprintf('Calculated result %s is between 0 and %d', $result, ($this->numPlurals - 1))
+            );
         }
 
         return $result;

src/Translator/Plural/Symbol.php

@@ -132,9 +132,7 @@ public function setLeftDenotationGetter(Closure $getter)
     public function getNullDenotation()
     {
         if ($this->nullDenotationGetter === null) {
-            throw new Exception\ParseException(sprintf(
-                'Syntax error: %s', $this->id
-            ));
+            throw new Exception\ParseException(sprintf('Syntax error: %s', $this->id));
         }
 
         /** @var callable $function  */
@@ -152,9 +150,7 @@ public function getNullDenotation()
     public function getLeftDenotation($left)
     {
         if ($this->leftDenotationGetter === null) {
-            throw new Exception\ParseException(sprintf(
-                'Unknown operator: %s', $this->id
-            ));
+            throw new Exception\ParseException(sprintf('Unknown operator: %s', $this->id));
         }
 
         /** @var callable $function  */

src/Translator/Translator.php

@@ -408,9 +408,9 @@ public function translatePlural(
                       ->evaluate($number);
 
         if (!isset($translation[$index])) {
-            throw new Exception\OutOfBoundsException(sprintf(
-                'Provided index %d does not exist in plural array', $index
-            ));
+            throw new Exception\OutOfBoundsException(
+                sprintf('Provided index %d does not exist in plural array', $index)
+            );
         }
 
         return $translation[$index];

src/Translator/TranslatorAwareInterface.php

@@ -66,5 +66,4 @@ public function setTranslatorTextDomain($textDomain = 'default');
      * @return string
      */
     public function getTranslatorTextDomain();
-
 }

src/Validator/Float.php

@@ -162,6 +162,8 @@ public function isValid($value)
 
         //We have seperators, and they are flipped. i.e. 2.000,000 for en-US
         if ($groupSeparatorPosition && $decSeparatorPosition && $groupSeparatorPosition > $decSeparatorPosition) {
+            $this->error(self::NOT_FLOAT);
+
             return false;
         }
 
@@ -237,6 +239,8 @@ public function isValid($value)
             return true;
         }
 
+        $this->error(self::NOT_FLOAT);
+
         return false;
     }
 }

src/Validator/PhoneNumber.php

@@ -16,7 +16,6 @@
 
 class PhoneNumber extends AbstractValidator
 {
-
     const NO_MATCH    = 'phoneNumberNoMatch';
     const UNSUPPORTED = 'phoneNumberUnsupported';
     const INVALID     = 'phoneNumberInvalid';

src/View/Helper/CurrencyFormat.php

@@ -81,8 +81,8 @@ public function __invoke(
         $number,
         $currencyCode = null,
         $showDecimals = null,
-        $locale       = null,
-        $pattern      = null
+        $locale = null,
+        $pattern = null
     ) {
         if (null === $locale) {
             $locale = $this->getLocale();
@@ -136,9 +136,7 @@ protected function formatCurrency(
             $this->formatters[$formatterId]->setAttribute(NumberFormatter::FRACTION_DIGITS, 0);
         }
 
-        return $this->formatters[$formatterId]->formatCurrency(
-            $number, $currencyCode
-        );
+        return $this->formatters[$formatterId]->formatCurrency($number, $currencyCode);
     }
 
     /**
@@ -163,7 +161,6 @@ public function getCurrencyCode()
         return $this->currencyCode;
     }
 
-
     /**
      * Set the currency pattern
      *

src/View/Helper/DateFormat.php

@@ -68,8 +68,8 @@ public function __invoke(
         $date,
         $dateType = IntlDateFormatter::NONE,
         $timeType = IntlDateFormatter::NONE,
-        $locale   = null,
-        $pattern  = null
+        $locale = null,
+        $pattern = null
     ) {
         if ($locale === null) {
             $locale = $this->getLocale();

src/View/Helper/NumberFormat.php

@@ -80,9 +80,9 @@ public function __construct()
     public function __invoke(
         $number,
         $formatStyle = null,
-        $formatType  = null,
-        $locale      = null,
-        $decimals    = null
+        $formatType = null,
+        $locale = null,
+        $decimals = null
     ) {
         if (null === $locale) {
             $locale = $this->getLocale();

src/View/Helper/TranslatePlural.php

@@ -33,8 +33,7 @@ public function __invoke(
         $number,
         $textDomain = null,
         $locale = null
-    )
-    {
+    ) {
         $translator = $this->getTranslator();
         if (null === $translator) {
             throw new Exception\RuntimeException('Translator has not been set');

test/Filter/AlphaTest.php

@@ -135,7 +135,8 @@ public function testAllowWhiteSpace()
                 "\n"       => "\n",
                 " \t "     => " \t "
             );
-        } if (self::$meansEnglishAlphabet) {
+        }
+        if (self::$meansEnglishAlphabet) {
             //The Alphabet means english alphabet.
             $valuesExpected = array(
                 'a B'    => 'a B',
@@ -197,5 +198,4 @@ public function testReturnUnfiltered($input)
 
         $this->assertEquals($input,  $filter->filter($input));
     }
-
 }

test/Validator/FloatTest.php

@@ -220,4 +220,16 @@ public function testEqualsMessageTemplates()
         $validator = $this->validator;
         $this->assertAttributeEquals($validator->getOption('messageTemplates'), 'messageTemplates', $validator);
     }
+
+    /**
+     * @group 6647
+     * @group 6648
+     */
+    public function testNotFloat()
+    {
+        $this->assertFalse($this->validator->isValid('2.000.000,00'));
+
+        $message = $this->validator->getMessages();
+        $this->assertContains('does not appear to be a float', $message['notFloat']);
+    }
 }