From 2e9b4c2dbff08a7a7c305050e161834e81be2558 Mon Sep 17 00:00:00 2001
From: Denis Smetannikov <SmetDenis@users.noreply.github.com>
Date: Sun, 5 Mar 2023 22:17:45 +0300
Subject: [PATCH] Bump PHP version, fixes in stylish (#9)

---
 .github/workflows/main.yml                    | 12 +++++-----
 composer.json                                 | 17 +++++++++-----
 src/var-dumper.php                            |  3 +--
 tests/ToolboxDevCodestyleTest.php             | 21 ------------------
 tests/ToolboxDevComposerTest.php              | 21 ------------------
 tests/ToolboxDevReadmeTest.php                | 22 -------------------
 ...pyrightTest.php => ToolboxPackageTest.php} |  4 +++-
 7 files changed, 21 insertions(+), 79 deletions(-)
 delete mode 100644 tests/ToolboxDevCodestyleTest.php
 delete mode 100644 tests/ToolboxDevComposerTest.php
 delete mode 100644 tests/ToolboxDevReadmeTest.php
 rename tests/{ToolboxDevCopyrightTest.php => ToolboxPackageTest.php} (81%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c6ca43..56930d1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,7 +39,7 @@ jobs:
         composer_flags: [ "--prefer-lowest", "" ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -63,7 +63,7 @@ jobs:
         run: make report-coveralls --no-print-directory || true
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
           path: build/
@@ -77,7 +77,7 @@ jobs:
         php-version: [ 8.1, 8.2 ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -95,7 +95,7 @@ jobs:
         run: make codestyle --no-print-directory
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Linters - ${{ matrix.php-version }}
           path: build/
@@ -109,7 +109,7 @@ jobs:
         php-version: [ 8.1, 8.2 ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -126,7 +126,7 @@ jobs:
         run: make report-all --no-print-directory
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Reports - ${{ matrix.php-version }}
           path: build/
diff --git a/composer.json b/composer.json
index c25a3f9..710941a 100644
--- a/composer.json
+++ b/composer.json
@@ -3,6 +3,15 @@
     "type"         : "library",
     "description"  : "Developer toolbox only for JBZoo libs on github+travis",
     "license"      : "MIT",
+    "keywords"     : [
+        "jbzoo",
+        "toolbox",
+        "dev",
+        "devkit",
+        "dev-kit",
+        "developer",
+        "debug"
+    ],
 
     "authors"      : [
         {
@@ -27,18 +36,14 @@
     },
 
     "autoload"     : {
-        "psr-4" : {
-            "JBZoo\\ToolboxDev\\" : "src"
-        },
+        "psr-4" : {"JBZoo\\ToolboxDev\\" : "src"},
         "files" : [
             "src/var-dumper.php"
         ]
     },
 
     "autoload-dev" : {
-        "classmap" : [
-            "tests"
-        ]
+        "psr-4" : {"JBZoo\\PHPUnit\\" : "tests"}
     },
 
     "config"       : {
diff --git a/src/var-dumper.php b/src/var-dumper.php
index 5bf708c..5782552 100644
--- a/src/var-dumper.php
+++ b/src/var-dumper.php
@@ -23,8 +23,7 @@
     return false;
 }
 
-/** @psalm-suppress MissingClosureParamType */
-VarDumper::setHandler(static function ($variable): void {
+VarDumper::setHandler(static function (mixed $variable): void {
     $maxStringWidth = 16384; // Show first 16kb only, optimization
 
     $varCloner = new VarCloner();
diff --git a/tests/ToolboxDevCodestyleTest.php b/tests/ToolboxDevCodestyleTest.php
deleted file mode 100644
index 4f11635..0000000
--- a/tests/ToolboxDevCodestyleTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * JBZoo Toolbox - Toolbox-Dev.
- *
- * This file is part of the JBZoo Toolbox project.
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @license    MIT
- * @copyright  Copyright (C) JBZoo.com, All rights reserved.
- * @see        https://github.com/JBZoo/Toolbox-Dev
- */
-
-declare(strict_types=1);
-
-namespace JBZoo\PHPUnit;
-
-final class ToolboxDevCodestyleTest extends \JBZoo\CodeStyle\PHPUnit\AbstractCodeStyleTest
-{
-}
diff --git a/tests/ToolboxDevComposerTest.php b/tests/ToolboxDevComposerTest.php
deleted file mode 100644
index 848bfbd..0000000
--- a/tests/ToolboxDevComposerTest.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * JBZoo Toolbox - Toolbox-Dev.
- *
- * This file is part of the JBZoo Toolbox project.
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @license    MIT
- * @copyright  Copyright (C) JBZoo.com, All rights reserved.
- * @see        https://github.com/JBZoo/Toolbox-Dev
- */
-
-declare(strict_types=1);
-
-namespace JBZoo\PHPUnit;
-
-final class ToolboxDevComposerTest extends \JBZoo\CodeStyle\PHPUnit\AbstractComposerTest
-{
-}
diff --git a/tests/ToolboxDevReadmeTest.php b/tests/ToolboxDevReadmeTest.php
deleted file mode 100644
index f1f93cf..0000000
--- a/tests/ToolboxDevReadmeTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * JBZoo Toolbox - Toolbox-Dev.
- *
- * This file is part of the JBZoo Toolbox project.
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @license    MIT
- * @copyright  Copyright (C) JBZoo.com, All rights reserved.
- * @see        https://github.com/JBZoo/Toolbox-Dev
- */
-
-declare(strict_types=1);
-
-namespace JBZoo\PHPUnit;
-
-final class ToolboxDevReadmeTest extends \JBZoo\CodeStyle\PHPUnit\AbstractReadmeTest
-{
-    protected string $packageName = 'Toolbox-Dev';
-}
diff --git a/tests/ToolboxDevCopyrightTest.php b/tests/ToolboxPackageTest.php
similarity index 81%
rename from tests/ToolboxDevCopyrightTest.php
rename to tests/ToolboxPackageTest.php
index 9fcdebf..dafb24d 100644
--- a/tests/ToolboxDevCopyrightTest.php
+++ b/tests/ToolboxPackageTest.php
@@ -16,7 +16,9 @@
 
 namespace JBZoo\PHPUnit;
 
-final class ToolboxDevCopyrightTest extends \JBZoo\CodeStyle\PHPUnit\AbstractCopyrightTest
+use JBZoo\Codestyle\PHPUnit\AbstractPackageTest;
+
+final class ToolboxPackageTest extends AbstractPackageTest
 {
     protected string $packageName = 'Toolbox-Dev';
 }