@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * Handle info types |
55 | 55 | * |
56 | 56 | * @param $level |
57 | - * @param $message |
|
57 | + * @param string $message |
|
58 | 58 | * @param array $context |
59 | 59 | */ |
60 | 60 | private function handleInfo($level, $message, array $context) |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * Handle debub types |
67 | 67 | * |
68 | 68 | * @param $level |
69 | - * @param $message |
|
69 | + * @param string $message |
|
70 | 70 | * @param array $context |
71 | 71 | */ |
72 | 72 | private function handleDebug($level, $message, array $context) |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * Handle Errors |
81 | 81 | * |
82 | 82 | * @param $level |
83 | - * @param $message |
|
83 | + * @param string $message |
|
84 | 84 | * @param array $context |
85 | 85 | */ |
86 | 86 | private function handleError($level, $message, array $context) |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * Interpolate context into a message. |
93 | 93 | * This is copied directly from PSR-3 documentation |
94 | 94 | * |
95 | - * @param $message |
|
95 | + * @param string $message |
|
96 | 96 | * @param array $context |
97 | 97 | * @return string |
98 | 98 | */ |
@@ -3,9 +3,9 @@ |
||
3 | 3 | namespace Buttress\Concrete\Log; |
4 | 4 | |
5 | 5 | use League\CLImate\CLImate; |
6 | +use Psr\Log\LogLevel; |
|
6 | 7 | use Psr\Log\LoggerInterface; |
7 | 8 | use Psr\Log\LoggerTrait; |
8 | -use Psr\Log\LogLevel; |
|
9 | 9 | |
10 | 10 | /** |
11 | 11 | * A PSR3 logger that pushes entries out to CLImate |
@@ -41,7 +41,7 @@ |
||
41 | 41 | */ |
42 | 42 | public function addGroup($prefix, callable $callback) |
43 | 43 | { |
44 | - $this->collector->addGroup($prefix . ':', function (Collector $collector) use ($callback) { |
|
44 | + $this->collector->addGroup($prefix . ':', function(Collector $collector) use ($callback) { |
|
45 | 45 | return $callback(new RouteCollector($collector)); |
46 | 46 | }); |
47 | 47 | } |
@@ -73,7 +73,7 @@ |
||
73 | 73 | $site = $this->site; |
74 | 74 | $cli = $this->container->get(CLImate::class); |
75 | 75 | |
76 | - $dispatcher = Dispatcher::simpleDispatcher(function (RouteCollector $routes) use ($site) { |
|
76 | + $dispatcher = Dispatcher::simpleDispatcher(function(RouteCollector $routes) use ($site) { |
|
77 | 77 | foreach ($this->collection->all() as $command) { |
78 | 78 | $command->registerRoutes($routes, $site); |
79 | 79 | } |
@@ -2,9 +2,9 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace Buttress\Concrete\Console; |
4 | 4 | |
5 | +use Buttress\Concrete\CommandBus\Command\HandlerLocator; |
|
5 | 6 | use Buttress\Concrete\CommandBus\Provider\DefaultProvider; |
6 | 7 | use Buttress\Concrete\Console\Command\CacheCommand; |
7 | -use Buttress\Concrete\CommandBus\Command\HandlerLocator; |
|
8 | 8 | use Buttress\Concrete\Console\Command\Collection\Collection; |
9 | 9 | use Buttress\Concrete\Console\Command\HelpCommand; |
10 | 10 | use Buttress\Concrete\Console\Command\PackageCommand; |
@@ -15,12 +15,9 @@ discard block |
||
15 | 15 | use Buttress\Concrete\Locator\Site; |
16 | 16 | use Buttress\Concrete\Route\Dispatcher; |
17 | 17 | use Buttress\Concrete\Route\RouteCollector; |
18 | -use League\CLImate\Argument\Argument; |
|
19 | 18 | use League\CLImate\Argument\Manager; |
20 | 19 | use League\CLImate\CLImate; |
21 | 20 | use Psr\Container\ContainerInterface; |
22 | -use Psr\Log\LoggerInterface; |
|
23 | -use Whoops\Handler\PlainTextHandler; |
|
24 | 21 | use Whoops\Run; |
25 | 22 | |
26 | 23 | /** |
@@ -42,7 +42,7 @@ |
||
42 | 42 | */ |
43 | 43 | public static function simpleDispatcher(callable $routeDefinitionCallback, array $options = []) |
44 | 44 | { |
45 | - return new static(simpleDispatcher(function (Collector $collector) use ($routeDefinitionCallback) { |
|
45 | + return new static(simpleDispatcher(function(Collector $collector) use ($routeDefinitionCallback) { |
|
46 | 46 | return $routeDefinitionCallback(new RouteCollector($collector)); |
47 | 47 | }, $options)); |
48 | 48 | } |
@@ -90,6 +90,9 @@ |
||
90 | 90 | $this->cli->green('Uninstalled Successfully!'); |
91 | 91 | } |
92 | 92 | |
93 | + /** |
|
94 | + * @param string $command |
|
95 | + */ |
|
93 | 96 | private function getDefinition(Site $site, $command) |
94 | 97 | { |
95 | 98 | /** @var \Buttress\Concrete\Console\Command\Manager\CommandManager[] $definitions */ |
@@ -36,7 +36,7 @@ |
||
36 | 36 | |
37 | 37 | public function registerRoutes(RouteCollector $collector, Site $site = null) |
38 | 38 | { |
39 | - $collector->addGroup('package', function (RouteCollector $collector) { |
|
39 | + $collector->addGroup('package', function(RouteCollector $collector) { |
|
40 | 40 | // install |
41 | 41 | $collector->addRoute( |
42 | 42 | 'install', |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace Buttress\Concrete\CommandBus\Handler; |
4 | 4 | |
5 | -use Buttress\Concrete\Service\Package\Package; |
|
6 | -use Buttress\Concrete\Service\Package\PackageItem; |
|
7 | 5 | use Buttress\Concrete\CommandBus\Command\Package\Install; |
8 | 6 | use Buttress\Concrete\CommandBus\Command\Package\ListPackages; |
9 | 7 | use Buttress\Concrete\CommandBus\Command\Package\Uninstall; |
10 | 8 | use Buttress\Concrete\Exception\RuntimeException; |
9 | +use Buttress\Concrete\Service\Package\Package; |
|
10 | +use Buttress\Concrete\Service\Package\PackageItem; |
|
11 | 11 | |
12 | 12 | class PackageHandler |
13 | 13 | { |
@@ -159,7 +159,7 @@ |
||
159 | 159 | |
160 | 160 | /** |
161 | 161 | * Get a list of package item objects |
162 | - * @return PackageItem[] |
|
162 | + * @return \Generator |
|
163 | 163 | */ |
164 | 164 | public function all() |
165 | 165 | { |
@@ -3,18 +3,15 @@ |
||
3 | 3 | namespace Buttress\Concrete\Service\Package\Driver; |
4 | 4 | |
5 | 5 | use Buttress\Concrete\Client\Connection\Connection; |
6 | +use Buttress\Concrete\Exception\RuntimeException; |
|
6 | 7 | use Buttress\Concrete\Service\Package\PackageItem; |
7 | 8 | use Buttress\Concrete\Service\Package\PackageItemFactory; |
8 | 9 | use Buttress\Concrete\Service\Result; |
9 | -use Buttress\Concrete\Exception\RuntimeException; |
|
10 | 10 | use Concrete\Core\Error\ErrorList\ErrorList; |
11 | 11 | use Concrete\Core\Foundation\ClassLoader; |
12 | 12 | use Concrete\Core\Package\BrokenPackage; |
13 | 13 | use Concrete\Core\Package\Package; |
14 | 14 | use Concrete\Core\Package\PackageService; |
15 | -use Concrete\Core\Support\Facade\Database; |
|
16 | -use Concrete\Core\Support\Facade\DatabaseORM; |
|
17 | -use Concrete\Core\Support\Facade\Events; |
|
18 | 15 | use League\CLImate\CLImate; |
19 | 16 | |
20 | 17 | class ModernDriver implements Driver |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace Buttress\Concrete\Service\Package; |
4 | 4 | |
5 | +use Buttress\Concrete\Locator\Site; |
|
5 | 6 | use Buttress\Concrete\Service\Package\Driver\LegacyDriver; |
6 | 7 | use Buttress\Concrete\Service\Package\Driver\ModernDriver; |
7 | -use Buttress\Concrete\Locator\Site; |
|
8 | 8 | use Psr\Container\ContainerInterface; |
9 | 9 | |
10 | 10 | class DriverFactory |