Merge branch 'move-to-salient'

Author: lkrms

.gitattributes

@@ -8,16 +8,16 @@
 /phpstan* export-ignore
 /phpunit* export-ignore
 /scripts export-ignore
+/src/Toolkit/Cli/CliOptionBuilder.php linguist-generated
+/src/Toolkit/Core/Facade/App.php linguist-generated
 /src/Toolkit/Core/Facade/Config.php linguist-generated
+/src/Toolkit/Core/Facade/Console.php linguist-generated
+/src/Toolkit/Core/Facade/Err.php linguist-generated
 /src/Toolkit/Core/Facade/Event.php linguist-generated
-/src/Util/Cli/CliOptionBuilder.php linguist-generated
+/src/Toolkit/Core/Facade/Profile.php linguist-generated
 /src/Util/Curler/CurlerBuilder.php linguist-generated
 /src/Util/Curler/Support/CurlerPageBuilder.php linguist-generated
-/src/Util/Facade/App.php linguist-generated
 /src/Util/Facade/Cache.php linguist-generated
-/src/Util/Facade/Console.php linguist-generated
-/src/Util/Facade/Err.php linguist-generated
-/src/Util/Facade/Profile.php linguist-generated
 /src/Util/Facade/Sync.php linguist-generated
 /src/Util/Sync/Support/DbSyncDefinitionBuilder.php linguist-generated
 /src/Util/Sync/Support/HttpSyncDefinitionBuilder.php linguist-generated

docs/Builders.md

@@ -5,9 +5,9 @@
 ```php
 <?php
 
-use Lkrms\Concept\Builder;
-use Lkrms\Concern\HasBuilder;
-use Lkrms\Contract\Buildable;
+use Salient\Core\Concern\HasBuilder;
+use Salient\Core\Contract\Buildable;
+use Salient\Core\AbstractBuilder;
 
 /**
  * @implements Buildable<OptionBuilder>
@@ -48,9 +48,9 @@ class Option implements Buildable
  * @method $this valueType($value)
  * @method $this description($value)
  *
- * @extends Builder<Option>
+ * @extends AbstractBuilder<Option>
  */
-class OptionBuilder extends Builder
+class OptionBuilder extends AbstractBuilder
 {
     protected static function getService(): string
     {

lk-util/Command/Concept/Command.php

@@ -2,10 +2,10 @@
 
 namespace Lkrms\LkUtil\Command\Concept;
 
-use Lkrms\Cli\Exception\CliInvalidArgumentsException;
-use Lkrms\Cli\CliCommand;
 use Lkrms\Contract\IProvider;
 use Lkrms\LkUtil\Catalog\EnvVar;
+use Salient\Cli\Exception\CliInvalidArgumentsException;
+use Salient\Cli\CliCommand;
 use Salient\Core\Exception\FilesystemErrorException;
 use Salient\Core\Utility\Env;
 use Salient\Core\Utility\File;

lk-util/Command/Generate/Concept/GenerateCommand.php

@@ -2,22 +2,22 @@
 
 namespace Lkrms\LkUtil\Command\Generate\Concept;
 
-use Lkrms\Cli\Catalog\CliOptionType;
-use Lkrms\Cli\Exception\CliInvalidArgumentsException;
-use Lkrms\Cli\CliOption;
-use Lkrms\Cli\CliOptionBuilder;
 use Lkrms\Concept\Entity;
 use Lkrms\Concept\Provider;
-use Lkrms\Console\Catalog\ConsoleLevel as Level;
-use Lkrms\Facade\Console;
 use Lkrms\LkUtil\Command\Concept\Command;
 use Lkrms\Support\PhpDoc\PhpDoc;
 use Lkrms\Support\PhpDoc\PhpDocTag;
 use Lkrms\Support\PhpDoc\PhpDocTemplateTag;
 use Lkrms\Support\Introspector;
 use Lkrms\Support\ProviderContext;
 use Lkrms\Support\TokenExtractor;
+use Salient\Cli\Catalog\CliOptionType;
+use Salient\Cli\Exception\CliInvalidArgumentsException;
+use Salient\Cli\CliOption;
+use Salient\Cli\CliOptionBuilder;
+use Salient\Console\Catalog\ConsoleLevel as Level;
 use Salient\Core\Catalog\Regex;
+use Salient\Core\Facade\Console;
 use Salient\Core\Utility\Arr;
 use Salient\Core\Utility\File;
 use Salient\Core\Utility\Get;

lk-util/Command/Generate/GenerateBuilder.php

@@ -2,18 +2,18 @@
 
 namespace Lkrms\LkUtil\Command\Generate;
 
-use Lkrms\Cli\Catalog\CliOptionType;
-use Lkrms\Cli\CliOption;
-use Lkrms\Concept\Builder;
 use Lkrms\LkUtil\Catalog\EnvVar;
 use Lkrms\LkUtil\Command\Generate\Concept\GenerateCommand;
 use Lkrms\Support\PhpDoc\PhpDoc;
 use Lkrms\Support\PhpDoc\PhpDocTemplateTag;
 use Lkrms\Support\Introspector;
+use Salient\Cli\Catalog\CliOptionType;
+use Salient\Cli\CliOption;
 use Salient\Core\Utility\Pcre;
 use Salient\Core\Utility\Reflect;
 use Salient\Core\Utility\Str;
 use Salient\Core\Utility\Test;
+use Salient\Core\AbstractBuilder;
 use Closure;
 use ReflectionMethod;
 use ReflectionParameter;
@@ -25,10 +25,10 @@
 class GenerateBuilder extends GenerateCommand
 {
     /**
-     * Properties and methods that shouldn't be surfaced by the Builder
+     * Properties and methods that shouldn't be surfaced by the builder
      */
     private const SKIP = [
-        // These are displaced by Builder
+        // These are displaced by AbstractBuilder
         'apply',
         'build',
         'getB',
@@ -165,7 +165,7 @@ protected function run(string ...$args)
         $classPrefix = $this->getClassPrefix();
 
         $service = $this->getFqcnAlias($classFqcn, $classClass);
-        $extends = $this->getFqcnAlias(Builder::class);
+        $extends = $this->getFqcnAlias(AbstractBuilder::class);
 
         $desc = $this->Description === null
             ? "A fluent $classClass factory"

lk-util/Command/Generate/GenerateFacade.php

@@ -2,11 +2,11 @@
 
 namespace Lkrms\LkUtil\Command\Generate;
 
-use Lkrms\Cli\Catalog\CliOptionType;
-use Lkrms\Cli\CliOption;
 use Lkrms\LkUtil\Catalog\EnvVar;
 use Lkrms\LkUtil\Command\Generate\Concept\GenerateCommand;
 use Lkrms\Support\PhpDoc\PhpDoc;
+use Salient\Cli\Catalog\CliOptionType;
+use Salient\Cli\CliOption;
 use Salient\Core\Utility\Arr;
 use Salient\Core\Utility\Reflect;
 use Salient\Core\AbstractFacade;

lk-util/Command/Generate/GenerateSyncEntity.php

@@ -2,10 +2,6 @@
 
 namespace Lkrms\LkUtil\Command\Generate;
 
-use Lkrms\Cli\Catalog\CliOptionType;
-use Lkrms\Cli\Catalog\CliOptionValueType;
-use Lkrms\Cli\Exception\CliInvalidArgumentsException;
-use Lkrms\Cli\CliOption;
 use Lkrms\Concern\HasParent;
 use Lkrms\Contract\ITreeable;
 use Lkrms\Http\Catalog\HttpRequestMethod;
@@ -15,6 +11,10 @@
 use Lkrms\Sync\Concept\SyncEntity;
 use Lkrms\Sync\Support\DeferredEntity;
 use Lkrms\Sync\Support\DeferredRelationship;
+use Salient\Cli\Catalog\CliOptionType;
+use Salient\Cli\Catalog\CliOptionValueType;
+use Salient\Cli\Exception\CliInvalidArgumentsException;
+use Salient\Cli\CliOption;
 use Salient\Core\Utility\Arr;
 use Salient\Core\Utility\Get;
 use Salient\Core\Utility\Inflect;

lk-util/Command/Generate/GenerateSyncProvider.php

@@ -2,16 +2,16 @@
 
 namespace Lkrms\LkUtil\Command\Generate;
 
-use Lkrms\Cli\Catalog\CliOptionType;
-use Lkrms\Cli\Exception\CliInvalidArgumentsException;
-use Lkrms\Cli\CliOption;
 use Lkrms\Facade\Sync;
 use Lkrms\LkUtil\Command\Generate\Concept\GenerateCommand;
 use Lkrms\Sync\Catalog\SyncOperation;
 use Lkrms\Sync\Contract\ISyncContext;
 use Lkrms\Sync\Contract\ISyncEntity;
 use Lkrms\Sync\Contract\ISyncProvider;
 use Lkrms\Sync\Support\SyncIntrospector;
+use Salient\Cli\Catalog\CliOptionType;
+use Salient\Cli\Exception\CliInvalidArgumentsException;
+use Salient\Cli\CliOption;
 use Salient\Core\Utility\Arr;
 use Salient\Core\Utility\Str;
 

lk-util/Command/Generate/GenerateTests.php

@@ -2,11 +2,11 @@
 
 namespace Lkrms\LkUtil\Command\Generate;
 
-use Lkrms\Cli\Catalog\CliOptionType;
-use Lkrms\Cli\CliOption;
 use Lkrms\LkUtil\Catalog\EnvVar;
 use Lkrms\LkUtil\Command\Generate\Concept\GenerateCommand;
 use PHPUnit\Framework\TestCase;
+use Salient\Cli\Catalog\CliOptionType;
+use Salient\Cli\CliOption;
 use Salient\Core\Utility\Reflect;
 use Salient\Core\Utility\Str;
 

lk-util/Command/Http/SendHttpRequest.php

@@ -2,12 +2,12 @@
 
 namespace Lkrms\LkUtil\Command\Http;
 
-use Lkrms\Cli\Catalog\CliOptionType;
-use Lkrms\Cli\Catalog\CliOptionValueType;
-use Lkrms\Cli\CliOption;
 use Lkrms\Http\Catalog\HttpRequestMethod;
 use Lkrms\LkUtil\Command\Concept\Command;
 use Lkrms\Sync\Concept\HttpSyncProvider;
+use Salient\Cli\Catalog\CliOptionType;
+use Salient\Cli\Catalog\CliOptionValueType;
+use Salient\Cli\CliOption;
 use Salient\Core\Exception\UnexpectedValueException;
 use Salient\Core\Utility\Arr;
 use Salient\Core\Utility\Get;