Code style and validation

sanmai · Apr 11, 2023 · 5b094ca · 5b094ca
1 parent 8a67fad
commit 5b094ca
Show file tree

Hide file tree

Showing 22 changed files with 54 additions and 57 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -73,7 +73,7 @@ jobs:
 
     env:
       PHP_VERSION: '8.1'
-      PHP_CS_FIXER_VERSION: v3.13.0
+      PHP_CS_FIXER_VERSION: v3.16.0
 
     steps:
       - name: Checkout

diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "ergebnis/composer-normalize": "^2.8",
         "friendsofphp/php-cs-fixer": "^3",
         "infection/infection": ">=0.10.5",
-        "league/pipeline": "^1.0 || ^0.3",
+        "league/pipeline": "^0.3 || ^1.0",
         "phan/phan": ">=1.1",
         "php-coveralls/php-coveralls": "^2.4.1",
         "phpstan/phpstan": ">=0.10",

diff --git a/src/Standard.php b/src/Standard.php
@@ -19,6 +19,14 @@
 
 namespace Pipeline;
 
+use ArrayIterator;
+use CallbackFilterIterator;
+use Countable;
+use EmptyIterator;
+use Generator;
+use Iterator;
+use IteratorAggregate;
+use Traversable;
 use function array_chunk;
 use function array_filter;
 use function array_flip;
@@ -28,24 +36,16 @@
 use function array_shift;
 use function array_slice;
 use function array_values;
-use ArrayIterator;
 use function assert;
-use CallbackFilterIterator;
 use function count;
-use Countable;
-use EmptyIterator;
-use Generator;
 use function is_array;
 use function is_iterable;
 use function is_string;
-use Iterator;
 use function iterator_to_array;
-use IteratorAggregate;
 use function max;
 use function min;
 use function mt_getrandmax;
 use function mt_rand;
-use Traversable;
 
 /**
  * Concrete pipeline with sensible default callbacks.

diff --git a/tests/AppendPrependTest.php b/tests/AppendPrependTest.php
@@ -20,13 +20,13 @@
 namespace Tests\Pipeline;
 
 use ArrayIterator;
+use PHPUnit\Framework\TestCase;
 use function count;
 use function is_numeric;
 use function key;
-use const PHP_VERSION_ID;
-use PHPUnit\Framework\TestCase;
 use function Pipeline\take;
 use function reset;
+use const PHP_VERSION_ID;
 
 /**
  * @covers \Pipeline\Standard

diff --git a/tests/ArraysTest.php b/tests/ArraysTest.php
@@ -19,10 +19,10 @@
 
 namespace Tests\Pipeline;
 
-use function iterator_to_array;
 use PHPUnit\Framework\TestCase;
 use Pipeline\Standard;
 use ReflectionObject;
+use function iterator_to_array;
 
 /**
  * @covers \Pipeline\Standard

diff --git a/tests/Benchmarks/BenchTest.php b/tests/Benchmarks/BenchTest.php
@@ -19,9 +19,9 @@
 
 namespace Tests\Pipeline\Benchmarks;
 
+use PHPUnit\Framework\TestCase;
 use function array_map;
 use function array_sum;
-use PHPUnit\Framework\TestCase;
 use function Pipeline\fromArray;
 use function random_int;
 

diff --git a/tests/CastTest.php b/tests/CastTest.php
@@ -21,8 +21,8 @@
 
 use Generator;
 use PHPUnit\Framework\TestCase;
-use function Pipeline\map;
 use Pipeline\Standard;
+use function Pipeline\map;
 use function Pipeline\take;
 
 /**

diff --git a/tests/ChunkTest.php b/tests/ChunkTest.php
@@ -22,8 +22,8 @@
 use ArrayIterator;
 use IteratorIterator;
 use PHPUnit\Framework\TestCase;
-use function Pipeline\fromArray;
 use Pipeline\Standard;
+use function Pipeline\fromArray;
 use function Pipeline\take;
 
 /**

diff --git a/tests/CountTest.php b/tests/CountTest.php
@@ -21,9 +21,9 @@
 
 use ArrayIterator;
 use PHPUnit\Framework\TestCase;
+use Pipeline\Standard;
 use function Pipeline\fromArray;
 use function Pipeline\map;
-use Pipeline\Standard;
 use function Pipeline\take;
 
 /**

diff --git a/tests/EagerWithArraysTest.php b/tests/EagerWithArraysTest.php
@@ -21,10 +21,10 @@
 
 use Generator;
 use PHPUnit\Framework\TestCase;
-use function Pipeline\fromArray;
 use Pipeline\Standard;
-use function Pipeline\take;
 use ReflectionClass;
+use function Pipeline\fromArray;
+use function Pipeline\take;
 
 /**
  * @covers \Pipeline\Standard

diff --git a/tests/EdgeCasesTest.php b/tests/EdgeCasesTest.php
@@ -21,12 +21,12 @@
 
 use ArrayIterator;
 use Iterator;
-use function iterator_to_array;
 use IteratorIterator;
 use NoRewindIterator;
 use PHPUnit\Framework\TestCase;
-use function Pipeline\map;
 use Pipeline\Standard;
+use function iterator_to_array;
+use function Pipeline\map;
 use function range;
 
 /**

diff --git a/tests/ErrorsTest.php b/tests/ErrorsTest.php
@@ -20,12 +20,12 @@
 namespace Tests\Pipeline;
 
 use ArgumentCountError;
-use function class_exists;
-use function is_callable;
 use PHPUnit\Framework\Error\Warning;
 use PHPUnit\Framework\TestCase;
 use Pipeline\Standard;
 use TypeError;
+use function class_exists;
+use function is_callable;
 
 /**
  * @covers \Pipeline\Standard

diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php
@@ -19,9 +19,9 @@
 
 namespace Tests\Pipeline;
 
+use PHPUnit\Framework\TestCase;
 use function ob_end_clean;
 use function ob_start;
-use PHPUnit\Framework\TestCase;
 
 /**
  * @coversNothing

diff --git a/tests/FlipTest.php b/tests/FlipTest.php
@@ -19,16 +19,16 @@
 
 namespace Tests\Pipeline;
 
+use ArrayIterator;
+use IteratorIterator;
+use PHPUnit\Framework\TestCase;
+use Pipeline\Standard;
 use function array_flip;
 use function array_reverse;
-use ArrayIterator;
 use function call_user_func;
 use function chr;
 use function count;
-use IteratorIterator;
-use PHPUnit\Framework\TestCase;
 use function Pipeline\map;
-use Pipeline\Standard;
 use function Pipeline\take;
 use function shuffle;
 

diff --git a/tests/FunctionsTest.php b/tests/FunctionsTest.php
@@ -19,14 +19,14 @@
 
 namespace Tests\Pipeline;
 
-use function array_map;
 use ArrayIterator;
-use function iterator_to_array;
 use PHPUnit\Framework\TestCase;
+use Pipeline\Standard;
+use function array_map;
+use function iterator_to_array;
 use function Pipeline\fromArray;
 use function Pipeline\fromValues;
 use function Pipeline\map;
-use Pipeline\Standard;
 use function Pipeline\take;
 use function Pipeline\zip;
 use function range;

diff --git a/tests/IterableTest.php b/tests/IterableTest.php
@@ -19,9 +19,9 @@
 
 namespace Tests\Pipeline;
 
-use function iterator_to_array;
 use PHPUnit\Framework\TestCase;
 use Pipeline\Standard;
+use function iterator_to_array;
 
 /**
  * @covers \Pipeline\Standard

diff --git a/tests/LeaguePipelineTest.php b/tests/LeaguePipelineTest.php
@@ -20,8 +20,8 @@
 namespace Tests\Pipeline;
 
 use ArrayIterator;
-use function iterator_to_array;
 use PHPUnit\Framework\TestCase;
+use function iterator_to_array;
 
 /**
  * @coversNothing

diff --git a/tests/MinMaxTest.php b/tests/MinMaxTest.php
@@ -19,16 +19,16 @@
 
 namespace Tests\Pipeline;
 
+use ArrayIterator;
+use IteratorIterator;
+use PHPUnit\Framework\TestCase;
+use Pipeline\Standard;
 use function array_merge;
 use function array_reverse;
-use ArrayIterator;
 use function call_user_func;
 use function count;
-use IteratorIterator;
 use function max;
 use function min;
-use PHPUnit\Framework\TestCase;
-use Pipeline\Standard;
 use function Pipeline\take;
 use function range;
 use function shuffle;

diff --git a/tests/ReservoirTest.php b/tests/ReservoirTest.php
@@ -19,15 +19,15 @@
 
 namespace Tests\Pipeline;
 
-use function abs;
 use ArrayIterator;
 use IteratorIterator;
+use PHPUnit\Framework\TestCase;
+use Pipeline\Standard;
+use function abs;
 use function mt_rand;
 use function mt_srand;
 use function ord;
-use PHPUnit\Framework\TestCase;
 use function Pipeline\map;
-use Pipeline\Standard;
 use function Pipeline\take;
 use function range;
 use function sin;

diff --git a/tests/SliceTest.php b/tests/SliceTest.php
@@ -19,20 +19,20 @@
 
 namespace Tests\Pipeline;
 
-use function array_merge;
-use function array_slice;
-use function array_values;
 use ArrayIterator;
 use Closure;
 use Generator;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use Pipeline\Standard;
+use RuntimeException;
+use function array_merge;
+use function array_slice;
+use function array_values;
 use function Pipeline\fromArray;
 use function Pipeline\map;
-use Pipeline\Standard;
 use function Pipeline\take;
 use function range;
-use RuntimeException;
 
 /**
  * @covers \Pipeline\Standard

diff --git a/tests/StandardTest.php b/tests/StandardTest.php
@@ -21,16 +21,16 @@
 
 use ArrayIterator;
 use BadMethodCallException;
+use PHPUnit\Framework\TestCase;
+use Pipeline\Standard;
+use ReflectionClass;
 use function call_user_func;
 use function iterator_count;
 use function iterator_to_array;
 use function max;
-use PHPUnit\Framework\TestCase;
 use function Pipeline\fromArray;
 use function Pipeline\map;
-use Pipeline\Standard;
 use function range;
-use ReflectionClass;
 
 /**
  * @covers \Pipeline\Standard

diff --git a/tests/ZipTest.php b/tests/ZipTest.php
@@ -19,13 +19,13 @@
 
 namespace Tests\Pipeline;
 
-use function array_map;
 use ArrayIterator;
-use function max;
 use PHPUnit\Framework\TestCase;
+use Pipeline\Standard;
+use function array_map;
+use function max;
 use function Pipeline\fromArray;
 use function Pipeline\map;
-use Pipeline\Standard;
 use function Pipeline\take;
 use function Pipeline\zip;
 use function range;
@@ -106,8 +106,7 @@ public function testZipUnequalLengths(): void
     {
         $actual = take(['a', 'b', 'c'])
             ->zip([1, 2], [3])
-            ->toArray()
-        ;
+            ->toArray();
 
         $this->assertSame([
             ['a', 1, 3],
@@ -120,8 +119,7 @@ public function testZipUnevenLengths(): void
     {
         $actual = take(['a', 'b', 'c'])
             ->zip([1], [2, 3])
-            ->toArray()
-        ;
+            ->toArray();
 
         $this->assertSame([
             ['a', 1, 2],
@@ -134,8 +132,7 @@ public function testZipOverShortIndex(): void
     {
         $actual = take(['a', 'b', 'c'])
             ->zip(range(1, 10), range(10, 100, 10))
-            ->toArray()
-        ;
+            ->toArray();
 
         $this->assertSame([
             ['a', 1, 10],