Merge branch 'cleanup'

Author: lkrms

.phive/phars.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.88" location="./tools/pretty-php" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.46.0" installed="3.68.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="lkrms/pretty-php" version="^0.4.48" installed="0.4.91" location="./tools/pretty-php" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.46.0" installed="3.69.1" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="salient-labs/changelog" version="^1.0.5" installed="1.0.8" location="./tools/changelog" copy="true"/>
+  <phar name="composer-require-checker" version="^4.16.1" installed="4.16.1" location="./tools/composer-require-checker" copy="true"/>
 </phive>

composer.lock

@@ -10,6 +10,8 @@
 use Salient\Container\Container;
 use Salient\Contract\Cache\CacheInterface;
 use Salient\Contract\Console\ConsoleInterface;
+use Salient\Contract\Console\HasMessageType;
+use Salient\Contract\Console\HasMessageTypes;
 use Salient\Contract\Container\ContainerInterface;
 use Salient\Contract\Core\Event\EventDispatcherInterface;
 use Salient\Contract\Sync\SyncStoreInterface;
@@ -79,7 +81,7 @@
     App::class => [ContainerInterface::class, [Container::class], '--desc', 'A facade for the global service container', '--api'],
     Cache::class => [CacheInterface::class, [CacheStore::class], '--desc', 'A facade for the global cache', '--api'],
     Config::class => [ConfigurationManager::class, '--api'],
-    Console::class => [ConsoleInterface::class, [ConsoleService::class], '--implement', HasMessageLevel::class . ',' . HasMessageLevels::class, '--desc', 'A facade for the global console service', '--api'],
+    Console::class => [ConsoleInterface::class, [ConsoleService::class], '--implement', HasMessageLevel::class . ',' . HasMessageLevels::class . ',' . HasMessageType::class . ',' . HasMessageTypes::class, '--desc', 'A facade for the global console service', '--api'],
     Err::class => [ErrorHandler::class, '--skip', 'handleShutdown,handleError,handleException', '--api'],
     Event::class => [EventDispatcherInterface::class, [EventDispatcher::class], '--desc', 'A facade for the global event dispatcher', '--api'],
     Sync::class => [SyncStoreInterface::class, [SyncStore::class], '--desc', 'A facade for the global sync entity store'],

scripts/generate.php

@@ -11,7 +11,6 @@
 use Salient\Contract\Cli\CliCommandInterface;
 use Salient\Contract\Cli\CliHelpSectionName;
 use Salient\Contract\Cli\CliHelpTarget;
-use Salient\Contract\Console\ConsoleMessageType as MessageType;
 use Salient\Contract\Core\HasJsonSchema;
 use Salient\Core\Facade\Console;
 use Salient\Utility\Exception\InvalidRuntimeConfigurationException;
@@ -459,9 +458,9 @@ public function reportVersion(int $level = Console::LEVEL_INFO, bool $stdout = f
         $version = $this->getVersionString();
 
         if ($stdout) {
-            Console::printStdout($version, $level, MessageType::UNFORMATTED);
+            Console::printStdout($version, $level, Console::TYPE_UNFORMATTED);
         } else {
-            Console::print($version, $level, MessageType::UNFORMATTED);
+            Console::print($version, $level, Console::TYPE_UNFORMATTED);
         }
         return $this;
     }

src/Toolkit/Cli/CliApplication.php

@@ -8,7 +8,6 @@
 use Salient\Contract\Cli\CliOptionValueType;
 use Salient\Contract\Cli\CliOptionValueUnknownPolicy;
 use Salient\Contract\Cli\CliOptionVisibility;
-use Salient\Contract\Console\ConsoleMessageType as MessageType;
 use Salient\Contract\Core\Entity\Readable;
 use Salient\Contract\Core\Buildable;
 use Salient\Contract\Core\HasJsonSchema;
@@ -980,7 +979,7 @@ private function filterValue($value, ?string $source = null, ?int $policy = null
                     throw new CliUnknownValueException($message);
                 }
 
-                Console::message('__Warning:__', $message, Console::LEVEL_WARNING, MessageType::UNFORMATTED);
+                Console::message('__Warning:__', $message, Console::LEVEL_WARNING, Console::TYPE_UNFORMATTED);
                 $value = array_intersect($value, $this->AllowedValues);
             }
         }

src/Toolkit/Cli/CliOption.php

@@ -7,8 +7,6 @@
 use Salient\Console\Support\ConsoleMessageFormats as MessageFormats;
 use Salient\Console\Support\ConsoleTagFormats as TagFormats;
 use Salient\Contract\Console\ConsoleInterface as Console;
-use Salient\Contract\Console\ConsoleMessageType as MessageType;
-use Salient\Contract\Console\ConsoleMessageTypeGroup as MessageTypeGroup;
 use Salient\Contract\Console\ConsoleTag as Tag;
 use Salient\Contract\Console\ConsoleTargetStreamInterface;
 use Salient\Contract\HasEscapeSequence;
@@ -99,15 +97,15 @@ protected function createMessageFormats(): MessageFormats
         $cyan = Format::ttyColour(self::CYAN_FG);
 
         return (new MessageFormats())
-            ->set(Console::LEVELS_ERRORS, MessageTypeGroup::ALL, new MessageFormat($boldRed, $default, $boldRed))
-            ->set(Console::LEVEL_WARNING, MessageTypeGroup::ALL, new MessageFormat($yellow, $default, $boldYellow))
-            ->set(Console::LEVEL_NOTICE, MessageTypeGroup::ALL, new MessageFormat($bold, $cyan, $boldCyan))
-            ->set(Console::LEVEL_INFO, MessageTypeGroup::ALL, new MessageFormat($default, $yellow, $yellow))
-            ->set(Console::LEVEL_DEBUG, MessageTypeGroup::ALL, new MessageFormat($dim, $dim, $dim))
-            ->set(Console::LEVELS_INFO, MessageType::PROGRESS, new MessageFormat($default, $yellow, $yellow))
-            ->set(Console::LEVELS_INFO, MessageTypeGroup::GROUP, new MessageFormat($boldMagenta, $default, $boldMagenta))
-            ->set(Console::LEVELS_INFO, MessageType::SUMMARY, new MessageFormat($default, $default, $bold))
-            ->set(Console::LEVELS_INFO, MessageType::SUCCESS, new MessageFormat($green, $default, $boldGreen))
-            ->set(Console::LEVELS_ERRORS_AND_WARNINGS, MessageType::FAILURE, new MessageFormat($yellow, $default, $boldYellow));
+            ->set(Console::LEVELS_ERRORS, Console::TYPES_ALL, new MessageFormat($boldRed, $default, $boldRed))
+            ->set(Console::LEVEL_WARNING, Console::TYPES_ALL, new MessageFormat($yellow, $default, $boldYellow))
+            ->set(Console::LEVEL_NOTICE, Console::TYPES_ALL, new MessageFormat($bold, $cyan, $boldCyan))
+            ->set(Console::LEVEL_INFO, Console::TYPES_ALL, new MessageFormat($default, $yellow, $yellow))
+            ->set(Console::LEVEL_DEBUG, Console::TYPES_ALL, new MessageFormat($dim, $dim, $dim))
+            ->set(Console::LEVELS_INFO, Console::TYPE_PROGRESS, new MessageFormat($default, $yellow, $yellow))
+            ->set(Console::LEVELS_INFO, Console::TYPES_GROUP, new MessageFormat($boldMagenta, $default, $boldMagenta))
+            ->set(Console::LEVELS_INFO, Console::TYPE_SUMMARY, new MessageFormat($default, $default, $bold))
+            ->set(Console::LEVELS_INFO, Console::TYPE_SUCCESS, new MessageFormat($green, $default, $boldGreen))
+            ->set(Console::LEVELS_ERRORS_AND_WARNINGS, Console::TYPE_FAILURE, new MessageFormat($yellow, $default, $boldYellow));
     }
 }