Update to display parent exception

Author: macintoshplus

lib/Service/ServiceAdminManager.php

@@ -48,12 +48,13 @@ public function registerService(ServiceInformations $infos): void
             $result = win32_create_service($infos->toArray(), $infos->machine());
         } catch (\Win32ServiceException $e) {
             $result = $e->getCode();
+            $errorMessage = $e->getMessage();
         }
-        $this->checkResponseAndConvertInExceptionIfNeed($result, $infos);
+        $this->checkResponseAndConvertInExceptionIfNeed($result, $infos, $errorMessage ?? '');
         $this->throwExceptionIfError(
             $result,
             ServiceRegistrationException::class,
-            'Error occured during registration service'
+            'Error occured during registration service. '.($errorMessage ?? '')
         );
     }
 
@@ -77,15 +78,16 @@ public function unregisterService(ServiceIdentificator $infos): void
             $result = win32_delete_service($infos->serviceId(), $infos->machine());
         } catch (\Win32ServiceException $e) {
             $result = $e->getCode();
+            $errorMessage = $e->getMessage();
         }
-        $this->checkResponseAndConvertInExceptionIfNeed($result, $infos);
+        $this->checkResponseAndConvertInExceptionIfNeed($result, $infos, $errorMessage ?? '');
         if ($result === WIN32_ERROR_SERVICE_MARKED_FOR_DELETE) {
             throw new ServiceMarkedForDeleteException('The service is marked for delete. Please reboot the computer.', $result);
         }
         $this->throwExceptionIfError(
             $result,
             ServiceUnregistrationException::class,
-            'Error occured during unregistration service'
+            'Error occured during unregistration service. '.($errorMessage ?? '')
         );
     }
 }

lib/Service/ServiceInformationsTrait.php

@@ -48,8 +48,9 @@ protected function getServiceInformations(ServiceIdentificator $service): Servic
             $infos = win32_query_service_status($service->serviceId(), $service->machine());
         } catch (\Win32ServiceException $e) {
             $infos = $e->getCode();
+            $messageDetail = $e->getMessage();
         }
-        $this->checkResponseAndConvertInExceptionIfNeed(\is_array($infos) ? null : $infos, $service);
+        $this->checkResponseAndConvertInExceptionIfNeed(\is_array($infos) ? null : $infos, $service, $messageDetail ?? null);
 
         if (!\is_array($infos)) {
             throw new ServiceStatusException('Error on read service status', $infos);
@@ -62,13 +63,13 @@ protected function getServiceInformations(ServiceIdentificator $service): Servic
      * @throws ServiceAccessDeniedException
      * @throws ServiceNotFoundException
      */
-    protected function checkResponseAndConvertInExceptionIfNeed(?int $value, ServiceIdentificator $service): void
+    protected function checkResponseAndConvertInExceptionIfNeed(?int $value, ServiceIdentificator $service, ?string $messageDetail = null): void
     {
         if ($value === WIN32_ERROR_SERVICE_DOES_NOT_EXIST) {
-            throw new ServiceNotFoundException('Service ' . $service->serviceId() . ' is not found');
+            throw new ServiceNotFoundException('Service ' . $service->serviceId() . ' is not found. '.$messageDetail);
         }
         if ($value === WIN32_ERROR_ACCESS_DENIED) {
-            throw new ServiceAccessDeniedException('Access to service ' . $service->serviceId() . ' is denied');
+            throw new ServiceAccessDeniedException('Access to service ' . $service->serviceId() . ' is denied. '.$messageDetail);
         }
     }
 

lib/Service/ServiceStateManager.php

@@ -81,8 +81,9 @@ public function sendCustomControl(ServiceIdentificator $serviceId, int $control)
             $result = win32_send_custom_control($serviceId->serviceId(), $serviceId->machine(), $control);
         } catch (\Win32ServiceException $e) {
             $result = $e->getCode();
+            $errorMessage = $e->getMessage();
         }
-        $this->checkResponseAndConvertInExceptionIfNeed($result, $serviceId);
+        $this->checkResponseAndConvertInExceptionIfNeed($result, $serviceId, $errorMessage ?? '');
         $this->throwExceptionIfError(
             $result,
             Win32ServiceException::class,
@@ -111,19 +112,24 @@ private function actionForService(ServiceIdentificator $serviceId, string $actio
             throw new InvalidServiceStatusException(sprintf('The service is not %s', $check));
         }
 
-        $result = match ($action) {
-            'start' => win32_start_service($serviceId->serviceId(), $serviceId->machine()),
-            'stop' => win32_stop_service($serviceId->serviceId(), $serviceId->machine()),
-            'pause' => win32_pause_service($serviceId->serviceId(), $serviceId->machine()),
-            'continue' => win32_continue_service($serviceId->serviceId(), $serviceId->machine()),
-            default => throw new ServiceStateActionException(sprintf('Action "%s" for service is unknown', $action)),
-        };
+        try {
+            $result = match ($action) {
+                'start' => win32_start_service($serviceId->serviceId(), $serviceId->machine()),
+                'stop' => win32_stop_service($serviceId->serviceId(), $serviceId->machine()),
+                'pause' => win32_pause_service($serviceId->serviceId(), $serviceId->machine()),
+                'continue' => win32_continue_service($serviceId->serviceId(), $serviceId->machine()),
+                default => throw new ServiceStateActionException(sprintf('Action "%s" for service is unknown', $action)),
+            };
+        } catch (\Win32ServiceException $e) {
+            $result = $e->getCode();
+            $errorMessage = $e->getMessage();
+        }
 
-        $this->checkResponseAndConvertInExceptionIfNeed($result, $serviceId);
+        $this->checkResponseAndConvertInExceptionIfNeed($result, $serviceId, $errorMessage ?? null);
         $this->throwExceptionIfError(
             $result,
             ServiceStateActionException::class,
-            sprintf('Unable to %s service', $action)
+            sprintf('Unable to %s service. %s', $action, $errorMessage ?? '')
         );
     }
 }