Skip to content

Commit

Permalink
Merge f47a611 into 87ac1f7
Browse files Browse the repository at this point in the history
  • Loading branch information
slavcodev committed Feb 18, 2020
2 parents 87ac1f7 + f47a611 commit 6389dea
Show file tree
Hide file tree
Showing 6 changed files with 173 additions and 124 deletions.
238 changes: 139 additions & 99 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -1,105 +1,145 @@
<?php
/**
* This source file is proprietary and part of Rebilly.
*
* (c) Rebilly SRL
* Rebilly Ltd.
* Rebilly Inc.
*
* @see https://www.rebilly.com
*/

$config = PhpCsFixer\Config::create()
declare(strict_types=1);

$header = <<<'EOF'
This source file is proprietary and part of Rebilly.
(c) Rebilly SRL
Rebilly Ltd.
Rebilly Inc.
@see https://www.rebilly.com
EOF;

return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
'@PSR2' => true,
// '@PHP56Migration' => true,
// '@PHPUnit60Migration:risky' => true,
// '@Symfony' => true,
// '@Symfony:risky' => true,
// 'align_multiline_comment' => true,
'array_syntax' => ['syntax' => 'short'],
'blank_line_before_statement' => true,
'binary_operator_spaces' => true,
'cast_spaces' => true,
'class_attributes_separation' => true,
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'compact_nullable_typehint' => true,
'concat_space' => ['spacing' => 'one'],
// 'heredoc_to_nowdoc' => true,
'general_phpdoc_annotation_remove' => ['annotations' => ['author', 'version']],
'list_syntax' => ['syntax' => 'short'],
'lowercase_cast' => true,
'magic_constant_casing' => true,
'mb_str_functions' => true,
'method_argument_space' => ['ensure_fully_multiline' => true],
'modernize_types_casting' => true,
'native_function_casing' => true,
'new_with_braces' => true,
'no_empty_comment' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_consecutive_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
'no_homoglyph_names' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_mixed_echo_print' => true,
'no_multiline_whitespace_around_double_arrow' => true,
'no_null_property_initialization' => true,
'no_short_echo_tag' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_spaces_around_offset' => true,
'no_superfluous_elseif' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_unneeded_control_parentheses' => true,
'no_unneeded_curly_braces' => true,
'no_unneeded_final_method' => true,
'no_unreachable_default_argument_value' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'normalize_index_brace' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
// 'php_unit_strict' => true,
// 'php_unit_test_class_requires_covers' => true,
'phpdoc_add_missing_param_annotation' => true,
'phpdoc_order' => true,
'phpdoc_types_order' => true,
'protected_to_private' => true,
'return_type_declaration' => true,
'self_accessor' => true,
// 'semicolon_after_instruction' => false,
'semicolon_after_instruction' => true,
'short_scalar_cast' => true,
'single_line_comment_style' => true,
'single_quote' => true,
'standardize_not_equals' => true,
'strict_comparison' => true,
'strict_param' => true,
'ternary_operator_spaces' => true,
'ternary_to_null_coalescing' => true,
'trailing_comma_in_multiline_array' => true,
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
'visibility_required' => ['property', 'method', 'const'],
'void_return' => true,
'yoda_style' => ['equal' => false, 'identical' => false],
'object_operator_without_whitespace' => true,
])
->setRules(
[
'@PSR2' => true,
'array_syntax' => ['syntax' => 'short'],
'binary_operator_spaces' => true,
'blank_line_before_statement' => true,
'cast_spaces' => true,
'class_attributes_separation' => true,
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'compact_nullable_typehint' => true,
'concat_space' => ['spacing' => 'one'],
'declare_equal_normalize' => ['space' => 'none'],
// 'declare_strict_types' => true,
'dir_constant' => true,
'ereg_to_preg' => true,
'explicit_indirect_variable' => true,
'explicit_string_variable' => true,
'general_phpdoc_annotation_remove' => ['annotations' => ['author', 'version']],
'global_namespace_import' => [
'import_classes' => true,
'import_constants' => true,
'import_functions' => true,
],
// 'header_comment' => [
// 'header' => $header,
// 'commentType' => 'PHPDoc',
// 'separate' => 'bottom',
// 'location' => 'after_open',
// ],
'heredoc_to_nowdoc' => true,
'increment_style' => ['style' => 'pre'],
'list_syntax' => ['syntax' => 'short'],
'lowercase_cast' => true,
'magic_constant_casing' => true,
'mb_str_functions' => true,
'method_argument_space' => ['ensure_fully_multiline' => true],
'method_chaining_indentation' => true,
'modernize_types_casting' => true,
'native_function_casing' => true,
// 'native_function_invocation' => true,
'new_with_braces' => true,
'no_alias_functions' => true,
'no_blank_lines_after_class_opening' => true,
'no_blank_lines_after_phpdoc' => true,
'no_empty_comment' => true,
'no_empty_phpdoc' => true,
'no_empty_statement' => true,
'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
'no_homoglyph_names' => true,
'no_leading_import_slash' => true,
'no_leading_namespace_whitespace' => true,
'no_mixed_echo_print' => true,
'no_multiline_whitespace_around_double_arrow' => true,
'no_null_property_initialization' => true,
'no_php4_constructor' => true,
'no_short_bool_cast' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_spaces_around_offset' => true,
'no_superfluous_elseif' => true,
'no_trailing_comma_in_singleline_array' => true,
'no_unneeded_control_parentheses' => true,
'no_unneeded_curly_braces' => true,
'no_unneeded_final_method' => true,
'no_unreachable_default_argument_value' => true,
'no_unused_imports' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'no_whitespace_before_comma_in_array' => true,
'no_whitespace_in_blank_line' => true,
'normalize_index_brace' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'php_unit_construct' => true,
'php_unit_dedicate_assert' => true,
'php_unit_expectation' => true,
'php_unit_mock' => true,
'php_unit_namespaced' => true,
'php_unit_no_expectation_annotation' => true,
'php_unit_strict' => true,
'php_unit_test_annotation' => ['style' => 'prefix'],
'phpdoc_add_missing_param_annotation' => true,
// Temporary disabled because @inheritdoc can be explicit inheritance tag now
// see: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/2619
// 'phpdoc_inline_tag' => true,
'phpdoc_no_access' => true,
'phpdoc_no_alias_tag' => true,
'phpdoc_no_empty_return' => true,
'phpdoc_no_package' => true,
'phpdoc_no_useless_inheritdoc' => true,
'phpdoc_order' => true,
'phpdoc_separation' => true,
'phpdoc_types_order' => true,
'phpdoc_var_without_name' => true,
'pow_to_exponentiation' => true,
'protected_to_private' => true,
'random_api_migration' => true,
'return_type_declaration' => true,
'self_accessor' => true,
'semicolon_after_instruction' => true,
'short_scalar_cast' => true,
'single_blank_line_before_namespace' => true,
'single_line_comment_style' => true,
'single_quote' => true,
'standardize_not_equals' => true,
'strict_comparison' => true,
'strict_param' => true,
'ternary_to_null_coalescing' => true,
'trailing_comma_in_multiline_array' => true,
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
'yoda_style' => false,
'object_operator_without_whitespace' => true,
]
)
->setFinder(
PhpCsFixer\Finder::create()
->exclude('vendor')
->in(__DIR__)
->exclude(['vendor', 'src/views'])
->in([__DIR__ . '/src', __DIR__ . '/tests'])
);

// special handling of fabbot.io service if it's using too old PHP CS Fixer version
try {
PhpCsFixer\FixerFactory::create()
->registerBuiltInFixers()
->registerCustomFixers($config->getCustomFixers())
->useRuleSet(new PhpCsFixer\RuleSet($config->getRules()));
} catch (PhpCsFixer\ConfigurationException\InvalidConfigurationException $e) {
$config->setRules([]);
} catch (UnexpectedValueException $e) {
$config->setRules([]);
} catch (InvalidArgumentException $e) {
$config->setRules([]);
}

return $config;
13 changes: 9 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,24 @@
"homepage": "https://github.com/rebilly"
}
],

"minimum-stability": "stable",

"config": {
"sort-packages": true
},

"require": {
"php": "^7.3",
"ext-json": "*"
},

"require-dev": {
"friendsofphp/php-cs-fixer": "^2.8",
"phpunit/phpunit": "^7.5",
"friendsofphp/php-cs-fixer": "^2.16",
"php-coveralls/php-coveralls": "^2.1",
"vimeo/psalm": "^3.9",
"psalm/plugin-phpunit": "^0.9.0"
"phpunit/phpunit": "^9.0",
"psalm/plugin-phpunit": "^0.9.0",
"vimeo/psalm": "^3.9"
},

"autoload": {
Expand Down
6 changes: 3 additions & 3 deletions src/Money.php
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,11 @@ public function allocateToTargets(int $n): array
$remainder = $amount % $n;
$result = [];

for ($i = 0; $i < $remainder; $i++) {
for ($i = 0; $i < $remainder; ++$i) {
$result[] = $high->multiply($sign);
}

for ($i = $remainder; $i < $n; $i++) {
for ($i = $remainder; $i < $n; ++$i) {
$result[] = $low->multiply($sign);
}

Expand Down Expand Up @@ -322,7 +322,7 @@ public function allocateByRatios(array $ratios): array
$result[] = $money;
}

for ($i = 0; $i < $remainder; $i++) {
for ($i = 0; $i < $remainder; ++$i) {
$result[$i] = $this->changeAmount($result[$i]->getAmount() + $sign);
}

Expand Down
4 changes: 2 additions & 2 deletions tests/CurrencyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public function testRegisteredCurrenciesCanBeAccessed(): void
{
$currencies = Currency::getCurrencies();

self::assertInternalType('array', $currencies);
self::assertIsArray($currencies);
self::assertArrayHasKey('EUR', $currencies);
self::assertInternalType('array', $currencies['EUR']);
self::assertIsArray($currencies['EUR']);
self::assertArrayHasKey('display_name', $currencies['EUR']);
self::assertArrayHasKey('numeric_code', $currencies['EUR']);
self::assertArrayHasKey('default_fraction_digits', $currencies['EUR']);
Expand Down
15 changes: 3 additions & 12 deletions tests/Exchange/InMemoryRateProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ protected function setUp(): void
);
}

/**
* @test
*/
public function shouldAbleToGetRate(): void
public function testGetRate(): void
{
$pair = new CurrencyPair(new Currency('EUR'), new Currency('USD'));
$rate = $this->rateProvider->fetchRate($pair);
Expand All @@ -49,10 +46,7 @@ public function shouldAbleToGetRate(): void
self::assertSame((new DateTimeImmutable('2017-01-01 01:02:03'))->getTimestamp(), $rate->getDate()->getTimestamp());
}

/**
* @test
*/
public function shouldAbleToGetRateFromInversePair(): void
public function testGetRateFromInversePair(): void
{
$pair = new CurrencyPair(new Currency('USD'), new Currency('EUR'));
$rate = $this->rateProvider->fetchRate($pair);
Expand All @@ -62,10 +56,7 @@ public function shouldAbleToGetRateFromInversePair(): void
self::assertSame((new DateTimeImmutable('2017-01-01 01:02:03'))->getTimestamp(), $rate->getDate()->getTimestamp());
}

/**
* @test
*/
public function failOnMissingRate(): void
public function testFailOnMissingRate(): void
{
$pair = new CurrencyPair(new Currency('USD'), new Currency('RUB'));
$exception = new MissingRateException($pair);
Expand Down
21 changes: 17 additions & 4 deletions tests/MoneyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public function testCanBeAllocatedToNumberOfTargets(): void
$a = new Money(99, new Currency('EUR'));
$r = $a->allocateToTargets(10);

self::assertEquals(
self::assertMoneyListEquals(
[
new Money(10, new Currency('EUR')),
new Money(10, new Currency('EUR')),
Expand All @@ -248,7 +248,7 @@ public function testNegativeAmountCanBeAllocatedToNumberOfTargets(): void
$a = new Money(-99, new Currency('EUR'));
$r = $a->allocateToTargets(10);

self::assertEquals(
self::assertMoneyListEquals(
[
new Money(-10, new Currency('EUR')),
new Money(-10, new Currency('EUR')),
Expand Down Expand Up @@ -297,7 +297,7 @@ public function testCanBeAllocatedByRatios(): void
$a = new Money(5, new Currency('EUR'));
$r = $a->allocateByRatios([3, 7]);

self::assertEquals(
self::assertMoneyListEquals(
[
new Money(2, new Currency('EUR')),
new Money(3, new Currency('EUR')),
Expand All @@ -311,7 +311,7 @@ public function testNegativeAmountCanBeAllocatedByRatios(): void
$a = new Money(-5, new Currency('EUR'));
$r = $a->allocateByRatios([3, 7]);

self::assertEquals(
self::assertMoneyListEquals(
[
new Money(-2, new Currency('EUR')),
new Money(-3, new Currency('EUR')),
Expand Down Expand Up @@ -470,4 +470,17 @@ public function testConvertEURtoUSD(): void
$c = $b->convert(new Currency('EUR'), 1 / $conversionRate, PHP_ROUND_HALF_UP);
self::assertSame(1000, $c->getAmount());
}

/**
* @param Money[] $expected
* @param Money[] $actual
*/
private static function assertMoneyListEquals(array $expected, array $actual): void
{
self::assertCount(count($expected), $actual);
self::assertSame(array_keys($expected), array_keys($actual));
foreach ($expected as $index => $item) {
$item->equals($actual[$index]);
}
}
}

0 comments on commit 6389dea

Please sign in to comment.