Migrate PHPUnit configuration

evansims · evansims · commit 66b9858c8ba6 · 2023-08-01T00:04:25.000-05:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return (new PhpCsFixer\Config())
     ->setRiskyAllowed(true)
     ->setRules([
@@ -8,14 +10,15 @@
         'array_syntax' => ['syntax' => 'short'],
         'assign_null_coalescing_to_coalesce_equal' => true,
         'backtick_to_shell_exec' => true,
-        'binary_operator_spaces' => ['operators' => ['=' => 'align', 'xor' => null, '+=' => 'align_single_space', '===' => 'align_single_space_minimal', '|' => 'single_space', '=>' => 'align_single_space_minimal_by_scope']],
+        'binary_operator_spaces' => true,
         'blank_line_after_namespace' => true,
         'blank_line_after_opening_tag' => true,
         'blank_line_before_statement' => true,
+        'blank_line_between_import_groups' => true,
         'braces' => true,
         'cast_spaces' => true,
-        'class_attributes_separation' => ['elements' => ['const' => 'only_if_meta', 'method' => 'one', 'property' => 'only_if_meta', 'trait_import' => 'one', 'case' => 'one']],
-        'class_definition' => true,
+        'class_attributes_separation' => ['elements' => ['const' => 'one', 'method' => 'one', 'property' => 'one', 'trait_import' => 'one', 'case' => 'one']],
+        'class_definition' => ['multi_line_extends_each_single_line' => true, 'single_line' => true, 'single_item_single_line' => true, 'space_before_parenthesis' => false, 'inline_constructor_arguments' => false],
         'class_reference_name_casing' => true,
         'clean_namespace' => true,
         'combine_consecutive_issets' => true,
@@ -25,7 +28,9 @@
         'compact_nullable_typehint' => true,
         'concat_space' => ['spacing' => 'one'],
         'constant_case' => ['case' => 'lower'],
+        'curly_braces_position' => ['control_structures_opening_brace' => 'same_line', 'functions_opening_brace' => 'next_line_unless_newline_at_signature_end', 'anonymous_functions_opening_brace' => 'same_line', 'classes_opening_brace' => 'next_line_unless_newline_at_signature_end', 'anonymous_classes_opening_brace' => 'same_line', 'allow_single_line_empty_anonymous_classes' => true, 'allow_single_line_anonymous_functions' => true],
         'date_time_create_from_format_call' => true,
+        'date_time_immutable' => true,
         'declare_equal_normalize' => ['space' => 'none'],
         'declare_parentheses' => true,
         'declare_strict_types' => true,
@@ -46,6 +51,7 @@
         'explicit_string_variable' => true,
         'final_class' => true,
         'final_internal_class' => true,
+        'final_public_method_for_abstract_class' => true,
         'fopen_flag_order' => true,
         'fopen_flags' => true,
         'full_opening_tag' => true,
@@ -76,8 +82,8 @@
         'lowercase_static_reference' => true,
         'magic_constant_casing' => true,
         'magic_method_casing' => true,
-        'mb_str_functions' => true,
-        'method_argument_space' => true,
+        'mb_str_functions' => false,
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline', 'after_heredoc' => true],
         'method_chaining_indentation' => true,
         'modernize_strpos' => true,
         'modernize_types_casting' => true,
@@ -138,7 +144,7 @@
         'object_operator_without_whitespace' => true,
         'octal_notation' => true,
         'operator_linebreak' => true,
-        'ordered_class_elements' => ['sort_algorithm' => 'alpha', 'order' => ['use_trait', 'case', 'constant', 'constant_private', 'constant_protected', 'constant_public', 'property_private', 'property_private_readonly', 'property_private_static', 'property_protected', 'property_protected_readonly', 'property_protected_static', 'property_public', 'property_public_readonly', 'property_public_static', 'property_static', 'protected', 'construct', 'destruct', 'magic', 'method', 'public', 'method_abstract', 'method_private', 'method_private_abstract', 'method_private_abstract_static', 'method_private_static', 'method_protected', 'method_protected_abstract', 'method_protected_abstract_static', 'method_protected_static', 'method_public', 'method_public_abstract', 'method_public_abstract_static', 'method_public_static', 'method_static', 'phpunit', 'private', 'property']],
+        'ordered_class_elements' => ['sort_algorithm' => 'alpha', 'order' => ['use_trait', 'case', 'constant', 'constant_private', 'constant_protected', 'constant_public', 'property_private', 'property_private_readonly', 'property_private_static', 'property_protected', 'property_protected_readonly', 'property_protected_static', 'property_public', 'property_public_readonly', 'property_public_static', 'property_static', 'protected', 'construct', 'destruct', 'magic', 'method', 'public', 'method_public', 'method_abstract', 'method_public_abstract', 'method_public_abstract_static', 'method_public_static', 'method_static', 'method_private', 'method_private_abstract', 'method_private_abstract_static', 'method_private_static', 'method_protected', 'method_protected_abstract', 'method_protected_abstract_static', 'method_protected_static', 'phpunit', 'private', 'property']],
         'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['const', 'class', 'function']],
         'ordered_interfaces' => true,
         'ordered_traits' => true,
@@ -191,6 +197,7 @@
         'single_line_throw' => true,
         'single_quote' => true,
         'single_space_after_construct' => true,
+        'single_space_around_construct' => true,
         'single_trait_insert_per_statement' => true,
         'space_after_semicolon' => true,
         'standardize_increment' => true,
@@ -207,9 +214,9 @@
         'ternary_operator_spaces' => true,
         'ternary_to_elvis_operator' => true,
         'ternary_to_null_coalescing' => true,
-        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'parameters']],
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['arguments', 'arrays', 'match', 'parameters']],
         'trim_array_spaces' => true,
-        'types_spaces' => ['space' => 'single'],
+        'types_spaces' => ['space' => 'single', 'space_multiple_catch' => 'single'],
         'unary_operator_spaces' => true,
         'use_arrow_functions' => true,
         'visibility_required' => true,
@@ -220,6 +227,5 @@
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude('vendor')
-            ->in([__DIR__.'/src/'])
-    )
-;
+            ->in([__DIR__ . '/src/']),
+    );
diff --git a/composer.json b/composer.json
@@ -23,7 +23,6 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.14",
-        "infection/infection": "^0.26",
         "mockery/mockery": "^1.5",
         "pestphp/pest": "^2.0",
         "phpstan/phpstan": "^1.10",
diff --git a/infection.json5.dist b/infection.json5.dist
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,24 +1,23 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <coverage>
-        <include>
-            <directory suffix=".php">./src/</directory>
-        </include>
-
-        <exclude>
-            <directory suffix=".php">./src/Contracts</directory>
-            <directory suffix=".php">./src/Exceptions</directory>
-        </exclude>
-
-        <report>
-            <clover outputFile="coverage/clover.xml" />
-            <cobertura outputFile="coverage/cobertura.xml"/>
-        </report>
-    </coverage>
-
-    <testsuites>
-        <testsuite name="unit">
-            <directory>tests/Unit</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd">
+  <coverage>
+    <report>
+      <clover outputFile="coverage/clover.xml"/>
+      <cobertura outputFile="coverage/cobertura.xml"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="unit">
+      <directory>tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/Contracts</directory>
+      <directory suffix=".php">./src/Exceptions</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/src/Implementations/Psr17/RequestFactories.php b/src/Implementations/Psr17/RequestFactories.php
@@ -13,10 +13,13 @@
 
 final class RequestFactories extends Implementation implements RequestFactoriesContract
 {
-    private static ?CandidatesCollection    $candidates         = null;
+    private static ?CandidatesCollection    $candidates = null;
+
     private static ?CandidatesCollection    $extendedCandidates = null;
-    private static ?RequestFactoryInterface $singleton          = null;
-    private static ?RequestFactoryInterface $using              = null;
+
+    private static ?RequestFactoryInterface $singleton = null;
+
+    private static ?RequestFactoryInterface $using = null;
 
     public static function add(CandidateEntity $candidate): void
     {
@@ -30,7 +33,7 @@ public static function add(CandidateEntity $candidate): void
      */
     public static function allCandidates(): CandidatesCollection
     {
-        if (null !== self::$extendedCandidates) {
+        if (self::$extendedCandidates instanceof \PsrDiscovery\Collections\CandidatesCollection) {
             return self::$extendedCandidates;
         }
 
@@ -45,7 +48,7 @@ public static function allCandidates(): CandidatesCollection
      */
     public static function candidates(): CandidatesCollection
     {
-        if (null !== self::$candidates) {
+        if (self::$candidates instanceof \PsrDiscovery\Collections\CandidatesCollection) {
             return self::$candidates;
         }
 
@@ -131,7 +134,7 @@ public static function candidates(): CandidatesCollection
      */
     public static function discover(): ?RequestFactoryInterface
     {
-        if (null !== self::$using) {
+        if (self::$using instanceof \Psr\Http\Message\RequestFactoryInterface) {
             return self::$using;
         }
 
@@ -159,7 +162,7 @@ public static function set(CandidatesCollection $candidates): void
 
     public static function singleton(): ?RequestFactoryInterface
     {
-        if (null !== self::$using) {
+        if (self::$using instanceof \Psr\Http\Message\RequestFactoryInterface) {
             return self::$using;
         }
 
@@ -169,6 +172,6 @@ public static function singleton(): ?RequestFactoryInterface
     public static function use(?RequestFactoryInterface $instance): void
     {
         self::$singleton = $instance;
-        self::$using     = $instance;
+        self::$using = $instance;
     }
 }
diff --git a/src/Implementations/Psr17/ResponseFactories.php b/src/Implementations/Psr17/ResponseFactories.php
@@ -13,10 +13,13 @@
 
 final class ResponseFactories extends Implementation implements ResponseFactoriesContract
 {
-    private static ?CandidatesCollection     $candidates         = null;
+    private static ?CandidatesCollection     $candidates = null;
+
     private static ?CandidatesCollection     $extendedCandidates = null;
-    private static ?ResponseFactoryInterface $singleton          = null;
-    private static ?ResponseFactoryInterface $using              = null;
+
+    private static ?ResponseFactoryInterface $singleton = null;
+
+    private static ?ResponseFactoryInterface $using = null;
 
     public static function add(CandidateEntity $candidate): void
     {
@@ -30,7 +33,7 @@ public static function add(CandidateEntity $candidate): void
      */
     public static function allCandidates(): CandidatesCollection
     {
-        if (null !== self::$extendedCandidates) {
+        if (self::$extendedCandidates instanceof \PsrDiscovery\Collections\CandidatesCollection) {
             return self::$extendedCandidates;
         }
 
@@ -45,7 +48,7 @@ public static function allCandidates(): CandidatesCollection
      */
     public static function candidates(): CandidatesCollection
     {
-        if (null !== self::$candidates) {
+        if (self::$candidates instanceof \PsrDiscovery\Collections\CandidatesCollection) {
             return self::$candidates;
         }
 
@@ -131,7 +134,7 @@ public static function candidates(): CandidatesCollection
      */
     public static function discover(): ?ResponseFactoryInterface
     {
-        if (null !== self::$using) {
+        if (self::$using instanceof \Psr\Http\Message\ResponseFactoryInterface) {
             return self::$using;
         }
 
@@ -159,7 +162,7 @@ public static function set(CandidatesCollection $candidates): void
 
     public static function singleton(): ?ResponseFactoryInterface
     {
-        if (null !== self::$using) {
+        if (self::$using instanceof \Psr\Http\Message\ResponseFactoryInterface) {
             return self::$using;
         }
 
@@ -169,6 +172,6 @@ public static function singleton(): ?ResponseFactoryInterface
     public static function use(?ResponseFactoryInterface $instance): void
     {
         self::$singleton = $instance;
-        self::$using     = $instance;
+        self::$using = $instance;
     }
 }
diff --git a/src/Implementations/Psr17/StreamFactories.php b/src/Implementations/Psr17/StreamFactories.php
@@ -13,10 +13,13 @@
 
 final class StreamFactories extends Implementation implements StreamFactoriesContract
 {
-    private static ?CandidatesCollection   $candidates         = null;
+    private static ?CandidatesCollection   $candidates = null;
+
     private static ?CandidatesCollection   $extendedCandidates = null;
-    private static ?StreamFactoryInterface $singleton          = null;
-    private static ?StreamFactoryInterface $using              = null;
+
+    private static ?StreamFactoryInterface $singleton = null;
+
+    private static ?StreamFactoryInterface $using = null;
 
     public static function add(CandidateEntity $candidate): void
     {
@@ -30,7 +33,7 @@ public static function add(CandidateEntity $candidate): void
      */
     public static function allCandidates(): CandidatesCollection
     {
-        if (null !== self::$extendedCandidates) {
+        if (self::$extendedCandidates instanceof \PsrDiscovery\Collections\CandidatesCollection) {
             return self::$extendedCandidates;
         }
 
@@ -45,7 +48,7 @@ public static function allCandidates(): CandidatesCollection
      */
     public static function candidates(): CandidatesCollection
     {
-        if (null !== self::$candidates) {
+        if (self::$candidates instanceof \PsrDiscovery\Collections\CandidatesCollection) {
             return self::$candidates;
         }
 
@@ -131,7 +134,7 @@ public static function candidates(): CandidatesCollection
      */
     public static function discover(): ?StreamFactoryInterface
     {
-        if (null !== self::$using) {
+        if (self::$using instanceof \Psr\Http\Message\StreamFactoryInterface) {
             return self::$using;
         }
 
@@ -159,7 +162,7 @@ public static function set(CandidatesCollection $candidates): void
 
     public static function singleton(): ?StreamFactoryInterface
     {
-        if (null !== self::$using) {
+        if (self::$using instanceof \Psr\Http\Message\StreamFactoryInterface) {
             return self::$using;
         }
 
@@ -169,6 +172,6 @@ public static function singleton(): ?StreamFactoryInterface
     public static function use(?StreamFactoryInterface $instance): void
     {
         self::$singleton = $instance;
-        self::$using     = $instance;
+        self::$using = $instance;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,13 @@`
`13`	`13`
`14`	`14`	`final class RequestFactories extends Implementation implements RequestFactoriesContract`
`15`	`15`	`{`
`16`		`- private static ?CandidatesCollection $candidates = null;`
	`16`	`+ private static ?CandidatesCollection $candidates = null;`
	`17`	`+`
`17`	`18`	`private static ?CandidatesCollection $extendedCandidates = null;`
`18`		`- private static ?RequestFactoryInterface $singleton = null;`
`19`		`- private static ?RequestFactoryInterface $using = null;`
	`19`	`+`
	`20`	`+ private static ?RequestFactoryInterface $singleton = null;`
	`21`	`+`
	`22`	`+ private static ?RequestFactoryInterface $using = null;`
`20`	`23`
`21`	`24`	`public static function add(CandidateEntity $candidate): void`
`22`	`25`	`{`
`@@ -30,7 +33,7 @@ public static function add(CandidateEntity $candidate): void`
`30`	`33`	`*/`
`31`	`34`	`public static function allCandidates(): CandidatesCollection`
`32`	`35`	`{`
`33`		`- if (null !== self::$extendedCandidates) {`
	`36`	`+ if (self::$extendedCandidates instanceof \PsrDiscovery\Collections\CandidatesCollection) {`
`34`	`37`	`return self::$extendedCandidates;`
`35`	`38`	`}`
`36`	`39`
`@@ -45,7 +48,7 @@ public static function allCandidates(): CandidatesCollection`
`45`	`48`	`*/`
`46`	`49`	`public static function candidates(): CandidatesCollection`
`47`	`50`	`{`
`48`		`- if (null !== self::$candidates) {`
	`51`	`+ if (self::$candidates instanceof \PsrDiscovery\Collections\CandidatesCollection) {`
`49`	`52`	`return self::$candidates;`
`50`	`53`	`}`
`51`	`54`
`@@ -131,7 +134,7 @@ public static function candidates(): CandidatesCollection`
`131`	`134`	`*/`
`132`	`135`	`public static function discover(): ?RequestFactoryInterface`
`133`	`136`	`{`
`134`		`- if (null !== self::$using) {`
	`137`	`+ if (self::$using instanceof \Psr\Http\Message\RequestFactoryInterface) {`
`135`	`138`	`return self::$using;`
`136`	`139`	`}`
`137`	`140`
`@@ -159,7 +162,7 @@ public static function set(CandidatesCollection $candidates): void`
`159`	`162`
`160`	`163`	`public static function singleton(): ?RequestFactoryInterface`
`161`	`164`	`{`
`162`		`- if (null !== self::$using) {`
	`165`	`+ if (self::$using instanceof \Psr\Http\Message\RequestFactoryInterface) {`
`163`	`166`	`return self::$using;`
`164`	`167`	`}`
`165`	`168`
`@@ -169,6 +172,6 @@ public static function singleton(): ?RequestFactoryInterface`
`169`	`172`	`public static function use(?RequestFactoryInterface $instance): void`
`170`	`173`	`{`
`171`	`174`	`self::$singleton = $instance;`
`172`		`- self::$using = $instance;`
	`175`	`+ self::$using = $instance;`
`173`	`176`	`}`
`174`	`177`	`}`