Require php>=7.2

Author: Sevavietl

.gitignore

@@ -1,4 +1,5 @@
 .idea
 vendor
 composer.lock
-build
+build
+.phpunit.result.cache

composer.json

@@ -13,10 +13,10 @@
         }
     ],
     "require": {
-        "php": ">=5.6"
+        "php": ">=7.2",
+        "phpunit/phpunit": "^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "5.5.*",
         "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload": {
@@ -27,9 +27,6 @@
     "autoload-dev": {
         "psr-4": {
             "Sevavietl\\Arrays\\Tests\\Unit\\": "tests/unit/"
-        },
-        "classmap": [
-            "tests/TestCase.php"
-        ]
+        }
     }
 }

tests/TestCase.php

@@ -2,20 +2,21 @@
 
 namespace Sevavietl\Arrays\Tests\Unit;
 
+use PHPUnit\Framework\TestCase;
 use Sevavietl\Arrays\BaseArray;
 use Sevavietl\Arrays\UndefinedOffsetException;
 
-class BaseArrayTest extends \TestCase
+class BaseArrayTest extends TestCase
 {
     /**
      * @dataProvider instantiationDataProvider
      */
-    public function testInstantiation($argument)
+    public function testInstantiation($argument): void
     {
         new BaseArray($argument);
     }
 
-    public function instantiationDataProvider()
+    public function instantiationDataProvider(): array
     {
         return [
             [[1, 2, 3]],
@@ -25,15 +26,15 @@ public function instantiationDataProvider()
 
     /**
      * @dataProvider instantiationThrowsExceptionDataProvider
-     *
-     * @expectedException InvalidArgumentException
      */
-    public function testInstantiationThrowsException($argument)
+    public function testInstantiationThrowsException($argument): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         new BaseArray($argument);
     }
 
-    public function instantiationThrowsExceptionDataProvider()
+    public function instantiationThrowsExceptionDataProvider(): array
     {
         return [
             [1],
@@ -42,15 +43,15 @@ public function instantiationThrowsExceptionDataProvider()
         ];
     }
 
-    public function testThrowsExceptionOnUndefinedOffset()
+    public function testThrowsExceptionOnUndefinedOffset(): void
     {
         $this->expectException(UndefinedOffsetException::class);
 
         $arr = new BaseArray([1, 2, 3]);
         $arr[3];
     }
 
-    public function testItIsIterable()
+    public function testItIsIterable(): void
     {
         $arr = new BaseArray($initial = [1, 2, 3]);
 

tests/unit/BaseArrayTest.php

@@ -2,25 +2,23 @@
 
 namespace Sevavietl\Arrays\Tests\Unit;
 
+use PHPUnit\Framework\TestCase;
 use Sevavietl\Arrays\CompositeKeyArray;
 use Sevavietl\Arrays\UndefinedOffsetException;
 
-class CompositeKeyArrayTest extends \TestCase
+class CompositeKeyArrayTest extends TestCase
 {
     /**
      * @dataProvider arrayDataProviderForIssetTesting
      */
-    public function testOffsetExists($array, $offset, $exists)
+    public function testOffsetExists($array, $offset, bool $exists): void
     {
         $array = new CompositeKeyArray($array);
 
-        $this->assertEquals(
-            $exists,
-            isset($array[$offset])
-        );
+        $this->assertEquals($exists, isset($array[$offset]));
     }
 
-    public function arrayDataProviderForIssetTesting()
+    public function arrayDataProviderForIssetTesting(): array
     {
         return [
             [[1], 0, true],
@@ -41,17 +39,14 @@ public function arrayDataProviderForIssetTesting()
     /**
      * @dataProvider arrayDataProviderForGetTesting
      */
-    public function testOffsetGet($array, $offset, $value)
+    public function testOffsetGet($array, $offset, $value): void
     {
         $array = new CompositeKeyArray($array);
 
-        $this->assertEquals(
-            $value,
-            $array[$offset]
-        );
+        $this->assertEquals($value, $array[$offset]);
     }
 
-    public function arrayDataProviderForGetTesting()
+    public function arrayDataProviderForGetTesting(): array
     {
         return [
             [[1], 0, 1],
@@ -63,11 +58,10 @@ public function arrayDataProviderForGetTesting()
         ];
     }
 
-    /**
-     * @expectedException Sevavietl\Arrays\UndefinedOffsetException
-     */
-    public function testOffsetGetThrowsException()
+    public function testOffsetGetThrowsException(): void
     {
+        $this->expectException(UndefinedOffsetException::class);
+
         $array = new CompositeKeyArray();
 
         $value = $array[['foo', 'bar']];
@@ -76,72 +70,52 @@ public function testOffsetGetThrowsException()
     /**
      * @dataProvider arrayDataProviderForSetTesting
      */
-    public function testOffsetSet($array, $offset, $value)
+    public function testOffsetSet($array, $offset, $value): void
     {
         $array = new CompositeKeyArray($array);
-
         $array[$offset] = $value;
 
-        $this->assertEquals(
-            $value,
-            $array[$offset]
-        );
+        $this->assertEquals($value, $array[$offset]);
     }
 
-    public function arrayDataProviderForSetTesting()
+    public function arrayDataProviderForSetTesting(): array
     {
         return [
             [[], 0, 1],
             [[], [0, 1], 2],
         ];
     }
 
-    public function testOffsetSetEdgeCases()
+    public function testOffsetSetEdgeCases(): void
     {
         $array = new CompositeKeyArray();
-
         $array[[[]]] = 'foo';
 
-        $this->assertEquals(
-            'foo',
-            $array[0]
-        );
+        $this->assertEquals('foo', $array[0]);
 
         $array = new CompositeKeyArray();
-
         $array[[1, [], 2]] = 3;
 
-        $this->assertEquals(
-            3,
-            $array[[1, 0, 2]]
-        );
+        $this->assertEquals(3, $array[[1, 0, 2]]);
 
         $array = new CompositeKeyArray();
-
         $array[[1, [], [], [], 2]] = 3;
 
-        $this->assertEquals(
-            3,
-            $array[[1, 0, 0, 0, 2]]
-        );
+        $this->assertEquals(3, $array[[1, 0, 0, 0, 2]]);
     }
 
     /**
      * @dataProvider arrayDataProviderForUnsetTesting
      */
-    public function testOffsetUnset($array, $offset, $arrayAfterUnset)
+    public function testOffsetUnset($array, $offset, $arrayAfterUnset): void
     {
         $array = new CompositeKeyArray($array);
-
         unset($array[$offset]);
 
-        $this->assertEquals(
-            $arrayAfterUnset,
-            $array->toArray()
-        );
+        $this->assertEquals($arrayAfterUnset, $array->toArray());
     }
 
-    public function arrayDataProviderForUnsetTesting()
+    public function arrayDataProviderForUnsetTesting(): array
     {
         return [
             [[1], 0, []],
@@ -157,7 +131,7 @@ public function arrayDataProviderForUnsetTesting()
         ];
     }
 
-    public function testItIsIterable()
+    public function testItIsIterable(): void
     {
         $arr = new CompositeKeyArray($initial = [
             'foo' => ['bar' => ['baz']],