MCP-903: Fix default connection = db setting after Magento installation

adifucan · adifucan · commit d3745ecf3bdb · 2022-02-04T22:54:04.000-06:00
- Add lock prefix if it is empty string to fix config rewrite when setup:config:set is applied after setup:install in integration tests;
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Database.php b/lib/internal/Magento/Framework/Lock/Backend/Database.php
@@ -162,7 +162,7 @@ private function addPrefix(string $name): string
      */
     private function getPrefix(): string
     {
-        if ($this->prefix === null) {
+        if ($this->prefix === null || $this->prefix === '') {
             $this->prefix = (string)$this->deploymentConfig->get(
                 ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT
                 . '/'

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ private function addPrefix(string $name): string`
`162`	`162`	`*/`
`163`	`163`	`private function getPrefix(): string`
`164`	`164`	`{`
`165`		`- if ($this->prefix === null) {`
	`165`	`+ if ($this->prefix === null \|\| $this->prefix === '') {`
`166`	`166`	`$this->prefix = (string)$this->deploymentConfig->get(`
`167`	`167`	`ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT`
`168`	`168`	`. '/'`