Merge branch 'cleanup'

Author: lkrms

.php-cs-fixer.dist.php

@@ -5,6 +5,7 @@
         __DIR__ . '/src',
         __DIR__ . '/stubs',
         __DIR__ . '/tests/unit',
+        __DIR__ . '/tests/fixtures',
         __DIR__ . '/lk-util',
         __DIR__ . '/scripts',
     ])
@@ -22,6 +23,7 @@
         'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
         'no_unneeded_import_alias' => true,
         'no_unused_imports' => true,
+        'phpdoc_no_useless_inheritdoc' => true,
         'single_import_per_statement' => true,
         'yoda_style' => ['equal' => false, 'identical' => false],
     ])

bootstrap.php

@@ -1,5 +1,7 @@
 <?php declare(strict_types=1);
 
-if (\Composer\InstalledVersions::isInstalled('adodb/adodb-php')) {
-    require \Composer\InstalledVersions::getInstallPath('adodb/adodb-php') . '/adodb-exceptions.inc.php';
+use Composer\InstalledVersions;
+
+if (InstalledVersions::isInstalled('adodb/adodb-php')) {
+    require InstalledVersions::getInstallPath('adodb/adodb-php') . '/adodb-exceptions.inc.php';
 }

lk-util/Command/Generate/GenerateTests.php

@@ -8,6 +8,7 @@
 use Lkrms\LkUtil\Command\Generate\Concept\GenerateCommand;
 use Lkrms\Utility\Reflect;
 use Lkrms\Utility\Str;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Generates PHPUnit tests
@@ -140,7 +141,7 @@ protected function run(string ...$args)
 
         $this->Extends[] = $classPrefix . (
             $extends === null
-                ? \PHPUnit\Framework\TestCase::class
+                ? TestCase::class
                 : $extends
         );
 

scripts/generate.php

@@ -3,13 +3,23 @@
 
 use Lkrms\Cli\CliApplication;
 use Lkrms\Cli\CliOption;
+use Lkrms\Cli\CliOptionBuilder;
 use Lkrms\Console\Catalog\ConsoleLevel as Level;
 use Lkrms\Console\ConsoleWriter;
 use Lkrms\Container\Application;
 use Lkrms\Container\Container;
 use Lkrms\Curler\Support\CurlerPage;
+use Lkrms\Curler\Support\CurlerPageBuilder;
 use Lkrms\Curler\Curler;
+use Lkrms\Curler\CurlerBuilder;
+use Lkrms\Facade\App;
+use Lkrms\Facade\Cache;
 use Lkrms\Facade\Console;
+use Lkrms\Facade\DI;
+use Lkrms\Facade\Err;
+use Lkrms\Facade\Event;
+use Lkrms\Facade\Profile;
+use Lkrms\Facade\Sync;
 use Lkrms\LkUtil\Catalog\EnvVar;
 use Lkrms\LkUtil\Command\Generate\Concept\GenerateCommand;
 use Lkrms\LkUtil\Command\Generate\GenerateBuilder;
@@ -21,9 +31,13 @@
 use Lkrms\Support\EventDispatcher;
 use Lkrms\Support\Timekeeper;
 use Lkrms\Sync\Support\DbSyncDefinition;
+use Lkrms\Sync\Support\DbSyncDefinitionBuilder;
 use Lkrms\Sync\Support\HttpSyncDefinition;
+use Lkrms\Sync\Support\HttpSyncDefinitionBuilder;
 use Lkrms\Sync\Support\SyncError;
+use Lkrms\Sync\Support\SyncErrorBuilder;
 use Lkrms\Sync\Support\SyncSerializeRules;
+use Lkrms\Sync\Support\SyncSerializeRulesBuilder;
 use Lkrms\Sync\Support\SyncStore;
 use Lkrms\Tests\Sync\Entity\Album;
 use Lkrms\Tests\Sync\Entity\Comment;
@@ -38,24 +52,24 @@
 $loader = require dirname(__DIR__) . '/vendor/autoload.php';
 
 $facades = [
-    Application::class => \Lkrms\Facade\App::class,
-    CacheStore::class => \Lkrms\Facade\Cache::class,
-    ConsoleWriter::class => \Lkrms\Facade\Console::class,
-    Container::class => \Lkrms\Facade\DI::class,
-    ErrorHandler::class => [\Lkrms\Facade\Err::class, '--skip', 'handleShutdown,handleError,handleException'],
-    EventDispatcher::class => \Lkrms\Facade\Event::class,
-    SyncStore::class => \Lkrms\Facade\Sync::class,
-    Timekeeper::class => \Lkrms\Facade\Profile::class,
+    Application::class => App::class,
+    CacheStore::class => Cache::class,
+    ConsoleWriter::class => Console::class,
+    Container::class => DI::class,
+    ErrorHandler::class => [Err::class, '--skip', 'handleShutdown,handleError,handleException'],
+    EventDispatcher::class => Event::class,
+    SyncStore::class => Sync::class,
+    Timekeeper::class => Profile::class,
 ];
 
 $builders = [
-    CliOption::class => [\Lkrms\Cli\CliOptionBuilder::class, '--forward=load'],
-    Curler::class => [\Lkrms\Curler\CurlerBuilder::class, '--forward', '--skip', 'responseContentTypeIs,getQueryUrl'],
-    CurlerPage::class => \Lkrms\Curler\Support\CurlerPageBuilder::class,
-    DbSyncDefinition::class => \Lkrms\Sync\Support\DbSyncDefinitionBuilder::class,
-    HttpSyncDefinition::class => \Lkrms\Sync\Support\HttpSyncDefinitionBuilder::class,
-    SyncError::class => \Lkrms\Sync\Support\SyncErrorBuilder::class,
-    SyncSerializeRules::class => \Lkrms\Sync\Support\SyncSerializeRulesBuilder::class,
+    CliOption::class => [CliOptionBuilder::class, '--forward=load'],
+    Curler::class => [CurlerBuilder::class, '--forward', '--skip', 'responseContentTypeIs,getQueryUrl'],
+    CurlerPage::class => CurlerPageBuilder::class,
+    DbSyncDefinition::class => DbSyncDefinitionBuilder::class,
+    HttpSyncDefinition::class => HttpSyncDefinitionBuilder::class,
+    SyncError::class => SyncErrorBuilder::class,
+    SyncSerializeRules::class => SyncSerializeRulesBuilder::class,
 ];
 
 $entities = [

src/Cli/Catalog/CliHelpSectionName.php

@@ -2,14 +2,15 @@
 
 namespace Lkrms\Cli\Catalog;
 
+use Lkrms\Cli\CliCommand;
 use Lkrms\Concept\Dictionary;
 
 /**
  * Section names commonly used in help messages / manual pages
  *
  * @extends Dictionary<string>
  *
- * @see \Lkrms\Cli\CliCommand::getHelpSections()
+ * @see CliCommand::getHelpSections()
  */
 final class CliHelpSectionName extends Dictionary
 {

src/Cli/Catalog/CliOptionValueType.php

@@ -3,6 +3,8 @@
 namespace Lkrms\Cli\Catalog;
 
 use Lkrms\Concept\ConvertibleEnumeration;
+use Lkrms\Utility\Test;
+use DateTimeImmutable;
 use LogicException;
 
 /**
@@ -15,8 +17,7 @@ final class CliOptionValueType extends ConvertibleEnumeration
     /**
      * A boolean value
      *
-     * Boolean strings recognised by {@see \Lkrms\Utility\Test::isBoolValue()}
-     * are accepted.
+     * Boolean strings recognised by {@see Test::isBoolValue()} are accepted.
      */
     public const BOOLEAN = 0;
 
@@ -36,7 +37,7 @@ final class CliOptionValueType extends ConvertibleEnumeration
      * A date and/or time
      *
      * Strings understood by {@see strtotime()} are accepted and normalised to
-     * {@see \DateTimeImmutable} instances.
+     * {@see DateTimeImmutable} instances.
      */
     public const DATE = 3;
 

src/Cli/CliOption.php

@@ -478,7 +478,7 @@ private function doLoad(): void
                 }
                 if (
                     $this->DefaultValue && (
-                        Arr::sameValues($this->DefaultValue, $values) ||
+                        Arr::same($this->DefaultValue, $values) ||
                         in_array('ALL', $this->DefaultValue, true)
                     )
                 ) {

src/Cli/Exception/CliInvalidArgumentsException.php

@@ -2,10 +2,12 @@
 
 namespace Lkrms\Cli\Exception;
 
+use Lkrms\Exception\MultipleErrorException;
+
 /**
  * Thrown when invalid command line arguments are given
  */
-class CliInvalidArgumentsException extends \Lkrms\Exception\MultipleErrorException
+class CliInvalidArgumentsException extends MultipleErrorException
 {
     public function __construct(string ...$errors)
     {

src/Cli/Exception/CliUnknownValueException.php

@@ -2,7 +2,9 @@
 
 namespace Lkrms\Cli\Exception;
 
+use Lkrms\Exception\Exception;
+
 /**
  * Thrown when an unknown value is rejected by a command line option
  */
-class CliUnknownValueException extends \Lkrms\Exception\Exception {}
+class CliUnknownValueException extends Exception {}

src/Concern/TConstructible.php

@@ -3,7 +3,9 @@
 namespace Lkrms\Concern;
 
 use Lkrms\Container\Container;
+use Lkrms\Contract\IConstructible;
 use Lkrms\Contract\IContainer;
+use Lkrms\Contract\IExtensible;
 use Lkrms\Contract\ITreeable;
 use Lkrms\Support\Catalog\ArrayKeyConformity;
 use Lkrms\Support\Introspector;
@@ -12,7 +14,7 @@
 /**
  * Implements IConstructible to create instances from associative arrays
  *
- * @see \Lkrms\Contract\IConstructible
+ * @see IConstructible
  */
 trait TConstructible
 {
@@ -21,9 +23,8 @@ trait TConstructible
      *
      * The constructor (if any) is invoked with parameters taken from `$data`.
      * If `$data` values remain, they are assigned to writable properties. If
-     * further values remain and the class implements
-     * {@see \Lkrms\Contract\IExtensible}, they are assigned via
-     * {@see \Lkrms\Contract\IExtensible::setMetaProperty()}.
+     * further values remain and the class implements {@see IExtensible}, they
+     * are assigned via {@see IExtensible::setMetaProperty()}.
      *
      * Array keys, constructor parameters and public property names are
      * normalised for comparison.