diff --git a/README.md b/README.md index c4379e96fb8330c33b6ea37d09721f600c7b151f..2b3f2e1d258f22342da9e9c665f94b4e34e8022c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # unicaen-console -[](https://travis-ci.com/laminas/laminas-console) -[](https://coveralls.io/github/laminas/laminas-console?branch=master) +`Unicaen\Console` is a component to design and implement console applications in PHP. -`Laminas\Console` is a component to design and implement console applications in PHP. -- File issues at https://github.com/laminas/laminas-console/issues -- Documentation is at https://docs.laminas.dev/laminas-console/ diff --git a/src/Adapter/Posix.php b/src/Adapter/Posix.php index f3269f5a9637fc2e8da7ec674be8886147ef97e7..185986745966664631ffe3d1fa614c608009b5fb 100644 --- a/src/Adapter/Posix.php +++ b/src/Adapter/Posix.php @@ -392,8 +392,8 @@ class Posix extends AbstractAdapter if ($color !== null) { if (! isset(static::$ansiColorMap[$type][$color])) { throw new Exception\BadMethodCallException(sprintf( - 'Unknown color "%s". Please use one of the Laminas\Console\ColorInterface constants ' - . 'or use Laminas\Console\Color\Xterm256::calculate', + 'Unknown color "%s". Please use one of the Unicaen\Console\ColorInterface constants ' + . 'or use Unicaen\Console\Color\Xterm256::calculate', $color )); } diff --git a/src/Console.php b/src/Console.php index 44556c6b33e1352f977e10af3c3372a47ec30201..0944d38848a014be230d618cd02748fa53d5069d 100644 --- a/src/Console.php +++ b/src/Console.php @@ -30,10 +30,10 @@ abstract class Console * Create and return Adapter\AdapterInterface instance. * * @param null|string $forceAdapter Optional adapter class name. Can be absolute namespace or class name - * relative to Laminas\Console\Adapter\. If not provided, a best matching + * relative to Unicaen\Console\Adapter\. If not provided, a best matching * adapter will be automatically selected. * @param null|string $forceCharset optional charset name can be absolute namespace or class name relative to - * Laminas\Console\Charset\. If not provided, charset will be detected + * Unicaen\Console\Charset\. If not provided, charset will be detected * automatically. * @throws Exception\InvalidArgumentException * @throws Exception\RuntimeException diff --git a/src/Getopt.php b/src/Getopt.php index 0550ead0ee4c04fe3fc31f64338120b518a9fbfb..ac7297f34fb736623ec1508f9535ac10c14d8956 100644 --- a/src/Getopt.php +++ b/src/Getopt.php @@ -36,7 +36,7 @@ namespace Unicaen\Console; * - Automatic generation of a helpful usage message. * - Signal end of options with '--'; subsequent arguments are treated * as non-option arguments, even if they begin with '-'. - * - Raise exception Laminas\Console\Exception\* in several cases + * - Raise exception Unicaen\Console\Exception\* in several cases * when invalid flags or parameters are given. Usage message is * returned in the exception object. * @@ -210,7 +210,7 @@ class Getopt if (! isset($_SERVER['argv'])) { $errorDescription = (ini_get('register_argc_argv') == false) ? "argv is not available, because ini option 'register_argc_argv' is set Off" - : '$_SERVER["argv"] is not set, but Laminas\Console\Getopt cannot work without this information.'; + : '$_SERVER["argv"] is not set, but Unicaen\Console\Getopt cannot work without this information.'; throw new Exception\InvalidArgumentException($errorDescription); } @@ -336,7 +336,7 @@ class Getopt /** * Define multiple configuration options from an associative array. * These are not program options, but properties to configure - * the behavior of Laminas\Console\Getopt. + * the behavior of Unicaen\Console\Getopt. * * @param array $getoptConfig * @return self @@ -354,7 +354,7 @@ class Getopt /** * Define one configuration option as a key/value pair. * These are not program options, but properties to configure - * the behavior of Laminas\Console\Getopt. + * the behavior of Unicaen\Console\Getopt. * * @param string $configKey * @param string $configValue diff --git a/src/Prompt/AbstractPrompt.php b/src/Prompt/AbstractPrompt.php index 49677f9db9b6efe25ffacfee64279e042a401402..c19b06fe5c08848e8da396faedc17e95d48cd624 100644 --- a/src/Prompt/AbstractPrompt.php +++ b/src/Prompt/AbstractPrompt.php @@ -64,7 +64,7 @@ abstract class AbstractPrompt implements PromptInterface * * This is a convenience method for creating statically creating prompts, i.e.: * - * $name = Laminas\Console\Prompt\Line::prompt("Enter your name: "); + * $name = Unicaen\Console\Prompt\Line::prompt("Enter your name: "); * * @return mixed * @throws Exception\BadMethodCallException @@ -73,7 +73,7 @@ abstract class AbstractPrompt implements PromptInterface { if (get_called_class() === __CLASS__) { throw new Exception\BadMethodCallException( - 'Cannot call prompt() on AbstractPrompt class. Use one of the Laminas\Console\Prompt\ subclasses.' + 'Cannot call prompt() on AbstractPrompt class. Use one of the Unicaen\Console\Prompt\ subclasses.' ); } diff --git a/src/Request.php b/src/Request.php index 687f694d86b4fd8aaf1f314f5f943d4fbb51f388..6518d3bebdf642a2fd2f5e2ad0743e64a9c94e7e 100644 --- a/src/Request.php +++ b/src/Request.php @@ -126,7 +126,7 @@ class Request extends Message implements RequestInterface * primary API for value setting, for that see env()) * * @param \Laminas\Stdlib\Parameters $env - * @return \Laminas\Console\Request + * @return \Unicaen\Console\Request */ public function setEnv(Parameters $env) { diff --git a/src/ResponseSender/ConsoleResponseSender.php b/src/ResponseSender/ConsoleResponseSender.php index 7421bcae4c9457f1cd8744db580c97a0e88577f7..ce3fe966febfd3f329b35cd57baf1a191c6b1e41 100644 --- a/src/ResponseSender/ConsoleResponseSender.php +++ b/src/ResponseSender/ConsoleResponseSender.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\ResponseSender; -use Laminas\Console\Response; +use Unicaen\Console\Response; use Laminas\Mvc\ResponseSender\ResponseSenderInterface; use Laminas\Mvc\ResponseSender\SendResponseEvent; diff --git a/src/Router/Catchall.php b/src/Router/Catchall.php index 7bc91764d15d1a82e44d12404e1c264b9c40a7d8..f4ac845332f3318dc73757b5ce1d86324c197cc3 100644 --- a/src/Router/Catchall.php +++ b/src/Router/Catchall.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\Router; -use Laminas\Console\Request as ConsoleRequest; +use Unicaen\Console\Request as ConsoleRequest; use Laminas\Stdlib\RequestInterface as Request; use Traversable; diff --git a/src/Router/ConsoleRouterDelegatorFactory.php b/src/Router/ConsoleRouterDelegatorFactory.php index c8d940dc38033f2dd553079360d70a121e2431b0..ba8b7061cd08b0476f1985ecef07bc53de8c0fe3 100644 --- a/src/Router/ConsoleRouterDelegatorFactory.php +++ b/src/Router/ConsoleRouterDelegatorFactory.php @@ -8,8 +8,8 @@ namespace Unicaen\Console\Router; -use Interop\Container\ContainerInterface; -use Laminas\Console\Console; +use Psr\Container\ContainerInterface; +use Unicaen\Console\Console; use Laminas\ServiceManager\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Router/ConsoleRouterFactory.php b/src/Router/ConsoleRouterFactory.php index aff36d376b5e4f5809d7e3e1940e6309c6c911ff..400c5a5729ac7d06fe13b759dd3da68ec6df22c1 100644 --- a/src/Router/ConsoleRouterFactory.php +++ b/src/Router/ConsoleRouterFactory.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\Router; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Router\RouterConfigTrait; use Laminas\ServiceManager\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Router/Simple.php b/src/Router/Simple.php index 4b882c5238e4cde2ddc5bbeb3e545ddd27dbca7c..390d0dfe1b54f7bd6e00e22322fa555481b1e03a 100644 --- a/src/Router/Simple.php +++ b/src/Router/Simple.php @@ -8,9 +8,9 @@ namespace Unicaen\Console\Router; -use Laminas\Console\Request as ConsoleRequest; -use Laminas\Console\RouteMatcher\DefaultRouteMatcher; -use Laminas\Console\RouteMatcher\RouteMatcherInterface; +use Unicaen\Console\Request as ConsoleRequest; +use Unicaen\Console\RouteMatcher\DefaultRouteMatcher; +use Unicaen\Console\RouteMatcher\RouteMatcherInterface; use Unicaen\Console\Exception; use Laminas\Stdlib\ArrayUtils; use Laminas\Stdlib\RequestInterface as Request; diff --git a/src/Service/ConsoleAdapterFactory.php b/src/Service/ConsoleAdapterFactory.php index 2c3a70bd35ce0401e03ffc9ee92eba681482b4f8..4ce423b10399f452dead2539c63b55209046f87b 100644 --- a/src/Service/ConsoleAdapterFactory.php +++ b/src/Service/ConsoleAdapterFactory.php @@ -8,9 +8,9 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; -use Laminas\Console\Adapter\AdapterInterface; -use Laminas\Console\Console; +use Psr\Container\ContainerInterface; +use Unicaen\Console\Adapter\AdapterInterface; +use Unicaen\Console\Console; use Laminas\ServiceManager\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use stdClass; @@ -30,8 +30,8 @@ class ConsoleAdapterFactory implements FactoryInterface * ), * 'service_manager' => array( * 'invokables' => array( - * 'MyConsoleAdapter' => 'Laminas\Console\Adapter\Windows', - * 'MyConsoleCharset' => 'Laminas\Console\Charset\DESCG', + * 'MyConsoleAdapter' => 'Unicaen\Console\Adapter\Windows', + * 'MyConsoleCharset' => 'Unicaen\Console\Charset\DESCG', * ) * ) * diff --git a/src/Service/ConsoleApplicationDelegatorFactory.php b/src/Service/ConsoleApplicationDelegatorFactory.php index 140e1e06f8478e04159abdb8686bff6d48df23bd..3ee7ebf9f2f4d95531d4ec99a6b1248437574f96 100644 --- a/src/Service/ConsoleApplicationDelegatorFactory.php +++ b/src/Service/ConsoleApplicationDelegatorFactory.php @@ -8,8 +8,8 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; -use Laminas\Console\Console; +use Psr\Container\ContainerInterface; +use Unicaen\Console\Console; use Laminas\ServiceManager\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Service/ConsoleExceptionStrategyFactory.php b/src/Service/ConsoleExceptionStrategyFactory.php index 5e88a3919ab30b52b0ac5293712aff2397c29e55..8d758af02168dd7fe4097480fa75e74e05a59efc 100644 --- a/src/Service/ConsoleExceptionStrategyFactory.php +++ b/src/Service/ConsoleExceptionStrategyFactory.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Unicaen\Console\View\ExceptionStrategy; use Laminas\ServiceManager\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Service/ConsoleRequestDelegatorFactory.php b/src/Service/ConsoleRequestDelegatorFactory.php index 62cf5cac18869edb070041431f53104e51fe0650..60a064c4df70d366f515a1106654998a02fb4b51 100644 --- a/src/Service/ConsoleRequestDelegatorFactory.php +++ b/src/Service/ConsoleRequestDelegatorFactory.php @@ -8,9 +8,9 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; -use Laminas\Console\Console; -use Laminas\Console\Request as ConsoleRequest; +use Psr\Container\ContainerInterface; +use Unicaen\Console\Console; +use Unicaen\Console\Request as ConsoleRequest; use Laminas\ServiceManager\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Service/ConsoleResponseDelegatorFactory.php b/src/Service/ConsoleResponseDelegatorFactory.php index 1b6361c26980dafc6384dac45559c029c295135d..623540191dd3d9df8c6176a95dd5d4683e5cbaca 100644 --- a/src/Service/ConsoleResponseDelegatorFactory.php +++ b/src/Service/ConsoleResponseDelegatorFactory.php @@ -8,9 +8,9 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; -use Laminas\Console\Console; -use Laminas\Console\Response as ConsoleResponse; +use Psr\Container\ContainerInterface; +use Unicaen\Console\Console; +use Unicaen\Console\Response as ConsoleResponse; use Laminas\ServiceManager\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Service/ConsoleResponseSenderDelegatorFactory.php b/src/Service/ConsoleResponseSenderDelegatorFactory.php index 67e1fd9ea0eeab77bd88730c64939a501ae0b3ac..ca0290c0bfa0e3694cacd97d1334f4b269977970 100644 --- a/src/Service/ConsoleResponseSenderDelegatorFactory.php +++ b/src/Service/ConsoleResponseSenderDelegatorFactory.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Unicaen\Console\ResponseSender\ConsoleResponseSender; use Laminas\Mvc\ResponseSender\SendResponseEvent; use Laminas\ServiceManager\DelegatorFactoryInterface; diff --git a/src/Service/ConsoleRouteNotFoundStrategyFactory.php b/src/Service/ConsoleRouteNotFoundStrategyFactory.php index 080dc4900e12b27c965070c6450c7abb0ad90e63..dab0359185add5a0c253a60c2ee9abbf32ad20bc 100644 --- a/src/Service/ConsoleRouteNotFoundStrategyFactory.php +++ b/src/Service/ConsoleRouteNotFoundStrategyFactory.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Unicaen\Console\View\RouteNotFoundStrategy; use Laminas\ServiceManager\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Service/ConsoleViewHelperManagerDelegatorFactory.php b/src/Service/ConsoleViewHelperManagerDelegatorFactory.php index 5ec124faaf7b5180f103782cc6dbb4f6e5eb5ddd..637950ca200690c8b2494f497f9f626855ba0784 100644 --- a/src/Service/ConsoleViewHelperManagerDelegatorFactory.php +++ b/src/Service/ConsoleViewHelperManagerDelegatorFactory.php @@ -8,8 +8,8 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; -use Laminas\Console\Console; +use Psr\Container\ContainerInterface; +use Unicaen\Console\Console; use Laminas\Router\RouteMatch; use Laminas\ServiceManager\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Service/ConsoleViewManagerConfigTrait.php b/src/Service/ConsoleViewManagerConfigTrait.php index a6cfb9764b3618860b0e6a8d3f9061be18e4436a..0d6a051b393e53afd01239e1da25f8c05874b90f 100644 --- a/src/Service/ConsoleViewManagerConfigTrait.php +++ b/src/Service/ConsoleViewManagerConfigTrait.php @@ -9,7 +9,7 @@ namespace Unicaen\Console\Service; use ArrayAccess; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; trait ConsoleViewManagerConfigTrait { diff --git a/src/Service/ConsoleViewManagerFactory.php b/src/Service/ConsoleViewManagerFactory.php index eb2d042010d9dc8295cb6693172219ec8fbcd34e..4fd786ff2e0f87b3fdcb4c1744e03d9485ba6a2c 100644 --- a/src/Service/ConsoleViewManagerFactory.php +++ b/src/Service/ConsoleViewManagerFactory.php @@ -8,8 +8,8 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; -use Laminas\Console\Console; +use Psr\Container\ContainerInterface; +use Unicaen\Console\Console; use Unicaen\Console\View\ViewManager as ConsoleViewManager; use Laminas\ServiceManager\Exception\ServiceNotCreatedException; use Laminas\ServiceManager\FactoryInterface; diff --git a/src/Service/ControllerManagerDelegatorFactory.php b/src/Service/ControllerManagerDelegatorFactory.php index f37c6803e954ee456537f46e6f28f7732681cb80..fc84316f50ed043321d6ce1a19026a2e1ec5634f 100644 --- a/src/Service/ControllerManagerDelegatorFactory.php +++ b/src/Service/ControllerManagerDelegatorFactory.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Unicaen\Console\Controller\AbstractConsoleController; use Laminas\ServiceManager\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Service/DefaultRenderingStrategyFactory.php b/src/Service/DefaultRenderingStrategyFactory.php index 77b1926cc6b9d1f8266a6c9ba20b75db6ad92539..3101ee37c7a834febc7102cc0414cbc451b9533c 100644 --- a/src/Service/DefaultRenderingStrategyFactory.php +++ b/src/Service/DefaultRenderingStrategyFactory.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Unicaen\Console\View\DefaultRenderingStrategy; use Unicaen\Console\View\Renderer; use Laminas\ServiceManager\FactoryInterface; diff --git a/src/Service/ViewManagerDelegatorFactory.php b/src/Service/ViewManagerDelegatorFactory.php index 04c96ab527f392ad6c413a35ff93bf9d62848344..5a1d9e0e774756f6ae0de0315e09da7df3c0b6a0 100644 --- a/src/Service/ViewManagerDelegatorFactory.php +++ b/src/Service/ViewManagerDelegatorFactory.php @@ -8,8 +8,8 @@ namespace Unicaen\Console\Service; -use Interop\Container\ContainerInterface; -use Laminas\Console\Console; +use Psr\Container\ContainerInterface; +use Unicaen\Console\Console; use Laminas\ServiceManager\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/View/DefaultRenderingStrategy.php b/src/View/DefaultRenderingStrategy.php index 1c4d8a1d222d4117a473259c54e13127414ff509..cdee6a1e75dc4c1f5ae2eda504a28359b0a5d84d 100644 --- a/src/View/DefaultRenderingStrategy.php +++ b/src/View/DefaultRenderingStrategy.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\View; -use Laminas\Console\Response as ConsoleResponse; +use Unicaen\Console\Response as ConsoleResponse; use Laminas\EventManager\AbstractListenerAggregate; use Laminas\EventManager\EventManagerInterface; use Unicaen\Console\View\ViewModel as ConsoleViewModel; diff --git a/src/View/InjectNamedConsoleParamsListener.php b/src/View/InjectNamedConsoleParamsListener.php index b7a83bc3c049286b0fa5ffa8a8eaa6afbdcac8c0..354895b0768a7f0ed6c8d3932f431eb2965297a2 100644 --- a/src/View/InjectNamedConsoleParamsListener.php +++ b/src/View/InjectNamedConsoleParamsListener.php @@ -8,7 +8,7 @@ namespace Unicaen\Console\View; -use Laminas\Console\Request as ConsoleRequest; +use Unicaen\Console\Request as ConsoleRequest; use Laminas\EventManager\AbstractListenerAggregate; use Laminas\EventManager\EventManagerInterface as Events; use Laminas\Mvc\MvcEvent; diff --git a/src/View/RouteNotFoundStrategy.php b/src/View/RouteNotFoundStrategy.php index c2e87bd08ccd31b6bd489a22b43b82f5281baf6a..5bc0d1b9d55d47f1bff8dce1a2c9c0d18caf3b8a 100644 --- a/src/View/RouteNotFoundStrategy.php +++ b/src/View/RouteNotFoundStrategy.php @@ -8,10 +8,10 @@ namespace Unicaen\Console\View; -use Laminas\Console\Adapter\AdapterInterface as ConsoleAdapter; -use Laminas\Console\ColorInterface; -use Laminas\Console\Request as ConsoleRequest; -use Laminas\Console\Response as ConsoleResponse; +use Unicaen\Console\Adapter\AdapterInterface as ConsoleAdapter; +use Unicaen\Console\ColorInterface; +use Unicaen\Console\Request as ConsoleRequest; +use Unicaen\Console\Response as ConsoleResponse; use Laminas\EventManager\AbstractListenerAggregate; use Laminas\EventManager\EventManagerInterface; use Laminas\ModuleManager\Feature\ConsoleBannerProviderInterface; @@ -26,6 +26,7 @@ use Laminas\Stdlib\ResponseInterface as Response; use Laminas\Stdlib\StringUtils; use Laminas\Text\Table; + class RouteNotFoundStrategy extends AbstractListenerAggregate { /**