Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'cs/zendframework/zendframework#6872-php-cs-fixer-automa…
Browse files Browse the repository at this point in the history
  • Loading branch information
Ocramius committed Nov 14, 2014
171 parents ea0aebf + 63cc2ee + 740abb6 + 9b5478d + 91a23e2 + 8649d44 + 3f353b0 + d340adb + 1e0e8f4 + 5c4289e + fb94cca + 2a3844c + 906bbcf + 3d9b8bb + 84844ae + 62fc651 + b0a3dd4 + 0dca0ef + 910bbbf + e574b9b + f30ec7d + 1fa84de + 41b8543 + 9e2c9d5 + 913f51c + 39924f3 + c2a11e1 + 61b9322 + 413a38b + e51b2b8 + 20e328b + 6437ec0 + e9b8476 + 95e54a0 + 7ea3aed + df6a706 + a82fc82 + 7c2a059 + 4fefb53 + 599ee3a + ea3fc65 + f6c04c2 + 6591e3d + a4f76e3 + 33c7531 + 2d59782 + 8152327 + e56ce9b + db9b18f + b88635a + a262823 + b79aef6 + c2284e4 + 70193eb + 96acf77 + 9675426 + 5f02411 + 0dafea7 + 15dc674 + 4a2447d + e6eb7f3 + e9499c5 + 272b15f + 11c7758 + 6f0e918 + 5f4980a + ecca95a + 88b5971 + ecb8d13 + 9de1c08 + 44aad17 + 13269e9 + 654cdb6 + dc708db + 380ffba + ff67e7f + fe2e025 + 95f0efa + 68cc4b3 + bf13b96 + 8870381 + 56480f4 + 1fa90d7 + 5c7fe1f + abe9bc1 + a33cacd + cdd7d9f + 6a261b1 + 5e594c4 + 01c1241 + 30d1dd2 + d4af079 + c9aa9b4 + 10f47ca + ef20fa1 + 2187ae2 + e7f3993 + db93d37 + aa57612 + 4af81d8 + 2f90998 + 3013404 + 69d83fe + f383ca9 + 1b26f48 + 054f09d + 0c86829 + f22d81a + e7ebffe + 72a7a54 + cc09223 + ab99f58 + 2c69e37 + b6ccfbc + b92a5da + 773a133 + 9ee28ff + 5865e20 + 63c7303 + 73371d0 + b96f402 + b36e36b + 60fa081 + a1d27a6 + 43e9240 + 9e59ae6 + be1ce44 + 5a6465d + 7e455b4 + 83d837e + 28bc01e + 215be48 + efcc8e0 + 5192ae6 + 7e1ba0f + dec8ccf + 94afc0f + 8c3ea5f + d680762 + 9092473 + 041fc63 + ea6499d + 1f59300 + a75142b + f592cc2 + f523aef + 2d12221 + 34ad758 + 23cc229 + 1fa15a0 + 6b74fc7 + 44b0196 + 4cf13fa + 26a1d46 + 712a04b + 4dbc11a + c99b627 + 1472e82 + d816ccc + 7b26586 + 08d26c4 + a5cc444 + fe92acf + 6bd67b2 + 371ba41 + 2dc7154 + 2902dd7 + aecaa35 + fe40c59 + 434b5df + bc1c6ac commit 3d149b3
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 15 deletions.
3 changes: 2 additions & 1 deletion src/Exception/ExceptionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
namespace Zend\I18n\Exception;

interface ExceptionInterface
{}
{
}
3 changes: 2 additions & 1 deletion src/Exception/ExtensionNotLoadedException.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@

class ExtensionNotLoadedException extends DomainException implements
ExceptionInterface
{}
{
}
3 changes: 2 additions & 1 deletion src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@

class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
{}
{
}
3 changes: 2 additions & 1 deletion src/Exception/OutOfBoundsException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@

class OutOfBoundsException extends \OutOfBoundsException implements
ExceptionInterface
{}
{
}
3 changes: 2 additions & 1 deletion src/Exception/ParseException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
namespace Zend\I18n\Exception;

class ParseException extends RuntimeException implements ExceptionInterface
{}
{
}
3 changes: 2 additions & 1 deletion src/Exception/RangeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
namespace Zend\I18n\Exception;

class RangeException extends \RangeException implements ExceptionInterface
{}
{
}
3 changes: 2 additions & 1 deletion src/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
namespace Zend\I18n\Exception;

class RuntimeException extends \RuntimeException implements ExceptionInterface
{}
{
}
1 change: 0 additions & 1 deletion src/Filter/NumberFormat.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

class NumberFormat extends NumberParse
{

/**
* Defined by Zend\Filter\FilterInterface
*
Expand Down
2 changes: 1 addition & 1 deletion src/Translator/Loader/Ini.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion src/Translator/TranslatorAwareInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,4 @@ public function setTranslatorTextDomain($textDomain = 'default');
* @return string
*/
public function getTranslatorTextDomain();

}
1 change: 0 additions & 1 deletion src/Validator/PhoneNumber.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

class PhoneNumber extends AbstractValidator
{

const NO_MATCH = 'phoneNumberNoMatch';
const UNSUPPORTED = 'phoneNumberUnsupported';
const INVALID = 'phoneNumberInvalid';
Expand Down
3 changes: 1 addition & 2 deletions src/View/Helper/TranslatePlural.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions test/Filter/AlphaTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -197,5 +198,4 @@ public function testReturnUnfiltered($input)

$this->assertEquals($input, $filter->filter($input));
}

}

0 comments on commit 3d149b3

Please sign in to comment.