Merge remote-tracking branch 'ogresce/MAGETWO-31904-table-prefix-validation' into develop

Conflicts:
	setup/view/magento/setup/add-database.phtml

Author: mazhalai

dev/tests/unit/testsuite/Magento/Setup/Controller/DatabaseCheckTest.php

@@ -53,4 +53,10 @@ public function testIndexActionWithError()
         $this->assertArrayHasKey('error', $variables);
         $this->assertFalse($variables['success']);
     }
+
+    public function testIndexActionCheckPrefix()
+    {
+        $this->installer->expects($this->once())->method('checkDatabaseTablePrefix');
+        $this->controller->indexAction();
+    }
 }

setup/src/Magento/Setup/Controller/DatabaseCheck.php

@@ -47,10 +47,13 @@ public function __construct(InstallerFactory $installerFactory, WebLogger $webLo
     public function indexAction()
     {
         $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
+
         try {
             $installer = $this->installerFactory->create($this->webLogger);
             $password = isset($params['password']) ? $params['password'] : '';
             $installer->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password);
+            $tablePrefix = isset($params['tablePrefix']) ? $params['tablePrefix'] : '';
+            $installer->checkDatabaseTablePrefix($tablePrefix);
             return new JsonModel(['success' => true]);
         } catch (\Exception $e) {
             return new JsonModel(['success' => false, 'error' => $e->getMessage()]);

setup/src/Magento/Setup/Model/Installer.php

@@ -875,6 +875,24 @@ public function checkDatabaseConnection($dbName, $dbHost, $dbUser, $dbPass = '')
         return true;
     }
 
+    /**
+     * Check if database table prefix is valid
+     *
+     * @param string $prefix
+     * @return boolean
+     * @throws \InvalidArgumentException
+     */
+    public function checkDatabaseTablePrefix($prefix)
+    {
+        //The table prefix should contain only letters (a-z), numbers (0-9) or underscores (_);
+        // the first character should be a letter.
+        if ($prefix !== '' && !preg_match('/^([a-zA-Z])([[:alnum:]_]+)$/', $prefix)) {
+            throw new \InvalidArgumentException('Please correct the table prefix format.');
+        }
+
+        return true;
+    }
+
     /**
      * Return messages
      *
@@ -994,6 +1012,9 @@ private function assertDbAccessible()
             $config[DbConfig::KEY_USER],
             $config[DbConfig::KEY_PASS]
         );
+        if (isset($config[DbConfig::KEY_PREFIX])) {
+            $this->checkDatabaseTablePrefix($config[DbConfig::KEY_PREFIX]);
+        }
     }
 
     /**

setup/view/magento/setup/add-database.phtml

@@ -337,7 +337,7 @@
             id="dbTablePrefix"
             class="form-el-input"
             tooltip-placement="right"
-            tooltip="Enter a tracking prefix to be used for database tables created for this Magento installation. (ex: 'mg1_' )."
+            tooltip="Enter a prefix for database tables created in this installation. Use letters, numbers or underscores, and begin with a letter (Ex: ‘mg1_’)"
             tooltip-trigger="focus"
             tooltip-append-to-body="true"
             type="text"