Merge branch 'cleanup'

Author: lkrms

.gitattributes

@@ -11,7 +11,6 @@
 /phpstan* export-ignore
 /phpstan-baseline-7.4.neon linguist-generated
 /phpstan-baseline-8.3.neon linguist-generated
-/phpstan.extension.neon -export-ignore
 /phpunit* export-ignore
 /scripts export-ignore
 /src/Toolkit/Cli/CliOptionBuilder.php linguist-generated

composer.json

@@ -119,7 +119,7 @@
     "extra": {
         "phpstan": {
             "includes": [
-                "phpstan.extension.neon"
+                "src/Toolkit/PHPStan/phpstan.extension.neon"
             ]
         }
     }

composer.lock

@@ -1,5 +1,5 @@
 includes:
-	- phpstan.extension.neon
+	- src/Toolkit/PHPStan/phpstan.extension.neon
 	- tests/phpstan-conditional.php
 
 parameters:

phpstan.neon.dist

@@ -22,6 +22,7 @@
 use Salient\Utility\Format;
 use Salient\Utility\Get;
 use Salient\Utility\Inflect;
+use Salient\Utility\Reflect;
 use Salient\Utility\Regex;
 use Salient\Utility\Str;
 use Salient\Utility\Test;
@@ -1137,7 +1138,7 @@ private function throwValueTypeException($value): void
 
     private function getValueTypeName(): string
     {
-        return CliOptionValueType::toName($this->ValueType);
+        return Reflect::getConstantName(CliOptionValueType::class, $this->ValueType);
     }
 
     /**

src/Toolkit/Cli/CliOption.php

@@ -10,9 +10,9 @@
 use Salient\Console\ConsoleLogger;
 use Salient\Console\ConsoleWriter;
 use Salient\Container\Event\BeforeGlobalContainerSetEvent;
-use Salient\Container\Exception\ContainerServiceNotFoundException;
-use Salient\Container\Exception\ContainerUnusableArgumentsException;
-use Salient\Container\Exception\InvalidContainerBindingException;
+use Salient\Container\Exception\ArgumentsNotUsedException;
+use Salient\Container\Exception\InvalidServiceException;
+use Salient\Container\Exception\ServiceNotFoundException;
 use Salient\Contract\Cache\CacheStoreInterface;
 use Salient\Contract\Console\ConsoleWriterInterface;
 use Salient\Contract\Container\ContainerAwareInterface;
@@ -21,6 +21,7 @@
 use Salient\Contract\Container\HasContextualBindings;
 use Salient\Contract\Container\HasServices;
 use Salient\Contract\Container\ServiceAwareInterface;
+use Salient\Contract\Container\ServiceLifetime;
 use Salient\Contract\Container\SingletonInterface;
 use Salient\Contract\Core\FacadeAwareInterface;
 use Salient\Contract\Core\FacadeInterface;
@@ -196,7 +197,7 @@ private function _get(string $id, string $service, array $args): object
     {
         $hasInstance = $this->Dice->hasShared($id);
         if ($hasInstance && $args) {
-            throw new ContainerUnusableArgumentsException(sprintf(
+            throw new ArgumentsNotUsedException(sprintf(
                 'Cannot apply arguments to shared instance: %s',
                 $id,
             ));
@@ -237,7 +238,7 @@ private function _get(string $id, string $service, array $args): object
                         $this->bindDefaultService($failed);
                         continue;
                     }
-                    throw new ContainerServiceNotFoundException($ex->getMessage(), $ex);
+                    throw new ServiceNotFoundException($ex->getMessage(), $ex);
                 }
             } while (true);
         } finally {
@@ -542,7 +543,7 @@ private function applyService(
             $bind = array_intersect($bind, $services);
             if (count($bind) < count($services)) {
                 // @codeCoverageIgnoreStart
-                throw new InvalidContainerBindingException(sprintf(
+                throw new InvalidServiceException(sprintf(
                     '%s does not implement: %s',
                     $id,
                     implode(', ', array_diff($services, $bind)),

src/Toolkit/Container/Container.php

@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+namespace Salient\Container\Exception;
+
+use Salient\Contract\Container\ArgumentsNotUsedExceptionInterface;
+use Salient\Core\AbstractException;
+
+/**
+ * Thrown when a container cannot pass arguments to a service, e.g. because it
+ * resolves to a shared instance
+ */
+class ArgumentsNotUsedException extends AbstractException implements ArgumentsNotUsedExceptionInterface {}