SCA: dropped import duplicates, fixed a few cases of php core API misuse (#5639)

kalessil · Naktibalda · commit cbe6e7c4c89b · 2019-08-09T19:25:28.000+03:00
* SCA: dropped import duplicates, fixed a few cases of php core API misuse

* SCA: partial revert to probe if semaphore build gets fixed
diff --git a/src/Codeception/Lib/DbPopulator.php b/src/Codeception/Lib/DbPopulator.php
@@ -79,7 +79,7 @@ protected function buildCommand($command, $dumpFile = null)
 
             unset($vars[$key]);
         }
-        return str_replace(array_keys($vars), array_values($vars), $command);
+        return str_replace(array_keys($vars), $vars, $command);
     }
 
     /**
diff --git a/src/Codeception/Lib/Driver/Sqlite.php b/src/Codeception/Lib/Driver/Sqlite.php
@@ -34,7 +34,7 @@ public function load($sql)
     {
         if ($this->hasSnapshot) {
             $this->dbh = null;
-            file_put_contents($this->filename, file_get_contents($this->filename . '_snapshot'));
+            copy($this->filename . '_snapshot', $this->filename);
             $this->dbh = new \PDO($this->dsn, $this->user, $this->password);
         } else {
             if (file_exists($this->filename . '_snapshot')) {

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ protected function buildCommand($command, $dumpFile = null)`
`79`	`79`
`80`	`80`	`unset($vars[$key]);`
`81`	`81`	`}`
`82`		`- return str_replace(array_keys($vars), array_values($vars), $command);`
	`82`	`+ return str_replace(array_keys($vars), $vars, $command);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function load($sql)`
`34`	`34`	`{`
`35`	`35`	`if ($this->hasSnapshot) {`
`36`	`36`	`$this->dbh = null;`
`37`		`- file_put_contents($this->filename, file_get_contents($this->filename . '_snapshot'));`
	`37`	`+ copy($this->filename . '_snapshot', $this->filename);`
`38`	`38`	`$this->dbh = new \PDO($this->dsn, $this->user, $this->password);`
`39`	`39`	`} else {`
`40`	`40`	`if (file_exists($this->filename . '_snapshot')) {`