@@ -60,7 +60,7 @@  | 
                                                    ||
| 60 | 60 | |
| 61 | 61 | /**  | 
                                                        
| 62 | 62 | * Clear cache for a LegacyConnection  | 
                                                        
| 63 | - * @param \Buttress\Concrete\CommandBus\Handler\LegacyConnection $connection  | 
                                                        |
| 63 | + * @param Connection $connection  | 
                                                        |
| 64 | 64 | */  | 
                                                        
| 65 | 65 | private function clearLegacy(LegacyConnection $connection)  | 
                                                        
| 66 | 66 |      { | 
                                                        
@@ -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 |  { | 
                                                        
@@ -2,9 +2,9 @@  | 
                                                    ||
| 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;  | 
                                                        
@@ -25,7 +25,7 @@ discard block  | 
                                                    ||
| 25 | 25 | |
| 26 | 26 | /**  | 
                                                        
| 27 | 27 | * @param \Buttress\Concrete\Service\Package\PackageItem $package  | 
                                                        
| 28 | - * @return Package|null  | 
                                                        |
| 28 | + * @return PackageItem  | 
                                                        |
| 29 | 29 | */  | 
                                                        
| 30 | 30 | private function getPackage(PackageItem $package)  | 
                                                        
| 31 | 31 |      { | 
                                                        
@@ -133,7 +133,7 @@ discard block  | 
                                                    ||
| 133 | 133 | |
| 134 | 134 | /**  | 
                                                        
| 135 | 135 | * Get a list of package item objects  | 
                                                        
| 136 | - * @return PackageItem[]  | 
                                                        |
| 136 | + * @return \Generator  | 
                                                        |
| 137 | 137 | */  | 
                                                        
| 138 | 138 | public function all()  | 
                                                        
| 139 | 139 |      { | 
                                                        
@@ -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,10 +3,10 @@  | 
                                                    ||
| 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;  | 
                                                        
@@ -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  | 
                                                        
@@ -20,7 +20,7 @@  | 
                                                    ||
| 20 | 20 | }  | 
                                                        
| 21 | 21 | |
| 22 | 22 | /**  | 
                                                        
| 23 | - * @return success  | 
                                                        |
| 23 | + * @return boolean  | 
                                                        |
| 24 | 24 | */  | 
                                                        
| 25 | 25 | public function success()  | 
                                                        
| 26 | 26 |      { | 
                                                        
@@ -16,7 +16,7 @@  | 
                                                    ||
| 16 | 16 | }  | 
                                                        
| 17 | 17 | |
| 18 | 18 | $this->success = (bool) $success;  | 
                                                        
| 19 | - $this->errors = (array)$errors;  | 
                                                        |
| 19 | + $this->errors = (array) $errors;  | 
                                                        |
| 20 | 20 | }  | 
                                                        
| 21 | 21 | |
| 22 | 22 | /**  | 
                                                        
@@ -38,7 +38,7 @@  | 
                                                    ||
| 38 | 38 | */  | 
                                                        
| 39 | 39 | public function attach()  | 
                                                        
| 40 | 40 |      { | 
                                                        
| 41 | - $connection = new ModernConnection();  | 
                                                        |
| 41 | + $connection = new ModernConnection();  | 
                                                        |
| 42 | 42 | $connection->connect($this->resolveApplication());  | 
                                                        
| 43 | 43 | |
| 44 | 44 | return $connection;  | 
                                                        
@@ -80,9 +80,10 @@  | 
                                                    ||
| 80 | 80 | $site = new Site();  | 
                                                        
| 81 | 81 | }  | 
                                                        
| 82 | 82 | |
| 83 | - if ($site->getVersion())  | 
                                                        |
| 84 | -  | 
                                                        |
| 83 | +            if ($site->getVersion()) { | 
                                                        |
| 84 | +  | 
                                                        |
| 85 | 85 | return $site;  | 
                                                        
| 86 | + }  | 
                                                        |
| 86 | 87 | });  | 
                                                        
| 87 | 88 | |
| 88 | 89 | // Share the container  |