Merge pull request #21 from MacPaw/develop

Release PR
MacPaw · Apr 11, 2023 · b37364b · b37364b
2 parents 94fd19e + fdd1add
commit b37364b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -8,14 +8,6 @@ parameters:
 	        message: '#.*NodeParentInterface|null.*#'
 	        count: 1
 	        path: ./src/DependencyInjection
-	    -
-	        message: '#Parameter \#2 ...\$values of function sprintf expects bool\|float\|int\|string\|null, mixed given.#'
-	        count: 1
-	        path: ./src/Database/Manager/PostgreSQLDatabaseManager.php
-	    -
-	        message: '#Offset (.*)? does not exist on array\{(.*)?\}.#'
-	        count: 9
-	        path: ./src/Database/Manager/PostgreSQLDatabaseManager.php
 	    -
 	        message: '#Offset (.*)? does not exist on array\{(.*)?\}.#'
 	        count: 1

diff --git a/src/Database/Manager/PostgreSQLDatabaseManager.php b/src/Database/Manager/PostgreSQLDatabaseManager.php
@@ -45,10 +45,10 @@ public function saveBackup(array $fixtures): void
         }
 
         $databaseName = $this->getDatabaseName();
-        $password = $this->connection->getParams()['password'];
-        $user = $this->connection->getParams()['user'];
-        $host = $this->connection->getParams()['host'];
-        $port = $this->connection->getParams()['port'];
+        $password = $this->getConnectionParams()['password'];
+        $user = $this->getConnectionParams()['user'];
+        $host = $this->getConnectionParams()['host'];
+        $port = $this->getConnectionParams()['port'];
 
         # Needed for optimization
         $additionalParams = sprintf('--no-comments --disable-triggers --data-only -T %s', $this->migrationsTable);
@@ -82,10 +82,10 @@ public function loadBackup(array $fixtures): void
 
         $backupFilename = $this->getBackupFilename($fixtures);
         $databaseName = $this->getDatabaseName();
-        $password = $this->connection->getParams()['password'];
-        $user = $this->connection->getParams()['user'];
-        $host = $this->connection->getParams()['host'];
-        $port = $this->connection->getParams()['port'];
+        $password = $this->getConnectionParams()['password'];
+        $user = $this->getConnectionParams()['user'];
+        $host = $this->getConnectionParams()['host'];
+        $port = $this->getConnectionParams()['port'];
 
         $this->consoleManager->loadDump($backupFilename, $user, $host, $port, $databaseName, $password);
 
@@ -132,10 +132,13 @@ private function restartSequences(): void
         $sequences = $this->connection->executeQuery('SELECT * FROM information_schema.sequences')
             ->fetchAllAssociative();
 
+        /** @var array{sequence_name: string, start_value?: string} $sequence */
         foreach ($sequences as $sequence) {
-            $this->connection->executeStatement(
-                sprintf('ALTER SEQUENCE %s RESTART WITH 1', $sequence['sequence_name'])
-            );
+            $this->connection->executeStatement(sprintf(
+                'ALTER SEQUENCE %s RESTART WITH %s',
+                $sequence['sequence_name'],
+                $sequence['start_value'] ?? '1'
+            ));
         }
     }
 
@@ -172,6 +175,14 @@ private function runMigrations(): void
 
     protected function getDatabaseName(): string
     {
-        return $this->connection->getParams()['dbname'];
+        return $this->getConnectionParams()['dbname'];
+    }
+
+    private function getConnectionParams(): array
+    {
+        /** @var array{dbname: string, password: string, user: string, host: string, port: int} $connectionParams */
+        $connectionParams = $this->connection->getParams();
+
+        return $connectionParams;
     }
 }