more phpunit cs

Author: mvorisek

.php-cs-fixer.dist.php

@@ -65,8 +65,6 @@
         'increment_style' => false,
         'native_constant_invocation' => false,
         'no_useless_else' => false,
-        'php_unit_data_provider_return_type' => false,
-        'php_unit_data_provider_static' => false,
         'php_unit_strict' => false,
         'phpdoc_to_comment' => false,
         'static_lambda' => false,

tests/mutex/FlockMutexTest.php

@@ -73,7 +73,7 @@ function () {
         }
     }
 
-    public function dpTimeoutableStrategies()
+    public static function dpTimeoutableStrategies(): iterable
     {
         return [
             [FlockMutex::STRATEGY_PCNTL],

tests/mutex/MutexConcurrencyTest.php

@@ -108,7 +108,7 @@ public function testHighContention(callable $code, callable $mutexFactory)
     /**
      * Returns test cases for testHighContention().
      */
-    public function provideHighContentionCases(): array
+    public static function provideHighContentionCases(): iterable
     {
         $cases = array_map(function (array $mutexFactory): array {
             $filename = tempnam(sys_get_temp_dir(), 'php-lock-high-contention');
@@ -219,7 +219,7 @@ public function testExecutionIsSerializedWhenLocked(callable $mutexFactory)
      *
      * @return callable[][] the mutex factories
      */
-    public function provideExecutionIsSerializedWhenLockedCases()
+    public static function provideExecutionIsSerializedWhenLockedCases(): iterable
     {
         $filename = tempnam(sys_get_temp_dir(), 'mutex-concurrency-test');
 

tests/mutex/MutexTest.php

@@ -31,7 +31,7 @@ public static function setUpBeforeClass(): void
      *
      * @return callable[][] the mutex factories
      */
-    public function provideMutexFactories()
+    public static function provideMutexFactories(): iterable
     {
         $cases = [
             'NoMutex' => [function (): Mutex {

tests/mutex/PHPRedisMutexTest.php

@@ -210,7 +210,7 @@ public function testResistantToPartialClusterFailuresForReleasingLock()
         }));
     }
 
-    public function provideSerializersAndCompressorsCases()
+    public static function provideSerializersAndCompressorsCases(): iterable
     {
         if (!class_exists(Redis::class)) {
             return [];

tests/mutex/RedisMutexTest.php

@@ -191,7 +191,7 @@ public function testTimingOut(int $count, float $timeout, float $delay)
      *
      * @return array test cases
      */
-    public function provideTimingOutCases()
+    public static function provideTimingOutCases(): iterable
     {
         // count, timeout, delay
         return [
@@ -300,7 +300,7 @@ function () use (&$i, $available): bool {
      *
      * @return int[][] test cases
      */
-    public function provideMinority()
+    public static function provideMinority(): iterable
     {
         // total count, available count
         return [
@@ -320,7 +320,7 @@ public function provideMinority()
      *
      * @return int[][] test cases
      */
-    public function provideMajority()
+    public static function provideMajority(): iterable
     {
         // total count, available count
         return [

tests/mutex/TransactionalMutexTest.php

@@ -31,7 +31,7 @@ public function testInvalidErrorMode(int $mode)
     /**
      * Returns test cases for testInvalidErrorMode().
      */
-    public function provideInvalidErrorModeCases(): array
+    public static function provideInvalidErrorModeCases(): iterable
     {
         return [
             [\PDO::ERRMODE_SILENT],
@@ -147,7 +147,7 @@ public function testReplayTransaction(\Exception $exception)
      *
      * @return \Exception[][] test cases
      */
-    public function provideReplayTransactionCases()
+    public static function provideReplayTransactionCases(): iterable
     {
         return [
             [new \PDOException()],

tests/util/DoubleCheckedLockingTest.php

@@ -110,7 +110,7 @@ public function testCodeNotExecuted(callable $check)
      *
      * @return callable[][] the test cases
      */
-    public function provideCodeNotExecutedCases()
+    public static function provideCodeNotExecutedCases(): iterable
     {
         $checkCounter = 0;