Merge branch 'update'

lkrms · Aug 2, 2024 · 0c57a3f · 0c57a3f
2 parents 3ad5220 + a7596ec
commit 0c57a3f
Show file tree

Hide file tree

Showing 36 changed files with 700 additions and 199 deletions.
diff --git a/.vscode/php.code-snippets b/.vscode/php.code-snippets
@@ -21,7 +21,9 @@
 			"",
 			"namespace ${TM_DIRECTORY/^.*\\\\/(src|(tests\\\\/(?:unit|integration|fixtures)))|\\\\/([a-zA-Z0-9]+)/${1:+Lkrms\\\\PrettyPHP}${2:+\\\\Tests}${3:+\\\\}$3/g};",
 			"",
-			"final class ${TM_FILENAME_BASE/[^a-zA-Z0-9]+//g} extends \\Lkrms\\PrettyPHP\\Tests\\TestCase",
+			"use Lkrms\\PrettyPHP\\Tests\\TestCase;",
+			"",
+			"final class ${TM_FILENAME_BASE/[^a-zA-Z0-9]+//g} extends TestCase",
 			"{",
 			"    /**",
 			"     * @dataProvider outputProvider",
@@ -57,10 +59,11 @@
 			"",
 			"namespace ${TM_DIRECTORY/^.*\\\\/(src|(tests\\\\/(?:unit|integration|fixtures)))|\\\\/([a-zA-Z0-9]+)/${1:+Lkrms\\\\PrettyPHP}${2:+\\\\Tests}${3:+\\\\}$3/g};",
 			"",
+			"use Lkrms\\PrettyPHP\\Tests\\TestCase;",
 			"use Lkrms\\PrettyPHP\\Formatter;",
 			"use Lkrms\\PrettyPHP\\FormatterBuilder as FormatterB;",
 			"",
-			"final class ${TM_FILENAME_BASE/[^a-zA-Z0-9]+//g} extends \\Lkrms\\PrettyPHP\\Tests\\TestCase",
+			"final class ${TM_FILENAME_BASE/[^a-zA-Z0-9]+//g} extends TestCase",
 			"{",
 			"    /**",
 			"     * @dataProvider outputProvider",

diff --git a/box.json b/box.json
@@ -15,10 +15,9 @@
                 "/^(?:LICENSE|README|composer\\.(?:json|lock))$|phpstan\\.|\\.md$/"
             ],
             "notPath": [
-                "/^bin\\//",
-                "/^salient\\/toolkit\\/(?:bin|src\\/(?:Sli|Toolkit\\/(?:Contract\\/)?(?:Curler|Db|Http|PHPStan|Sync)))\\//",
+                "/^salient\\/contracts\\/(?:Curler|Db|Http|Sync)\\//",
                 "/^lkrms\\/dice\\/src\\/Loader\\//",
-                "/^psr\\/(?:http-(?:client|factory|message)|log\\/Psr\\/Log\\/Test)\\//"
+                "/^psr\\/(?:http-(?:client|message)|log\\/Psr\\/Log\\/Test)\\//"
             ]
         }
     ],

diff --git a/composer.json b/composer.json
@@ -18,7 +18,14 @@
         "ext-mbstring": "*",
         "ext-tokenizer": "*",
         "composer-runtime-api": "^2.2",
-        "salient/toolkit": "^0.99.30",
+        "salient/cli": "^0.99",
+        "salient/collections": "^0.99",
+        "salient/console": "^0.99",
+        "salient/contracts": "^0.99",
+        "salient/core": "^0.99",
+        "salient/phpdoc": "^0.99",
+        "salient/polyfills": "^0.99",
+        "salient/utils": "^0.99",
         "sebastian/diff": "^4 || ^5"
     },
     "require-dev": {
@@ -28,7 +35,9 @@
         "phpstan/phpstan": "^1",
         "phpstan/phpstan-deprecation-rules": "^1",
         "phpstan/phpstan-phpunit": "^1",
-        "phpunit/phpunit": "^9"
+        "phpunit/phpunit": "^9",
+        "salient/phpstan": "^0.99",
+        "salient/sli": "^0.99"
     },
     "autoload": {
         "psr-4": {