Merge branch 'cleanup'

lkrms · lkrms · commit aab42fe44a1e · 2024-07-29T17:06:24.000+10:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -10,8 +10,8 @@
         __DIR__ . '/scripts',
     ])
     ->append([
-        __DIR__ . '/bin/sli',
         __DIR__ . '/bootstrap.php',
+        __DIR__ . '/src/Toolkit/Sli/sli',
         __DIR__ . '/tests/phpstan-conditional.php',
         __DIR__ . '/tests/test-sli',
         __DIR__ . '/stubs/ADOConnection.stub',
diff --git a/.prettyphp b/.prettyphp
@@ -1,6 +1,5 @@
 {
     "src": [
-        "bin/sli",
         "scripts",
         "src",
         "stubs",
@@ -14,7 +13,7 @@
         ".php-cs-fixer.dist.php",
         "bootstrap.php"
     ],
-    "includeIfPhp": "/\\.stub$/",
+    "includeIfPhp": "/(\\/sli|\\.stub)$/",
     "enable": [
         "preserve-one-line",
         "strict-lists"
diff --git a/bin/sli b/bin/sli
diff --git a/bin/sli b/bin/sli
@@ -0,0 +1 @@
+../src/Toolkit/Sli/sli
diff --git a/composer.json b/composer.json
@@ -66,6 +66,7 @@
     },
     "provide": {
         "psr/event-dispatcher-implementation": "^1",
+        "psr/http-client-implementation": "^1",
         "psr/http-factory-implementation": "^1",
         "psr/http-message-implementation": "^1.1 || ^2",
         "psr/log-implementation": "^1",
@@ -104,7 +105,7 @@
         ]
     },
     "bin": [
-        "bin/sli"
+        "src/Toolkit/Sli/sli"
     ],
     "config": {
         "allow-plugins": {
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -5,9 +5,9 @@ includes:
 parameters:
 	level: 9
 	paths:
-		- bin/sli
 		- scripts
 		- src
+		- src/Toolkit/Sli/sli
 		- stubs
 		- tests/3rdparty
 		- tests/fixtures
diff --git a/src/Toolkit/Container/composer.json b/src/Toolkit/Container/composer.json
@@ -20,7 +20,7 @@
         "salient/console": "self.version",
         "salient/contracts": "self.version",
         "salient/core": "self.version",
-        "salient/utility": "self.version"
+        "salient/utils": "self.version"
     },
     "provide": {
         "psr/container-implementation": "^2"
diff --git a/src/Toolkit/Core/composer.json b/src/Toolkit/Core/composer.json
@@ -16,7 +16,9 @@
     "require": {
         "php": ">=7.4",
         "psr/event-dispatcher": "^1",
+        "salient/container": "self.version",
         "salient/contracts": "self.version",
+        "salient/iterators": "self.version",
         "salient/utils": "self.version"
     },
     "provide": {
diff --git a/src/Toolkit/Curler/composer.json b/src/Toolkit/Curler/composer.json
@@ -15,8 +15,15 @@
     },
     "require": {
         "php": ">=7.4",
+        "psr/http-client": "^1",
+        "psr/http-message": "^1.1 || ^2",
         "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/core": "self.version",
+        "salient/http": "self.version",
+        "salient/utils": "self.version"
+    },
+    "provide": {
+        "psr/http-client-implementation": "^1"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Toolkit/Db/composer.json b/src/Toolkit/Db/composer.json
@@ -15,8 +15,10 @@
     },
     "require": {
         "php": ">=7.4",
+        "adodb/adodb-php": "^5.22",
         "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/core": "self.version",
+        "salient/utils": "self.version"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Toolkit/Http/composer.json b/src/Toolkit/Http/composer.json
@@ -15,8 +15,21 @@
     },
     "require": {
         "php": ">=7.4",
+        "psr/http-factory": "^1",
+        "psr/http-message": "^1.1 || ^2",
+        "salient/collections": "self.version",
         "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/core": "self.version",
+        "salient/utils": "self.version"
+    },
+    "provide": {
+        "psr/http-factory-implementation": "^1",
+        "psr/http-message-implementation": "^1.1 || ^2"
+    },
+    "suggest": {
+        "firebase/php-jwt": "Required by OAuth2Client",
+        "league/oauth2-client": "Required by OAuth2Client",
+        "salient/curler": "Required by OAuth2Client"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Toolkit/Iterator/composer.json b/src/Toolkit/Iterator/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": ">=7.4",
         "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/utils": "self.version"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Toolkit/PHPDoc/composer.json b/src/Toolkit/PHPDoc/composer.json
@@ -16,7 +16,8 @@
     "require": {
         "php": ">=7.4",
         "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/core": "self.version",
+        "salient/utils": "self.version"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Toolkit/PHPStan/composer.json b/src/Toolkit/PHPStan/composer.json
@@ -15,8 +15,8 @@
     },
     "require": {
         "php": ">=7.4",
-        "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "phpstan/phpstan": "^1.11",
+        "salient/utils": "self.version"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Toolkit/Polyfill/composer.json b/src/Toolkit/Polyfill/composer.json
@@ -15,8 +15,7 @@
     },
     "require": {
         "php": ">=7.4",
-        "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/utils": "self.version"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Toolkit/Sli/composer.json b/src/Toolkit/Sli/composer.json
@@ -15,8 +15,15 @@
     },
     "require": {
         "php": ">=7.4",
+        "salient/cli": "self.version",
         "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/core": "self.version",
+        "salient/phpdoc": "self.version",
+        "salient/sync": "self.version",
+        "salient/utils": "self.version"
+    },
+    "suggest": {
+        "sebastian/diff": "Required to show changes to generated files"
     },
     "autoload": {
         "psr-4": {
@@ -25,5 +32,8 @@
     },
     "config": {
         "sort-packages": true
-    }
+    },
+    "bin": [
+        "sli"
+    ]
 }
diff --git a/src/Toolkit/Sli/sli b/src/Toolkit/Sli/sli
@@ -0,0 +1,35 @@
+#!/usr/bin/env php
+<?php declare(strict_types=1);
+
+use Composer\Autoload\ClassLoader;
+use Salient\Cli\CliApplication;
+use Salient\Sli\Command\Generate\GenerateBuilder;
+use Salient\Sli\Command\Generate\GenerateFacade;
+use Salient\Sli\Command\Generate\GenerateSyncEntity;
+use Salient\Sli\Command\Generate\GenerateSyncProvider;
+use Salient\Sli\Command\Generate\GenerateTests;
+use Salient\Sli\Command\Http\SendHttpRequest;
+use Salient\Sync\Command\CheckSyncProviderHeartbeat;
+use Salient\Sync\Command\GetSyncEntities;
+
+/** @var ClassLoader */
+$loader = require $_composer_autoload_path
+    ?? dirname(__DIR__, 3) . '/vendor/autoload.php';
+
+(new CliApplication())
+    ->command(['generate', 'builder'], GenerateBuilder::class)
+    ->command(['generate', 'facade'], GenerateFacade::class)
+    ->command(['generate', 'tests'], GenerateTests::class)
+    ->command(['generate', 'sync', 'entity'], GenerateSyncEntity::class)
+    ->command(['generate', 'sync', 'provider'], GenerateSyncProvider::class)
+    ->command(['sync', 'provider', 'check-heartbeat'], CheckSyncProviderHeartbeat::class)
+    ->command(['sync', 'entity', 'get'], GetSyncEntities::class)
+    ->command(['http', 'get'], SendHttpRequest::class)
+    ->command(['http', 'head'], SendHttpRequest::class)
+    ->command(['http', 'post'], SendHttpRequest::class)
+    ->command(['http', 'put'], SendHttpRequest::class)
+    ->command(['http', 'delete'], SendHttpRequest::class)
+    ->command(['http', 'patch'], SendHttpRequest::class)
+    ->resumeCache()
+    ->logOutput()
+    ->runAndExit();
diff --git a/src/Toolkit/Sync/composer.json b/src/Toolkit/Sync/composer.json
@@ -15,8 +15,18 @@
     },
     "require": {
         "php": ">=7.4",
+        "salient/collections": "self.version",
+        "salient/console": "self.version",
+        "salient/container": "self.version",
         "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/core": "self.version",
+        "salient/iterators": "self.version"
+    },
+    "suggest": {
+        "salient/cli": "Required by commands in Salient\\Sync\\Command",
+        "salient/curler": "Required by HttpSyncProvider",
+        "salient/db": "Required by DbSyncProvider",
+        "salient/http": "Required by HttpSyncProvider"
     },
     "autoload": {
         "psr-4": {
diff --git a/tests/test-sli b/tests/test-sli
@@ -32,4 +32,4 @@ Event::getInstance()->listen(
         ),
 );
 
-require dirname(__DIR__) . '/bin/sli';
+require dirname(__DIR__) . '/src/Toolkit/Sli/sli';
