use modern php features

LordSimal · Aug 13, 2023 · 9a64d20 · 9a64d20
1 parent da26b03
commit 9a64d20
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 40 deletions.
diff --git a/src/Sql/MySQL.php b/src/Sql/MySQL.php
@@ -20,16 +20,14 @@ public function dump(): string
             throw new BinaryNotFoundException($this->command . ' was not found');
         }
 
-        $config = $this->getConfig();
-
         $command = [
             $this->command,
-            '--user="' . ($config['username'] ?? '') . '"',
-            '--password="' . ($config['password'] ?? '') . '"',
-            '--default-character-set=' . ($config['encoding'] ?? 'utf8mb4'),
-            '--host=' . ($config['host'] ?? 'localhost'),
+            '--user="' . ($this->config['username'] ?? '') . '"',
+            '--password="' . ($this->config['password'] ?? '') . '"',
+            '--default-character-set=' . ($this->config['encoding'] ?? 'utf8mb4'),
+            '--host=' . ($this->config['host'] ?? 'localhost'),
             '--databases',
-            $config['database'],
+            $this->config['database'],
             '--no-create-db',
         ];
         if ($this->isDataOnly()) {

diff --git a/src/Sql/PostgreSQL.php b/src/Sql/PostgreSQL.php
@@ -22,15 +22,14 @@ public function dump(): string
             throw new BinaryNotFoundException($this->command . ' was not found');
         }
 
-        $config = $this->getConfig();
         $passFile = $this->writePassFile();
 
         $command = [
             'PGPASSFILE=' . $passFile,
             $this->command,
-            '--host=' . ($config['host'] ?? 'localhost'),
-            '--username=' . ($config['username'] ?? ''),
-            '--dbname="' . ($config['database'] ?? '') . '"',
+            '--host=' . ($this->config['host'] ?? 'localhost'),
+            '--username=' . ($this->config['username'] ?? ''),
+            '--dbname="' . ($this->config['database'] ?? '') . '"',
         ];
         if ($this->isDataOnly()) {
             $command[] = '--data-only';
@@ -42,7 +41,7 @@ public function dump(): string
         $output = $process->getOutput();
         $error = $process->getErrorOutput();
 
-        if (strpos($error, 'server version mismatch') !== false) {
+        if (str_contains($error, 'server version mismatch')) {
             throw new VersionMismatchException();
         }
 
@@ -60,15 +59,13 @@ public function dump(): string
      */
     private function writePassFile(): string
     {
-        $config = $this->getConfig();
-
         $passwordParts = [
-            empty($config['host']) ? 'localhost' : $config['host'],
-            empty($config['port']) ? '5432' : $config['port'],
+            empty($this->config['host']) ? 'localhost' : $this->config['host'],
+            empty($this->config['port']) ? '5432' : $this->config['port'],
             // Database
             '*',
-            $config['username'],
-            $config['password'],
+            $this->config['username'],
+            $this->config['password'],
         ];
 
         // Escape colon and backslash characters in entries.

diff --git a/src/Sql/SqlBase.php b/src/Sql/SqlBase.php
@@ -12,11 +12,6 @@ abstract class SqlBase
      */
     protected string $command;
 
-    /**
-     * @var array The config array from the connection object
-     */
-    protected array $config;
-
     /**
      * @var bool Indicated if only data should be exported or not
      */
@@ -30,17 +25,8 @@ abstract class SqlBase
     /**
      * @param array $config The config array from the connection object
      */
-    public function __construct(array $config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * @return array
-     */
-    public function getConfig(): array
+    public function __construct(public readonly array $config)
     {
-        return $this->config;
     }
 
     /**
@@ -77,7 +63,7 @@ public function setIo(ConsoleIo $io): void
      */
     protected function checkBinary(string $command): bool
     {
-        $windows = strpos(PHP_OS, 'WIN') === 0;
+        $windows = str_starts_with(PHP_OS, 'WIN');
         $test = $windows ? 'where' : 'command -v';
 
         return is_executable(trim(shell_exec("$test $command")));

diff --git a/src/Sql/Sqlite.php b/src/Sql/Sqlite.php
@@ -54,11 +54,9 @@ public function dump(): string
      */
     private function getSchema(): string
     {
-        $config = $this->getConfig();
-
         $schemaCommand = [
             $this->command,
-            $config['database'],
+            $this->config['database'],
             '.schema',
         ];
 
@@ -79,11 +77,9 @@ private function getSchema(): string
      */
     private function getDump(): string
     {
-        $config = $this->getConfig();
-
         $schemaCommand = [
             $this->command,
-            $config['database'],
+            $this->config['database'],
             '.dump',
         ];