Dont know yet

Author: Andreas Frömer

src/Scope/AbstractScope.php

@@ -0,0 +1,20 @@
+<?php
+declare(strict_types=1);
+
+namespace SystemCtl\Scope;
+
+/**
+ * AbstractScope
+ *
+ * @author icanhazstring <[email protected]>
+ */
+abstract class AbstractScope implements ScopeInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getArgument(): string
+    {
+        return '--' . $this->getName();
+    }
+}

src/Scope/SystemScope.php

@@ -9,16 +9,8 @@
  * @package SystemCtl\Scope
  * @author  icanhazstring <[email protected]>
  */
-class SystemScope implements ScopeInterface
+class SystemScope extends AbstractScope
 {
-    /**
-     * @inheritdoc
-     */
-    public function getArgument(): string
-    {
-        return '--' . $this->getName();
-    }
-
     /**
      * @inheritdoc
      */

src/Scope/UserScope.php

@@ -9,16 +9,8 @@
  * @package SystemCtl\Scope
  * @author  icanhazstring <[email protected]>
  */
-class UserScope implements ScopeInterface
+class UserScope extends AbstractScope
 {
-    /**
-     * @inheritdoc
-     */
-    public function getArgument(): string
-    {
-        return '--' . $this->getName();
-    }
-
     /**
      * @inheritdoc
      */

src/SystemCtl.php

@@ -10,11 +10,11 @@
 use SystemCtl\Scope\ScopeInterface;
 use SystemCtl\Scope\SystemScope;
 use SystemCtl\Scope\UserScope;
-use SystemCtl\Template\AbstractUnitTemplate;
 use SystemCtl\Template\Installer\UnitInstaller;
 use SystemCtl\Template\Installer\UnitInstallerInterface;
 use SystemCtl\Template\PathResolverInterface;
 use SystemCtl\Template\Renderer\PlatesRenderer;
+use SystemCtl\Template\UnitTemplateInterface;
 use SystemCtl\Unit\AbstractUnit;
 use SystemCtl\Unit\Service;
 use SystemCtl\Unit\Timer;
@@ -39,7 +39,7 @@ class SystemCtl
 
     private const INSTALL_PATHS = [
         'system' => '/etc/systemd/system/',
-        'user' => '~/.config/systemd/user/'
+        'user'   => '~/.config/systemd/user/'
     ];
 
     /** @var PathResolverInterface */
@@ -54,6 +54,18 @@ class SystemCtl
     /** @var ScopeInterface */
     private $scope;
 
+    /**
+     * Hold scope instace with configured values
+     * @var ScopeInterface
+     */
+    private $userScope;
+
+    /**
+     * Hold scope instance with configured values
+     * @var ScopeInterface
+     */
+    private $systemScope;
+
     public const AVAILABLE_UNITS = [
         Service::UNIT,
         'socket',
@@ -143,7 +155,7 @@ public function listUnits(?string $unitPrefix = null, array $unitTypes = self::S
     public function getScope(): ScopeInterface
     {
         if ($this->scope === null) {
-            $this->scope = new SystemScope;
+            $this->scope = $this->system();
         }
 
         return $this->scope;
@@ -156,7 +168,11 @@ public function getScope(): ScopeInterface
      */
     public function user(): self
     {
-        $this->scope = new UserScope;
+        if ($this->userScope === null) {
+            $this->userScope = new UserScope;
+        }
+
+        $this->scope = $this->userScope;
 
         return $this;
     }
@@ -166,7 +182,11 @@ public function user(): self
      */
     public function system(): self
     {
-        $this->scope = new SystemScope;
+        if ($this->systemScope === null) {
+            $this->systemScope = new SystemScope;
+        }
+
+        $this->scope = $this->systemScope;
 
         return $this;
     }
@@ -272,6 +292,7 @@ public function getPathResolver(): PathResolverInterface
     public function setPathResolver(PathResolverInterface $pathResolver): SystemCtl
     {
         $this->pathResolver = $pathResolver;
+
         return $this;
     }
 
@@ -320,12 +341,12 @@ public function setUnitInstaller(UnitInstallerInterface $unitInstaller): self
     /**
      * Install a given template, reload the daemon and return the freshly installed unit.
      *
-     * @param AbstractUnitTemplate $unitTemplate
-     * @param bool                 $overwrite
+     * @param UnitTemplateInterface $unitTemplate
+     * @param bool                  $overwrite
      *
      * @return UnitInterface
      */
-    public function install(AbstractUnitTemplate $unitTemplate, bool $overwrite = false): UnitInterface
+    public function install(UnitTemplateInterface $unitTemplate, bool $overwrite = false): UnitInterface
     {
         $unitSuffix = $unitTemplate->getUnitSuffix();
         $unitName = $unitTemplate->getUnitName();
@@ -334,6 +355,7 @@ public function install(AbstractUnitTemplate $unitTemplate, bool $overwrite = fa
             throw UnitTypeNotSupportedException::create($unitSuffix);
         }
 
+        // TODO: set path to unit installer with current scope
         $this->getUnitInstaller()->install($unitTemplate, $overwrite);
 
         $unit = AbstractUnit::byType($unitSuffix, $unitName, $this->getCommandDispatcher());

src/Template/AbstractUnitTemplate.php

@@ -14,7 +14,7 @@
  * Defines basic properties for a unit
  *
  * @package SystemCtl\Template
- * @author icanhazstring <[email protected]>
+ * @author  icanhazstring <[email protected]>
  */
 abstract class AbstractUnitTemplate
 {
@@ -46,7 +46,7 @@ public function __construct(string $unitName, string $unitSuffix)
     /**
      * @return AbstractSection
      */
-    abstract public function getTypeSpecificSection(): AbstractSection;
+    abstract protected function getTypeSpecificSection(): AbstractSection;
 
     /**
      * Get all definitions for this template as array

src/Template/Installer/UnitInstaller.php

@@ -6,6 +6,7 @@
 use SystemCtl\Exception\UnitFileExistsException;
 use SystemCtl\Template\AbstractUnitTemplate;
 use SystemCtl\Template\RendererInterface;
+use SystemCtl\Template\UnitTemplateInterface;
 
 /**
  * UnitInstaller
@@ -52,7 +53,7 @@ public function getRenderer(): RendererInterface
     /**
      * @inheritDoc
      */
-    public function install(AbstractUnitTemplate $unitTemplate, bool $overwrite = false): bool
+    public function install(UnitTemplateInterface $unitTemplate, bool $overwrite = false): bool
     {
         $unitSuffix = $unitTemplate->getUnitSuffix();
         $unitName = $unitTemplate->getUnitName();

src/Template/Installer/UnitInstallerInterface.php

@@ -5,6 +5,7 @@
 
 use SystemCtl\Template\AbstractUnitTemplate;
 use SystemCtl\Template\RendererInterface;
+use SystemCtl\Template\UnitTemplateInterface;
 
 /**
  * UnitInstallerInterface
@@ -38,10 +39,10 @@ public function getRenderer(): RendererInterface;
     /**
      * Install a unit by template
      *
-     * @param AbstractUnitTemplate $unitTemplate
-     * @param bool                 $overwrite
+     * @param UnitTemplateInterface $unitTemplate
+     * @param bool                  $overwrite
      * @return bool
      * @throw UnitNotInstalledException
      */
-    public function install(AbstractUnitTemplate $unitTemplate, bool $overwrite = false): bool;
+    public function install(UnitTemplateInterface $unitTemplate, bool $overwrite = false): bool;
 }

src/Template/Renderer/PlatesRenderer.php

@@ -5,15 +5,15 @@
 
 use League\Plates;
 use SystemCtl\Template\RendererInterface;
-use SystemCtl\Template\AbstractUnitTemplate;
+use SystemCtl\Template\UnitTemplateInterface;
 
 /**
  * PlatesRenderer
  *
  * Wrapper for plates to be used with RendererInterface
  *
  * @package SystemCtl\Template
- * @author icanhazstring <[email protected]>
+ * @author  icanhazstring <[email protected]>
  */
 class PlatesRenderer implements RendererInterface
 {
@@ -34,7 +34,7 @@ public function __construct(string $directory, string $extension = 'tpl')
     /**
      * @inheritdoc
      */
-    public function render(string $templateFile, AbstractUnitTemplate $unitTemplate): string
+    public function render(string $templateFile, UnitTemplateInterface $unitTemplate): string
     {
         return $this->engine->render($templateFile, ['sections' => $unitTemplate->getSections()]);
     }

src/Template/RendererInterface.php

@@ -14,10 +14,10 @@ interface RendererInterface
     /**
      * Render a named template with given data
      *
-     * @param string               $templateFile
-     * @param AbstractUnitTemplate $unitTemplate
+     * @param string                $templateFile
+     * @param UnitTemplateInterface $unitTemplate
      *
      * @return string
      */
-    public function render(string $templateFile, AbstractUnitTemplate $unitTemplate): string;
+    public function render(string $templateFile, UnitTemplateInterface $unitTemplate): string;
 }

src/Template/ServiceUnitTemplate.php

@@ -41,7 +41,7 @@ public function getServiceSection(): ServiceSection
     /**
      * @inheritDoc
      */
-    public function getTypeSpecificSection(): AbstractSection
+    protected function getTypeSpecificSection(): AbstractSection
     {
         return $this->serviceSection;
     }