Skip to content

Commit 5ae268e

Browse files
ghostwriterghostwriter
authored
Merge pull request #8 from ghostwriter/feature/prepare-release
feature/prepare release
2 parents 67d24de + 690d18b commit 5ae268e

File tree

3 files changed

+80
-72
lines changed

3 files changed

+80
-72
lines changed

‎ecs.php

+75-64
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
declare(strict_types=1);
44

5+
use PHP_CodeSniffer\Standards\Generic\Sniffs\VersionControl\GitMergeConflictSniff;
6+
use PhpCsFixer\Fixer\Alias\MbStrFunctionsFixer;
7+
use PhpCsFixer\Fixer\Alias\ModernizeStrposFixer;
8+
use PhpCsFixer\Fixer\Alias\NoAliasFunctionsFixer;
9+
use PhpCsFixer\Fixer\Alias\RandomApiMigrationFixer;
510
use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
611
use PhpCsFixer\Fixer\Casing\ConstantCaseFixer;
712
use PhpCsFixer\Fixer\Casing\LowercaseKeywordsFixer;
@@ -66,22 +71,11 @@
6671
use PhpCsFixer\Fixer\Strict\StrictComparisonFixer;
6772
use PhpCsFixer\Fixer\Strict\StrictParamFixer;
6873
use Symplify\EasyCodingStandard\Config\ECSConfig;
69-
use Symplify\EasyCodingStandard\ValueObject\Option;
7074
use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
7175

7276
return static function (ECSConfig $ecsConfig): void {
73-
$ecsConfig->parallel();
74-
$ecsConfig->paths([__DIR__ . '/rector.php', __DIR__ . '/ecs.php', __DIR__ . '/src', __DIR__ . '/tests']);
77+
$ecsConfig->cacheDirectory(__DIR__ . '/.cache/ecs');
7578

76-
$ecsConfig->skip([
77-
'*/tests/Fixture/*',
78-
'*/vendor/*',
79-
GroupImportFixer::class,
80-
BinaryOperatorSpacesFixer::class,
81-
GeneralPhpdocAnnotationRemoveFixer::class,
82-
PhpdocLineSpanFixer::class,
83-
PhpdocTrimFixer::class,
84-
]);
8579
$ecsConfig->import(SetList::ARRAY);
8680
$ecsConfig->import(SetList::CLEAN_CODE);
8781
$ecsConfig->import(SetList::COMMON);
@@ -94,8 +88,66 @@
9488
$ecsConfig->import(SetList::STRICT);
9589
$ecsConfig->import(SetList::SYMPLIFY);
9690

97-
$parameters = $ecsConfig->parameters();
98-
$parameters->set(Option::CACHE_DIRECTORY, __DIR__ . '/.cache/ecs');
91+
$ecsConfig->parallel();
92+
$ecsConfig->paths([__DIR__ . '/rector.php', __DIR__ . '/ecs.php', __DIR__ . '/src', __DIR__ . '/tests']);
93+
94+
$ecsConfig->rules([
95+
DeclareStrictTypesFixer::class,
96+
ElseifFixer::class,
97+
FinalClassFixer::class,
98+
FullyQualifiedStrictTypesFixer::class,
99+
GetClassToClassKeywordFixer::class,
100+
GitMergeConflictSniff::class,
101+
LowercaseKeywordsFixer::class,
102+
LowercaseStaticReferenceFixer::class,
103+
MagicConstantCasingFixer::class,
104+
MagicMethodCasingFixer::class,
105+
MbStrFunctionsFixer::class,
106+
ModernizeStrposFixer::class,
107+
NoAliasFunctionsFixer::class,
108+
NoEmptyStatementFixer::class,
109+
NoHomoglyphNamesFixer::class,
110+
NoLeadingImportSlashFixer::class,
111+
NoSinglelineWhitespaceBeforeSemicolonsFixer::class,
112+
NoSuperfluousElseifFixer::class,
113+
NoUnusedImportsFixer::class,
114+
PhpUnitConstructFixer::class,
115+
PhpUnitDedicateAssertFixer::class,
116+
PhpUnitDedicateAssertInternalTypeFixer::class,
117+
PhpUnitExpectationFixer::class,
118+
PhpUnitFqcnAnnotationFixer::class,
119+
PhpUnitInternalClassFixer::class,
120+
PhpUnitMethodCasingFixer::class,
121+
PhpUnitMockFixer::class,
122+
PhpUnitMockShortWillReturnFixer::class,
123+
PhpUnitNamespacedFixer::class,
124+
PhpUnitNoExpectationAnnotationFixer::class,
125+
PhpUnitSetUpTearDownVisibilityFixer::class,
126+
PhpUnitSizeClassFixer::class,
127+
PhpUnitStrictFixer::class,
128+
PhpUnitTestAnnotationFixer::class,
129+
PhpUnitTestClassRequiresCoversFixer::class,
130+
PhpdocAnnotationWithoutDotFixer::class,
131+
PhpdocOrderFixer::class,
132+
PhpdocSeparationFixer::class,
133+
PhpdocSummaryFixer::class,
134+
PhpdocTypesOrderFixer::class,
135+
ProtectedToPrivateFixer::class,
136+
RandomApiMigrationFixer::class,
137+
ReturnTypeDeclarationFixer::class,
138+
SelfAccessorFixer::class,
139+
SelfStaticAccessorFixer::class,
140+
SemicolonAfterInstructionFixer::class,
141+
SimplifiedIfReturnFixer::class,
142+
SingleClassElementPerStatementFixer::class,
143+
SingleImportPerStatementFixer::class,
144+
StaticLambdaFixer::class,
145+
StrictComparisonFixer::class,
146+
StrictParamFixer::class,
147+
UseArrowFunctionsFixer::class,
148+
VisibilityRequiredFixer::class,
149+
YodaStyleFixer::class,
150+
]);
99151

100152
$ecsConfig->ruleWithConfiguration(GlobalNamespaceImportFixer::class, [
101153
'import_classes' => true,
@@ -124,54 +176,13 @@
124176
'order' => 'alpha',
125177
]);
126178

127-
$ecsConfig->rule(LowercaseKeywordsFixer::class);
128-
$ecsConfig->rule(LowercaseStaticReferenceFixer::class);
129-
$ecsConfig->rule(MagicConstantCasingFixer::class);
130-
$ecsConfig->rule(MagicMethodCasingFixer::class);
131-
$ecsConfig->rule(FinalClassFixer::class);
132-
$ecsConfig->rule(ProtectedToPrivateFixer::class);
133-
$ecsConfig->rule(SelfAccessorFixer::class);
134-
$ecsConfig->rule(SelfStaticAccessorFixer::class);
135-
$ecsConfig->rule(SingleClassElementPerStatementFixer::class);
136-
$ecsConfig->rule(VisibilityRequiredFixer::class);
137-
$ecsConfig->rule(ElseifFixer::class);
138-
$ecsConfig->rule(NoSuperfluousElseifFixer::class);
139-
$ecsConfig->rule(SimplifiedIfReturnFixer::class);
140-
$ecsConfig->rule(YodaStyleFixer::class);
141-
$ecsConfig->rule(ReturnTypeDeclarationFixer::class);
142-
$ecsConfig->rule(StaticLambdaFixer::class);
143-
$ecsConfig->rule(UseArrowFunctionsFixer::class);
144-
$ecsConfig->rule(FullyQualifiedStrictTypesFixer::class);
145-
$ecsConfig->rule(NoLeadingImportSlashFixer::class);
146-
$ecsConfig->rule(NoUnusedImportsFixer::class);
147-
$ecsConfig->rule(SingleImportPerStatementFixer::class);
148-
$ecsConfig->rule(GetClassToClassKeywordFixer::class);
149-
$ecsConfig->rule(NoHomoglyphNamesFixer::class);
150-
$ecsConfig->rule(PhpdocAnnotationWithoutDotFixer::class);
151-
$ecsConfig->rule(PhpdocOrderFixer::class);
152-
$ecsConfig->rule(PhpdocSeparationFixer::class);
153-
$ecsConfig->rule(PhpdocSummaryFixer::class);
154-
$ecsConfig->rule(PhpdocTypesOrderFixer::class);
155-
$ecsConfig->rule(PhpUnitConstructFixer::class);
156-
$ecsConfig->rule(PhpUnitDedicateAssertFixer::class);
157-
$ecsConfig->rule(PhpUnitDedicateAssertInternalTypeFixer::class);
158-
$ecsConfig->rule(PhpUnitExpectationFixer::class);
159-
$ecsConfig->rule(PhpUnitFqcnAnnotationFixer::class);
160-
$ecsConfig->rule(PhpUnitInternalClassFixer::class);
161-
$ecsConfig->rule(PhpUnitMethodCasingFixer::class);
162-
$ecsConfig->rule(PhpUnitMockFixer::class);
163-
$ecsConfig->rule(PhpUnitMockShortWillReturnFixer::class);
164-
$ecsConfig->rule(PhpUnitNamespacedFixer::class);
165-
$ecsConfig->rule(PhpUnitNoExpectationAnnotationFixer::class);
166-
$ecsConfig->rule(PhpUnitSetUpTearDownVisibilityFixer::class);
167-
$ecsConfig->rule(PhpUnitSizeClassFixer::class);
168-
$ecsConfig->rule(PhpUnitStrictFixer::class);
169-
$ecsConfig->rule(PhpUnitTestAnnotationFixer::class);
170-
$ecsConfig->rule(PhpUnitTestClassRequiresCoversFixer::class);
171-
$ecsConfig->rule(NoEmptyStatementFixer::class);
172-
$ecsConfig->rule(NoSinglelineWhitespaceBeforeSemicolonsFixer::class);
173-
$ecsConfig->rule(SemicolonAfterInstructionFixer::class);
174-
$ecsConfig->rule(DeclareStrictTypesFixer::class);
175-
$ecsConfig->rule(StrictComparisonFixer::class);
176-
$ecsConfig->rule(StrictParamFixer::class);
179+
$ecsConfig->skip([
180+
'*/tests/Fixture/*',
181+
'*/vendor/*',
182+
GroupImportFixer::class,
183+
BinaryOperatorSpacesFixer::class,
184+
GeneralPhpdocAnnotationRemoveFixer::class,
185+
PhpdocLineSpanFixer::class,
186+
PhpdocTrimFixer::class,
187+
]);
177188
};

‎src/Contract/OptionInterface.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use Ghostwriter\Option\Exception\NullPointerException;
88
use IteratorAggregate;
9-
use ReflectionException;
109
use Throwable;
1110
use Traversable;
1211

@@ -43,9 +42,8 @@ public function contains(mixed $value): bool;
4342
public function expect(Throwable $throwable): mixed;
4443

4544
/**
46-
* Returns None if the option is None, otherwise calls $function with the wrapped value
47-
* and returns: Some(TValue) if $function returns true (where TValue is the wrapped value),
48-
* and None if $function returns false.
45+
* Returns None if the option is None, otherwise calls $function with the wrapped value and returns: Some(TValue) if
46+
* $function returns true (where TValue is the wrapped value), and None if $function returns false.
4947
*
5048
* @param callable(TValue): bool $function
5149
*/
@@ -115,8 +113,8 @@ public static function of(mixed $value): self;
115113
/**
116114
* Returns the option if it contains a value, otherwise returns $option.
117115
*
118-
* Arguments passed to or are eagerly evaluated; if you are passing the result of a function call,
119-
* it is recommended to use orElse, which is lazily evaluated.
116+
* Arguments passed to or are eagerly evaluated; if you are passing the result of a function call, it is recommended
117+
* to use orElse, which is lazily evaluated.
120118
*/
121119
public function or(self $option): self;
122120

‎tests/Unit/AbstractOptionTest.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Ghostwriter\Option\None;
1111
use Ghostwriter\Option\Some;
1212
use PHPUnit\Framework\TestCase;
13-
use ReflectionException;
1413
use stdClass;
1514
use Traversable;
1615

@@ -40,7 +39,7 @@ public function ofDataProvider(): Traversable
4039
yield 'array' => [SomeInterface::class, []];
4140
yield 'Some::class' => [SomeInterface::class, Some::create(1337)];
4241
yield 'null' => [NoneInterface::class, null];
43-
yield 'Some::class' => [NoneInterface::class, None::create()];
42+
yield 'None::class' => [NoneInterface::class, None::create()];
4443
}
4544

4645
/**

0 commit comments

Comments
 (0)