Refactor Configuration.php

Author: antonmedv

src/Command/MainCommand.php

@@ -10,7 +10,7 @@
 
 namespace Deployer\Command;
 
-use Deployer\Configuration\Configuration;
+use Deployer\Configuration;
 use Deployer\Deployer;
 use Deployer\Exception\Exception;
 use Deployer\Exception\GracefulShutdownException;

src/Configuration/Configuration.php src/Configuration.phpsrc/Configuration/Configuration.php renamed to src/Configuration.php

@@ -8,9 +8,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Deployer\Configuration;
+namespace Deployer;
 
-use Deployer\Deployer;
 use Deployer\Exception\ConfigurationException;
 use Deployer\Utility\Httpie;
 
@@ -20,15 +19,8 @@
 
 class Configuration implements \ArrayAccess
 {
-    /**
-     * @var Configuration|null
-     */
-    private $parent;
-
-    /**
-     * @var array
-     */
-    private $values = [];
+    private ?Configuration $parent;
+    private array $values = [];
 
     public function __construct(?Configuration $parent = null)
     {
@@ -45,10 +37,7 @@ public function bind(Configuration $parent): void
         $this->parent = $parent;
     }
 
-    /**
-     * @param mixed $value
-     */
-    public function set(string $name, $value): void
+    public function set(string $name, mixed $value): void
     {
         $this->values[$name] = $value;
     }
@@ -83,11 +72,7 @@ public function add(string $name, array $array): void
         }
     }
 
-    /**
-     * @param mixed|null $default
-     * @return mixed|null
-     */
-    public function get(string $name, $default = null)
+    public function get(string $name, mixed $default = null): mixed
     {
         if (array_key_exists($name, $this->values)) {
             if (is_closure($this->values[$name])) {
@@ -115,10 +100,7 @@ public function get(string $name, $default = null)
         throw new ConfigurationException("Config option \"$name\" does not exist.");
     }
 
-    /**
-     * @return mixed|null
-     */
-    public function fetch(string $name)
+    protected function fetch(string $name): mixed
     {
         if (array_key_exists($name, $this->values)) {
             return $this->values[$name];
@@ -129,41 +111,25 @@ public function fetch(string $name)
         return null;
     }
 
-    /**
-     * @param string|mixed $value
-     * @return string|mixed
-     */
-    public function parse($value)
+    public function parse(mixed $value): mixed
     {
         if (is_string($value)) {
             $normalizedValue = normalize_line_endings($value);
-            return preg_replace_callback('/\{\{\s*([\w\.\/-]+)\s*\}\}/', [$this, 'parseCallback'], $normalizedValue);
+            return preg_replace_callback('/\{\{\s*([\w\.\/-]+)\s*\}\}/', function (array $matches) {
+                return isset($matches[1]) ? $this->get($matches[1]) : null;
+            }, $normalizedValue);
         }
 
         return $value;
     }
 
-    public function ownValues(): array
-    {
-        return $this->values;
-    }
-
     public function keys(): array
     {
         return array_keys($this->values);
     }
 
     /**
-     * @param array $matches
-     * @return mixed|null
-     */
-    private function parseCallback(array $matches)
-    {
-        return isset($matches[1]) ? $this->get($matches[1]) : null;
-    }
-
-    /**
-     * @param mixed $offset
+     * @param string $offset
      * @return bool
      */
     #[\ReturnTypeWillChange]
@@ -174,8 +140,7 @@ public function offsetExists($offset)
 
     /**
      * @param string $offset
-     * @return mixed|null
-     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
+     * @return mixed
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
@@ -186,7 +151,6 @@ public function offsetGet($offset)
     /**
      * @param string $offset
      * @param mixed $value
-     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
      */
     #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value): void

src/Deployer.php

@@ -25,7 +25,7 @@
 use Deployer\ProcessRunner\Printer;
 use Deployer\ProcessRunner\ProcessRunner;
 use Deployer\Ssh\SshClient;
-use Deployer\Configuration\Configuration;
+use Deployer\Configuration;
 use Deployer\Executor\Master;
 use Deployer\Executor\Messenger;
 use Deployer\Host\Host;

src/Host/Host.php

@@ -10,7 +10,7 @@
 
 namespace Deployer\Host;
 
-use Deployer\Configuration\Configuration;
+use Deployer\Configuration;
 use Deployer\Deployer;
 use Deployer\Exception\ConfigurationException;
 use Deployer\Exception\Exception;

src/Task/Context.php

@@ -10,7 +10,7 @@
 
 namespace Deployer\Task;
 
-use Deployer\Configuration\Configuration;
+use Deployer\Configuration;
 use Deployer\Exception\Exception;
 use Deployer\Host\Host;
 use Symfony\Component\Console\Input\InputInterface;

tests/src/Configuration/ConfigurationTest.php

@@ -2,6 +2,7 @@
 
 namespace Deployer\Configuration;
 
+use Deployer\Configuration;
 use Deployer\Exception\ConfigurationException;
 use PHPUnit\Framework\TestCase;
 

tests/src/FunctionsTest.php

@@ -7,7 +7,7 @@
 
 namespace Deployer;
 
-use Deployer\Configuration\Configuration;
+use Deployer\Configuration;
 use Deployer\Host\Host;
 use Deployer\Host\Localhost;
 use Deployer\Task\Context;

tests/src/Host/ConfigurationTest.php

@@ -7,7 +7,7 @@
 
 namespace Deployer\Host;
 
-use Deployer\Configuration\Configuration;
+use Deployer\Configuration;
 use Deployer\Exception\ConfigurationException;
 use PHPUnit\Framework\TestCase;
 

tests/src/Host/HostTest.php

@@ -7,7 +7,7 @@
 
 namespace Deployer\Host;
 
-use Deployer\Configuration\Configuration;
+use Deployer\Configuration;
 use PHPUnit\Framework\TestCase;
 
 class HostTest extends TestCase

tests/src/Task/ContextTest.php

@@ -7,7 +7,7 @@
 
 namespace Deployer\Task;
 
-use Deployer\Configuration\Configuration;
+use Deployer\Configuration;
 use Deployer\Host\Host;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\InputInterface;