Skip to content

Commit c35ede8

Browse files
committed
Refactor test namespaces from 'unit' to 'Unit' for consistency across test files.
1 parent 764c319 commit c35ede8

17 files changed

+1292
-683
lines changed

ecs.php

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,45 @@
22

33
declare(strict_types=1);
44

5-
use PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer;
6-
use PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer;
7-
use PhpCsFixer\Fixer\ClassNotation\OrderedTraitsFixer;
8-
use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
9-
use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
10-
use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
11-
use PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer;
12-
use Symplify\EasyCodingStandard\Config\ECSConfig;
13-
14-
return ECSConfig::configure()
5+
return \Symplify\EasyCodingStandard\Config\ECSConfig::configure()
156
->withConfiguredRule(
16-
ClassDefinitionFixer::class,
7+
\PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer::class,
178
[
189
'space_before_parenthesis' => true,
1910
],
2011
)
2112
->withConfiguredRule(
22-
OrderedImportsFixer::class,
13+
\PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer::class,
14+
[
15+
'order' => [
16+
'use_trait',
17+
'constant_public',
18+
'constant_protected',
19+
'constant_private',
20+
'case',
21+
'property_public',
22+
'property_protected',
23+
'property_private',
24+
'construct',
25+
'destruct',
26+
'magic',
27+
'phpunit',
28+
'method_public',
29+
'method_protected',
30+
'method_private',
31+
],
32+
'sort_algorithm' => 'alpha',
33+
],
34+
)
35+
->withConfiguredRule(
36+
\PhpCsFixer\Fixer\Import\OrderedImportsFixer::class,
2337
[
2438
'imports_order' => ['class', 'function', 'const'],
2539
'sort_algorithm' => 'alpha',
2640
],
2741
)
2842
->withConfiguredRule(
29-
VisibilityRequiredFixer::class,
43+
\PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer::class,
3044
[
3145
'elements' => [],
3246
],
@@ -48,16 +62,8 @@
4862
)
4963
->withRules(
5064
[
51-
NoUnusedImportsFixer::class,
52-
OrderedClassElementsFixer::class,
53-
OrderedTraitsFixer::class,
54-
SingleQuoteFixer::class,
65+
\PhpCsFixer\Fixer\ClassNotation\OrderedTraitsFixer::class,
66+
\PhpCsFixer\Fixer\Import\NoUnusedImportsFixer::class,
67+
\PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer::class,
5568
]
56-
)
57-
->withSkip(
58-
[
59-
'*/src/framework/resource/layout/*',
60-
'*/src/usecase/contact/view/*',
61-
'*/src/usecase/site/view/*',
62-
],
6369
);

rector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
$rectorConfig->sets(
1818
[
19-
Rector\Set\ValueObject\SetList::PHP_82,
20-
Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_82,
19+
Rector\Set\ValueObject\SetList::PHP_81,
20+
Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_81,
2121
Rector\Set\ValueObject\SetList::TYPE_DECLARATION,
2222
],
2323
);

src/usecase/security/view/login.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<?= $form->field($model, 'rememberMe')->checkbox(
7171
[
7272
'labelOptions' => [
73-
'class' => 'form-check-label fw-medium text-body'
73+
'class' => 'form-check-label fw-medium text-body',
7474
],
7575
'options' => [
7676
'class' => 'form-check-input',

tests/Acceptance/AboutCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace app\tests\acceptance;
5+
namespace app\tests\Acceptance;
66

7-
use app\tests\support\AcceptanceTester;
7+
use app\tests\Support\AcceptanceTester;
88

99
final class AboutCest
1010
{

tests/Acceptance/ContactCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace app\tests\acceptance;
5+
namespace app\tests\Acceptance;
66

7-
use app\tests\support\AcceptanceTester;
7+
use app\tests\Support\AcceptanceTester;
88

99
final class ContactCest
1010
{

tests/Acceptance/SiteCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace app\tests\acceptance;
5+
namespace app\tests\Acceptance;
66

7-
use app\tests\support\AcceptanceTester;
7+
use app\tests\Support\AcceptanceTester;
88

99
final class SiteCest
1010
{

tests/Functional/ContactCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
declare(strict_types=1);
44

5-
namespace app\tests\functional;
5+
namespace app\tests\Functional;
66

7-
use app\tests\support\FunctionalTester;
7+
use app\tests\Support\FunctionalTester;
88

99
final class ContactCest
1010
{

tests/Support/AcceptanceTester.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace app\tests\support;
5+
namespace app\tests\Support;
66

77
/**
88
* Inherited Methods
@@ -18,7 +18,7 @@
1818
* @method void pause($vars = [])
1919
*
2020
* @SuppressWarnings(PHPMD)
21-
*/
21+
*/
2222
class AcceptanceTester extends \Codeception\Actor
2323
{
2424
use _generated\AcceptanceTesterActions;

tests/Support/FunctionalTester.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace app\tests\support;
5+
namespace app\tests\Support;
66

77
/**
88
* Inherited Methods
@@ -18,7 +18,7 @@
1818
* @method void pause($vars = [])
1919
*
2020
* @SuppressWarnings(PHPMD)
21-
*/
21+
*/
2222
class FunctionalTester extends \Codeception\Actor
2323
{
2424
use _generated\FunctionalTesterActions;

tests/Support/UnitTester.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace app\tests\support;
5+
namespace app\tests\Support;
66

77
/**
88
* Inherited Methods
@@ -18,7 +18,7 @@
1818
* @method void pause($vars = [])
1919
*
2020
* @SuppressWarnings(PHPMD)
21-
*/
21+
*/
2222
class UnitTester extends \Codeception\Actor
2323
{
2424
use _generated\UnitTesterActions;

0 commit comments

Comments
 (0)