Skip to content

Commit 1703800

Browse files
authored
Change package namespace (#12)
* Change package namespace * Change php cs filename * Fix php cs fixer workflow * Change php cs filename * Update .php-cs-fixer.dist.php * Fix php cs fixer * Fix php cs fixer workflow
1 parent e570b67 commit 1703800

14 files changed

+37
-36
lines changed

.github/workflows/php-cs-fixer.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ jobs:
1212
with:
1313
ref: ${{ github.head_ref }}
1414

15+
- name: Run composer install
16+
run: composer install -n --prefer-dist
17+
1518
- name: Run PHP CS Fixer
16-
uses: docker://oskarstark/php-cs-fixer-ga
17-
with:
18-
args: --config=.php_cs.dist --allow-risky=yes
19+
run: composer format
1920

2021
- name: Commit changes
2122
uses: stefanzweifel/git-auto-commit-action@v4

.php_cs.dist .php-cs-fixer.dist.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
->ignoreDotFiles(true)
1111
->ignoreVCS(true);
1212

13-
return PhpCsFixer\Config::create()
13+
return (new PhpCsFixer\Config())
1414
->setRules([
1515
'@PSR2' => true,
1616
'array_syntax' => ['syntax' => 'short'],
17-
'ordered_imports' => ['sortAlgorithm' => 'alpha'],
17+
'ordered_imports' => ['sort_algorithm' => 'alpha'],
1818
'no_unused_imports' => true,
1919
'not_operator_with_successor_space' => true,
2020
'trailing_comma_in_multiline_array' => true,

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@
2020
"ext-bcmath": "*"
2121
},
2222
"require-dev": {
23-
"friendsofphp/php-cs-fixer": "^2.16",
23+
"friendsofphp/php-cs-fixer": "^3.0",
2424
"phpro/grumphp": "^1.0",
2525
"phpunit/phpunit": "^9.3",
2626
"symfony/var-dumper": "^5.1",
2727
"vimeo/psalm": "^3.11"
2828
},
2929
"autoload": {
3030
"psr-4": {
31-
"Number\\": "src"
31+
"MadeByBob\\Number\\": "src"
3232
}
3333
},
3434
"autoload-dev": {
3535
"psr-4": {
36-
"Number\\Tests\\": "tests"
36+
"MadeByBob\\Number\\Tests\\": "tests"
3737
}
3838
},
3939
"scripts": {
4040
"psalm": "vendor/bin/psalm",
4141
"test": "vendor/bin/phpunit",
4242
"test-coverage": "vendor/bin/phpunit --coverage-html coverage",
43-
"format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
43+
"format": "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.dist.php --allow-risky=yes"
4444
},
4545
"config": {
4646
"sort-packages": true

grumphp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ grumphp:
66
allow_risky: false
77
cache_file: ~
88
rules: []
9-
config: .php_cs.dist
9+
config: .php-cs-fixer.dist.php
1010
using_cache: ~
1111
config_contains_finder: true
1212
verbose: true

src/AbstractNumber.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
declare(strict_types=1);
44

5-
namespace Number;
5+
namespace MadeByBob\Number;
66

7-
use Number\Exception\DecimalExponentError;
8-
use Number\Exception\DivisionByZeroError;
9-
use Number\Exception\InvalidNumberInputTypeException;
10-
use Number\Exception\InvalidRoundingModeException;
7+
use MadeByBob\Number\Exception\DecimalExponentError;
8+
use MadeByBob\Number\Exception\DivisionByZeroError;
9+
use MadeByBob\Number\Exception\InvalidNumberInputTypeException;
10+
use MadeByBob\Number\Exception\InvalidRoundingModeException;
1111

1212
abstract class AbstractNumber
1313
{
@@ -112,7 +112,7 @@ public function minus($value, int $scale = null): self
112112
*
113113
* Example:
114114
* ```
115-
* $divided = (new Number('200.000'))->divide($value, null, '0.0000')
115+
* $divided = (new MadeByBob\Number('200.000'))->divide($value, null, '0.0000')
116116
* ```
117117
*
118118
* @param AbstractNumber|string|float|int $value
@@ -406,7 +406,7 @@ public function parent(): ?self
406406
}
407407

408408
/**
409-
* Converts the current Number instance into a string.
409+
* Converts the current MadeByBob\Number instance into a string.
410410
*/
411411
public function toString(int $scale = null): string
412412
{
@@ -416,7 +416,7 @@ public function toString(int $scale = null): string
416416
}
417417

418418
/**
419-
* Converts the current Number instance into a string.
419+
* Converts the current MadeByBob\Number instance into a string.
420420
*/
421421
public function __toString(): string
422422
{
@@ -432,7 +432,7 @@ protected function get(): string
432432
}
433433

434434
/**
435-
* @internal Provides an instance of Number based on the input. Supports multiple input data types.
435+
* @internal Provides an instance of MadeByBob\Number based on the input. Supports multiple input data types.
436436
*
437437
* @param AbstractNumber|string|float|int $value
438438
*/

src/Exception/DecimalExponentError.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Number\Exception;
5+
namespace MadeByBob\Number\Exception;
66

77
use ArithmeticError;
88

src/Exception/DivisionByZeroError.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Number\Exception;
5+
namespace MadeByBob\Number\Exception;
66

77
class DivisionByZeroError extends \DivisionByZeroError
88
{

src/Exception/InvalidNumberInputTypeException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Number\Exception;
5+
namespace MadeByBob\Number\Exception;
66

77
use InvalidArgumentException;
88

src/Exception/InvalidRoundingModeException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Number\Exception;
5+
namespace MadeByBob\Number\Exception;
66

77
use InvalidArgumentException;
88

src/Formatter/Formatter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Number\Formatter;
5+
namespace MadeByBob\Number\Formatter;
66

77
use Locale;
88
use NumberFormatter;

src/Number.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace Number;
5+
namespace MadeByBob\Number;
66

7-
use Number\Formatter\Formatter;
7+
use MadeByBob\Number\Formatter\Formatter;
88

99
class Number extends AbstractNumber
1010
{

tests/AbstractNumberImplementationTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Number\Tests;
3+
namespace MadeByBob\Number\Tests;
44

55
use Locale;
6-
use Number\Tests\TestClasses\Money;
6+
use MadeByBob\Number\Tests\TestClasses\Money;
77
use PHPUnit\Framework\TestCase;
88

99
class AbstractNumberImplementationTest extends TestCase

tests/NumberTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?php
22

3-
namespace Number\Tests;
3+
namespace MadeByBob\Number\Tests;
44

55
use Locale;
6-
use Number\Exception\DecimalExponentError;
7-
use Number\Exception\DivisionByZeroError;
8-
use Number\Exception\InvalidNumberInputTypeException;
9-
use Number\Number;
6+
use MadeByBob\Number\Exception\DecimalExponentError;
7+
use MadeByBob\Number\Exception\DivisionByZeroError;
8+
use MadeByBob\Number\Exception\InvalidNumberInputTypeException;
9+
use MadeByBob\Number\Number;
1010
use PHPUnit\Framework\TestCase;
1111
use stdClass;
1212

tests/TestClasses/Money.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
declare(strict_types=1);
44

5-
namespace Number\Tests\TestClasses;
5+
namespace MadeByBob\Number\Tests\TestClasses;
66

7-
use Number\AbstractNumber;
8-
use Number\Formatter\Formatter;
7+
use MadeByBob\Number\AbstractNumber;
8+
use MadeByBob\Number\Formatter\Formatter;
99

1010
class Money extends AbstractNumber
1111
{

0 commit comments

Comments
 (0)