Code cleanup

Author: icanhazstring

src/SystemCtl.php

@@ -18,11 +18,14 @@
 class SystemCtl
 {
     /** @var string systemctl binary path */
-    public static $binary = '/bin/systemctl';
+    private static $binary = '/bin/systemctl';
 
     /** @var int timeout for commands */
     private static $timeout = 3;
 
+    /** @var CommandDispatcherInterface */
+    private $commandDispatcher;
+
     public const AVAILABLE_UNITS = [
         Service::UNIT,
         'socket',
@@ -42,8 +45,6 @@ class SystemCtl
         Timer::UNIT,
     ];
 
-    private $commandDispatcher;
-
     /**
      * Change systemctl binary
      *

src/Template/AbstractUnitTemplate.php

@@ -43,14 +43,20 @@ public function __construct(string $unitName, string $unitSuffix)
         $this->installSection = new InstallSection;
     }
 
+    /**
+     * @return AbstractSection
+     */
+    abstract public function getTypeSpecificSection();
+
     /**
      * Get all definitions for this template as array
      *
      * @return array
      */
-    public function getDefinitions(): array
+    public function getSections(): array
     {
         $unitProperties = $this->getUnitSection()->getProperties();
+        $typeSpecificProperties = $this->getTypeSpecificSection()->getProperties();
         $installProperties = $this->getInstallSection()->getProperties();
 
         $definitions = [];
@@ -59,6 +65,10 @@ public function getDefinitions(): array
             $definitions['Unit'] = $this->convertProperties($unitProperties);
         }
 
+        if (!empty($typeSpecificProperties)) {
+            $definitions[ucfirst($this->getUnitSuffix())] = $this->convertProperties($typeSpecificProperties);
+        }
+
         if (!empty($installProperties)) {
             $definitions['Install'] = $this->convertProperties($installProperties);
         }

src/Template/Renderer/PlatesRenderer.php

@@ -33,6 +33,6 @@ public function __construct(Plates\Engine $engine)
      */
     public function render(string $templateFile, AbstractUnitTemplate $unitTemplate): string
     {
-        return $this->engine->render($templateFile, ['sections' => $unitTemplate->getDefinitions()]);
+        return $this->engine->render($templateFile, ['sections' => $unitTemplate->getSections()]);
     }
 }

src/Template/Section/AbstractSection.php

@@ -28,14 +28,15 @@ public function getProperties(): array
      */
     public function __call($name, $arguments)
     {
-        preg_match('/(?<type>get|set|should)(?<property>.*)/', $name, $match);
+        preg_match('/(?<type>get|set)(?<property>.*)/', $name, $match);
 
         if (!in_array($match['property'], static::PROPERTIES)) {
             throw new PropertyNotSupportedException($match['property'], static::class);
         }
 
         if ($match['type'] === 'set') {
             $this->properties[$match['property']] = $arguments[0];
+
             return $this;
         }
 

src/Template/Section/ServiceSection.php

@@ -22,7 +22,7 @@
  * @method string getExecStop()
  * @method string getExecReload()
  * @method string getRestart()
- * @method bool shouldRemainsAfterExit()
+ * @method bool getRemainsAfterExit()
  * @method string getPIDFile()
  *
  * @package SystemCtl\Template\Section

src/Template/Section/TimerSection.php

@@ -11,7 +11,7 @@
  *
  * @method string getOnCalendar()
  * @method string getUnit()
- * @method bool shouldRemainAfterElapse()
+ * @method bool getRemainAfterElapse()
  *
  * @package SystemCtl\Template\Section
  * @author  icanhazstring <[email protected]>

src/Template/ServiceUnitTemplate.php

@@ -33,15 +33,8 @@ public function getServiceSection(): ServiceSection
     /**
      * @inheritDoc
      */
-    public function getDefinitions(): array
+    public function getTypeSpecificSection()
     {
-        $defintiions = parent::getDefinitions();
-        $serviceProperties = $this->getServiceSection()->getProperties();
-
-        if (!empty($serviceProperties)) {
-            $defintiions[ucfirst(Service::UNIT)] = $this->convertProperties($serviceProperties);
-        }
-
-        return $defintiions;
+        return $this->serviceSection;
     }
 }

src/Template/TimerUnitTemplate.php

@@ -33,15 +33,8 @@ public function getTimerSection(): TimerSection
     /**
      * @inheritDoc
      */
-    public function getDefinitions(): array
+    public function getTypeSpecificSection()
     {
-        $defintiions = parent::getDefinitions();
-        $timerProperties = $this->getTimerSection()->getProperties();
-
-        if (!empty($timerProperties)) {
-            $defintiions[ucfirst(Timer::UNIT)] = $this->convertProperties($timerProperties);
-        }
-
-        return $defintiions;
+        return $this->timerSection;
     }
 }

tests/Integration/SystemCtlTest.php

@@ -15,7 +15,7 @@
 /**
  * Class SystemCtlTest
  *
- * @package SystemCtl\Test\Integration
+ * @package SystemCtl\Tests\Integration
  */
 class SystemCtlTest extends TestCase
 {

…Template/Renderer/PlatesRendererTest.php …Template/Renderer/PlatesRendererTest.phptests/Unit/Template/Renderer/PlatesRendererTest.php renamed to tests/Integration/Template/Renderer/PlatesRendererTest.php tests/Unit/Template/Renderer/PlatesRendererTest.php renamed to tests/Integration/Template/Renderer/PlatesRendererTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace SystemCtl\Test\Unit\Template\Renderer;
+namespace SystemCtl\Tests\Integration\Template\Renderer;
 
 use League\Plates\Engine;
 use PHPUnit\Framework\TestCase;
@@ -14,7 +14,7 @@
 /**
  * PlatesRendererTest
  *
- * @package SystemCtl\Test\Unit\Template\Renderer
+ * @package SystemCtl\Tests\Unit\Template\Renderer
  * @author  icanhazstring <[email protected]>
  */
 class PlatesRendererTest extends TestCase
@@ -56,10 +56,10 @@ public function testPlatesRenderer()
         $this->assertEquals(<<<EOT
 [Unit]
 Description=TestDescription
-[Install]
-WantedBy=multi-user.target
 [Service]
 Type=simple
+[Install]
+WantedBy=multi-user.target
 
 EOT
             , $result);