update

Author: fey

.github/workflows/phpci.yaml

@@ -19,11 +19,8 @@ jobs:
       with:
         php-version: '8.4'
 
-    - name: PHP Security Checker
-      uses: StephaneBour/[email protected]
-
     - name: Setup project
-      run: make setup
+      run: make install
 
     - name: Check lint
       run: make lint

composer.json

@@ -10,20 +10,15 @@
         }
     ],
     "require": {
-        "php": ">=7.4 || >=8.1"
-    },
-    "scripts": {
-        "phpcs": "phpcs",
-        "phpunit": "phpunit",
-        "test": "phpunit tests"
+        "php": ">=8.3"
     },
     "autoload": {
         "files": [
             "src/trees.php"
         ]
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.6"
+        "phpunit/phpunit": "^12",
+        "squizlabs/php_codesniffer": "*"
     }
 }

src/trees.php

@@ -9,7 +9,7 @@
  * @param array $meta
  * @return array
  */
-function mkdir(string $name, array $children = [], array $meta = [])
+function mkdir(string $name, array $children = [], array $meta = []): array
 {
     return [
         "name" => $name,
@@ -25,7 +25,7 @@ function mkdir(string $name, array $children = [], array $meta = [])
  * @param array $meta
  * @return array
  */
-function mkfile(string $name, array $meta = [])
+function mkfile(string $name, array $meta = []): array
 {
     return [
         "name" => $name,
@@ -43,7 +43,7 @@ function mkfile(string $name, array $meta = [])
  * getChildren(mkdir('etc')); // []
  * getChildren(mkdir('etc', [mkfile('name')])); // [<file>]
  */
-function getChildren($node)
+function getChildren($node): array
 {
     return $node['children'];
 }
@@ -56,7 +56,7 @@ function getChildren($node)
  * getMeta(mkfile('etc')); // []
  * getMeta(mkfile('etc', ['owner' => 'root'])); // ['owner' => 'root']
  */
-function getMeta($node)
+function getMeta($node): array
 {
     return $node['meta'];
 }
@@ -69,7 +69,7 @@ function getMeta($node)
  * getName(mkfile('etc')); // etc
  * getName(mkdir('/')); // /
  */
-function getName($node)
+function getName($node): string
 {
     return $node['name'];
 }
@@ -79,7 +79,7 @@ function getName($node)
  * @param array $node
  * @return boolean
  */
-function isFile($node)
+function isFile($node): bool
 {
     return $node['type'] == 'file';
 }
@@ -89,7 +89,7 @@ function isFile($node)
  * @param array $node
  * @return boolean
  */
-function isDirectory($node)
+function isDirectory($node): bool
 {
     return $node['type'] == 'directory';
 }
@@ -124,7 +124,7 @@ function array_flatten($tree, $depth = 0)
  * @param array $tree
  * @return array
  */
-function map($func, $tree)
+function map($func, $tree): array
 {
     $updatedNode = $func($tree);
     $children = $tree['children'] ?? [];
@@ -144,7 +144,7 @@ function map($func, $tree)
  * @param mixed $accumulator
  * @return mixed
  */
-function reduce($func, $tree, $accumulator)
+function reduce($func, $tree, $accumulator): mixed
 {
     $children = $tree['children'] ?? [];
     $newAcc = $func($accumulator, $tree);
@@ -164,9 +164,9 @@ function reduce($func, $tree, $accumulator)
  * Filter tree
  * @param callable $func
  * @param array $tree
- * @return array
+ * @return ?array
  */
-function filter($func, $tree)
+function filter($func, $tree): ?array
 {
     if (!$func($tree)) {
         return null;

tests/TreesTest.php

@@ -18,7 +18,7 @@
 
 class TreesTest extends TestCase
 {
-    public function testMake()
+    public function testMake(): void
     {
         $tree = mkdir('/', [mkdir('etc'), mkdir('usr'), mkfile('robots.txt')]);
         $expected = [
@@ -49,19 +49,19 @@ public function testMake()
         $this->assertEquals($expected, $tree);
     }
 
-    public function testGetMeta()
+    public function testGetMeta(): void
     {
         $file = mkfile('etc', ['owner' => 'root']);
         $this->assertEquals(['owner' => 'root'], getMeta($file));
     }
 
-    public function testGetName()
+    public function testGetName(): void
     {
         $file = mkfile('etc');
         $this->assertEquals('etc', getName($file));
     }
 
-    public function testGetChildren()
+    public function testGetChildren(): void
     {
         $tree = mkdir('/', [mkdir('etc'), mkdir('usr'), mkfile('robots.txt')]);
         $expected = [
@@ -86,19 +86,19 @@ public function testGetChildren()
         $this->assertEquals($expected, getChildren($tree));
     }
 
-    public function testFile()
+    public function testFile(): void
     {
         $file = mkfile('robots.txt');
         $this->assertTrue(isFile($file));
     }
 
-    public function testDirectory()
+    public function testDirectory(): void
     {
         $directory = mkdir('/');
         $this->assertTrue(isDirectory($directory));
     }
 
-    public function testFlattenDepth()
+    public function testFlattenDepth(): void
     {
         $tree = [1, 2, [3, [4, 5], [6, 7], 8]];
         $this->assertEquals([], array_flatten([]));
@@ -108,7 +108,7 @@ public function testFlattenDepth()
         $this->assertEquals([1, 2, 3, 4, 5, 6, 7, 8], array_flatten($tree, 3));
     }
 
-    public function testMap()
+    public function testMap(): void
     {
         $tree = mkdir('/', [
             mkdir('eTc', [
@@ -154,7 +154,7 @@ public function testMap()
         $this->assertEquals($expected, $actual);
     }
 
-    public function testReduce()
+    public function testReduce(): void
     {
         $tree = mkdir('/', [
             mkdir('eTc', [
@@ -178,7 +178,7 @@ public function testReduce()
         $this->assertEquals(4, $actual3);
     }
 
-    public function testFilter()
+    public function testFilter(): void
     {
         $tree = mkdir('/', [
             mkdir('etc', [
@@ -229,7 +229,7 @@ public function testFilter()
         $this->assertEquals($expected, $actual);
     }
 
-    public function testFilter2()
+    public function testFilter2(): void
     {
         $tree = mkdir('/', [
             mkdir('etc', [