misc: update dependencies

romm · Aug 7, 2023 · c31e5c9 · c31e5c9
1 parent 7824083
commit c31e5c9
Show file tree

Hide file tree

Showing 13 changed files with 206 additions and 334 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -7,10 +7,7 @@
 ])
     ->notPath('Fixtures/FunctionWithGroupedImportStatements.php')
     ->notPath('Fixtures/FunctionWithSeveralImportStatementsInSameUseStatement.php')
-    ->notPath('Fixtures/TwoClassesInDifferentNamespaces.php')
-    // PHP8.2 remove when PHP-CS-Fixer fully supports PHP 8.2; also remove
-    // `@putenv PHP_CS_FIXER_IGNORE_ENV=1` inside `composer.json`
-    ->notPath('Fixture/Object/ObjectWithPropertyWithNativeDisjunctiveNormalFormType.php');
+    ->notPath('Fixtures/TwoClassesInDifferentNamespaces.php');
 
 if (PHP_VERSION_ID < 8_01_00) {
     $finder = $finder->notPath('Fixture/Enum/PureEnum.php');

diff --git a/composer.json b/composer.json
@@ -51,7 +51,6 @@
             "psalm --config=tests/StaticAnalysis/psalm-with-plugin.xml",
             "phpstan --configuration=tests/StaticAnalysis/phpstan-without-extension.neon.dist",
             "phpstan --configuration=tests/StaticAnalysis/phpstan-with-extension.neon.dist",
-            "@putenv PHP_CS_FIXER_IGNORE_ENV=1",
             "php-cs-fixer fix --dry-run",
             "rector --dry-run",
             "@check-todo"
@@ -61,7 +60,6 @@
         ],
         "fix": [
             "@putenv XDEBUG_MODE=off",
-            "@putenv PHP_CS_FIXER_IGNORE_ENV=1",
             "php-cs-fixer fix",
             "rector"
         ],

diff --git a/composer.lock b/composer.lock
diff --git a/src/Mapper/Tree/Message/ErrorMessage.php b/src/Mapper/Tree/Message/ErrorMessage.php
@@ -7,6 +7,4 @@
 use Throwable;
 
 /** @api */
-interface ErrorMessage extends Message, Throwable
-{
-}
+interface ErrorMessage extends Message, Throwable {}
diff --git a/src/Type/ClassType.php b/src/Type/ClassType.php
@@ -5,6 +5,4 @@
 namespace CuyZ\Valinor\Type;
 
 /** @internal */
-interface ClassType extends ObjectType
-{
-}
+interface ClassType extends ObjectType {}
diff --git a/src/Type/Parser/Exception/InvalidType.php b/src/Type/Parser/Exception/InvalidType.php
@@ -7,6 +7,4 @@
 use Throwable;
 
 /** @internal */
-interface InvalidType extends Throwable
-{
-}
+interface InvalidType extends Throwable {}
diff --git a/src/Type/Parser/Exception/Template/InvalidTemplate.php b/src/Type/Parser/Exception/Template/InvalidTemplate.php
@@ -7,6 +7,4 @@
 use Throwable;
 
 /** @internal */
-interface InvalidTemplate extends Throwable
-{
-}
+interface InvalidTemplate extends Throwable {}
diff --git a/tests/Fixture/Object/InterfaceWithDifferentNamespaces/InterfaceA.php b/tests/Fixture/Object/InterfaceWithDifferentNamespaces/InterfaceA.php
@@ -4,6 +4,4 @@
 
 namespace CuyZ\Valinor\Tests\Fixture\Object\InterfaceWithDifferentNamespaces;
 
-interface InterfaceA
-{
-}
+interface InterfaceA {}
diff --git a/tests/Fixture/Object/InterfaceWithDifferentNamespaces/InterfaceB.php b/tests/Fixture/Object/InterfaceWithDifferentNamespaces/InterfaceB.php
@@ -4,6 +4,4 @@
 
 namespace CuyZ\Valinor\Tests\Fixture\Object\InterfaceWithDifferentNamespaces;
 
-interface InterfaceB
-{
-}
+interface InterfaceB {}
diff --git a/tests/Integration/Cache/CacheWarmupTest.php b/tests/Integration/Cache/CacheWarmupTest.php
@@ -74,9 +74,7 @@ public function test_warmup_invalid_signature_throws_exception(): void
     }
 }
 
-interface SomeInterface
-{
-}
+interface SomeInterface {}
 
 final class ObjectToWarmupWithProperties implements SomeInterface
 {

diff --git a/tests/Integration/Mapping/InterfaceInferringMappingTest.php b/tests/Integration/Mapping/InterfaceInferringMappingTest.php
@@ -451,9 +451,7 @@ public function test_superfluous_values_throws_exception(): void
     }
 }
 
-interface SomeInterface
-{
-}
+interface SomeInterface {}
 
 final class SomeClassThatInheritsInterfaceA implements SomeInterface
 {

diff --git a/tests/Integration/Mapping/Other/FlexibleCastingMappingTest.php b/tests/Integration/Mapping/Other/FlexibleCastingMappingTest.php
@@ -270,15 +270,11 @@ public function test_source_value_is_casted_when_other_type_cannot_be_casted():
     }
 }
 
-interface SomeInterfaceForClassWithNoProperties
-{
-}
+interface SomeInterfaceForClassWithNoProperties {}
 
 final class SomeClassWithNoProperties implements SomeInterfaceForClassWithNoProperties {}
 
-interface SomeInterfaceForClassWithProperties
-{
-}
+interface SomeInterfaceForClassWithProperties {}
 
 final class SomeClassWithProperties implements SomeInterfaceForClassWithProperties
 {

diff --git a/tests/Integration/Mapping/VariadicParameterMappingTest.php b/tests/Integration/Mapping/VariadicParameterMappingTest.php
@@ -51,23 +51,6 @@ public function test_named_constructor_with_only_variadic_parameters_are_mapped_
         self::assertSame(['foo', 'bar', 'baz'], $object->values);
     }
 
-//    public function test_variadic_list_parameters_are_mapped_properly_when_string_keys_are_given(): void
-//    {
-//        try {
-//            $object = (new MapperBuilder())->flexible()->mapper()->map(SomeClassWithListVariadicParameters::class, [
-//                'values' => [
-//                    'foo' => 'foo',
-//                    'bar' => 'bar',
-//                    'baz' => 'baz',
-//                ],
-//            ]);
-//        } catch (MappingError $error) {
-//            $this->mappingFail($error);
-//        }
-//
-//        self::assertSame(['foo', 'bar', 'baz'], $object->values);
-//    }
-
     public function test_non_variadic_and_variadic_parameters_are_mapped_properly(): void
     {
         try {