Merge branch 'refs/heads/master' into with-directive-multiple-nested-…

…relations
nuwave · Jun 5, 2024 · 2f5a4c1 · 2f5a4c1
2 parents 7c560e2 + fe0771e
commit 2f5a4c1
Show file tree

Hide file tree

Showing 19 changed files with 1,581 additions and 56 deletions.
diff --git a/rector.php b/rector.php
@@ -12,6 +12,7 @@
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
 use Rector\Config\RectorConfig;
 use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
+use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
 use Rector\PHPUnit\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\SetList;
@@ -58,6 +59,7 @@
         AddReturnTypeDeclarationFromYieldsRector::class, // iterable is fine
         UnusedForeachValueToArrayKeysRector::class, // inefficient
         AddDoesNotPerformAssertionToNonAssertingTestRector::class, // does not recognize mockResolver
+        MixedTypeRector::class, // removes useful comments
     ]);
     $rectorConfig->paths([
         __DIR__ . '/src',

diff --git a/src/Tracing/FederatedTracing/Proto/ContextualizedStats.php b/src/Tracing/FederatedTracing/Proto/ContextualizedStats.php
diff --git a/src/Tracing/FederatedTracing/Proto/EnumStats.php b/src/Tracing/FederatedTracing/Proto/EnumStats.php
diff --git a/src/Tracing/FederatedTracing/Proto/ExtendedReferences.php b/src/Tracing/FederatedTracing/Proto/ExtendedReferences.php
diff --git a/src/Tracing/FederatedTracing/Proto/FieldStat.php b/src/Tracing/FederatedTracing/Proto/FieldStat.php