Fixes to broken update package command

Author: Marc McKenzie

src/Commands/EnableService.php

@@ -36,7 +36,8 @@ public function handle(Composer $composer, PhpunitXML $phpUnitXML){
                 throw new \Exception('Service is already enabled');
             $this->info('Enabling '.$service.'...');
             $composer->enableService($service);
-            $phpUnitXML->enableService($service);
+            $url = $composer->getUrl($service);
+            $phpUnitXML->enableService($service, $url);
             $this->info($service.' is now enabled and ready to be used');
         }
         catch(\Exception $e)

src/Commands/ListService.php

@@ -30,7 +30,7 @@ public function handle(Composer $composer){
         {
             $services = $composer->listServices();
             if(empty($services)) {
-                $this->error('You have no services created. Run php artisan service:make'); 
+                $this->error('You have no services created. Run php artisan laravel-service:make'); 
             }
             else {
                 foreach($services as $key => $value) {

src/Commands/UpdatePackage.php

@@ -2,6 +2,7 @@
 
 use Illuminate\Console\Command;
 use Jake142\Service\Composer;
+use Jake142\Service\PhpunitXML;
 
 class UpdatePackage extends Command
 {
@@ -25,14 +26,14 @@ class UpdatePackage extends Command
      * @see fire()
      * @return void
      */
-    public function handle(Composer $composer){
+    public function handle(Composer $composer, PhpunitXML $phpUnitXML){
         try
         {
             //Create optional stuff
             $createController = $this->choice('The upgrade to version ^0.2.2 will disable all services. Should we proceed?', ['Yes','No'], 0);
 
             if($createController=='Yes') {
-                $this->version022($composer);
+                $this->version022($composer, $phpUnitXML);
             } else {
                 $this->info('Ok, no upgrade done');
             }
@@ -44,7 +45,7 @@ public function handle(Composer $composer){
         }
 
     }
-    private function version022(Composer $composer) {
+    private function version022(Composer $composer, PhpunitXML $phpUnitXML) {
         try {
 
             $this->info('Begins upgrade to version ^0.2.2');
@@ -64,6 +65,8 @@ private function version022(Composer $composer) {
                         if(isset($composerFile['require'][$repository['url']])) {
                             $this->info('Disabling '.$repository['url']. '. You need to enable it using '.$serviceName); 
                             $composer->disableService($repository['url']);
+                            $phpUnitXML->disableService(str_replace('Services/','',$repository['url']));
+                            unset($composerFile['require'][$repository['url']]);
                         }
 
                         $serviceComposerFile = json_decode(file_get_contents(base_path($repository['url'].'/composer.json')), true);

src/Composer.php

@@ -100,6 +100,21 @@ public function serviceEnabled($service)
 
         return false;
     }
+    /**
+     * Get URL of a service
+     *
+     * @return string
+     */
+    public function getUrl($service)
+    {
+        $composerData = $this->readComposer();
+        foreach($composerData['repositories'] as $key => $repository)
+        {
+            if(isset($repository['name']) && isset($repository['url']) && $repository['name'] == $service)
+                return $repository['url'];
+        }
+        return null;
+    }
     /**
      * Write composer file
      *

src/PhpunitXML.php

@@ -28,7 +28,7 @@ public function writePhpunitXml($domPhpunitXML)
      * Add a service
      *
      */
-    public function enableService($service)
+    public function enableService($service, $url)
     {
 
         $domPhpunitXML = $this->readPhpunitXml();
@@ -39,7 +39,7 @@ public function enableService($service)
             $testsuiteNode->setAttribute ( 'name' , $service );
             $directoryNode = $domPhpunitXML->createElement ('directory');
             $directoryNode->setAttribute ( 'suffix' , 'Test.php');
-            $directoryNodeData = $domPhpunitXML->createTextNode('./Services/'.$service.'/tests');
+            $directoryNodeData = $domPhpunitXML->createTextNode('./'.$url.'/tests');
             $directoryNode->appendChild($directoryNodeData);
             $testsuiteNode->appendChild($directoryNode);
             $testsuitesNode->appendChild($testsuiteNode);