From ff1013ed7c7a517024ce8c657ccab50ba29bdee6 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:20:02 +0100 Subject: [PATCH 01/10] Add custom port to config options in db class --- src/psm/Service/Database.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/psm/Service/Database.php b/src/psm/Service/Database.php index c5296170..afb022a7 100644 --- a/src/psm/Service/Database.php +++ b/src/psm/Service/Database.php @@ -81,9 +81,10 @@ class Database { * @param string $pass * @param string $db */ - function __construct($host = null, $user = null, $pass = null, $db = null) { + function __construct($host = null, $user = null, $pass = null, $db = null, $port = null) { if($host != null && $user != null && $pass !== null && $db != null) { $this->db_host = $host; + $this->db_port = $port || 3306; $this->db_name = $db; $this->db_user = $user; $this->db_pass = $pass; @@ -498,7 +499,7 @@ class Database { // Initizale connection try { $this->pdo = new \PDO( - 'mysql:host='.$this->db_host.';dbname='.$this->db_name.';charset=utf8', + 'mysql:host='.$this->db_host.';port='.$this->db_port.';dbname='.$this->db_name.';charset=utf8', $this->db_user, $this->db_pass ); From 80a092fa0c82b66232e3a81c42f2ceed8561c85a Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:20:46 +0100 Subject: [PATCH 02/10] Add port static to config file --- config.php.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/config.php.sample b/config.php.sample index 667afe2e..41b09247 100755 --- a/config.php.sample +++ b/config.php.sample @@ -4,4 +4,5 @@ define('PSM_DB_USER', 'db_user'); define('PSM_DB_PASS', 'db_pass'); define('PSM_DB_NAME', 'db_name'); define('PSM_DB_HOST', 'localhost'); +define('PSM_DB_PORT', '3306'); From 4a69f606d3661f034147092f4e96a759c395cdf0 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:22:24 +0100 Subject: [PATCH 03/10] Add port constant to psminstall --- puphpet/files/exec-once/psminstall.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/puphpet/files/exec-once/psminstall.sh b/puphpet/files/exec-once/psminstall.sh index 2ebd8b54..b115800f 100644 --- a/puphpet/files/exec-once/psminstall.sh +++ b/puphpet/files/exec-once/psminstall.sh @@ -6,8 +6,9 @@ define('PSM_DB_USER', 'psm'); \ define('PSM_DB_PASS', 'psm'); \ define('PSM_DB_NAME', 'psm'); \ define('PSM_DB_HOST', 'localhost'); \ +define('PSM_DB_PORT', '3306'); \ ?>" > /var/www/default/psm/config.php echo "" > /var/www/default/index.php \ No newline at end of file +?>" > /var/www/default/index.php From a3853241f806dd4edbf1907b103289381de41ef2 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:23:31 +0100 Subject: [PATCH 04/10] Add port param and argument --- src/config/services.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/config/services.xml b/src/config/services.xml index 5d3fbd1b..43446dcd 100644 --- a/src/config/services.xml +++ b/src/config/services.xml @@ -18,6 +18,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/sc %path.src%templates PSM_DB_HOST + PSM_DB_PORT PSM_DB_USER PSM_DB_PASS PSM_DB_NAME @@ -38,6 +39,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/sc %db.user% %db.pass% %db.name% + %db.port% From a9f11fb691972863848324f38dab177d1bce52d5 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:24:25 +0100 Subject: [PATCH 05/10] Add port constant to install readme --- docs/install.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/install.rst b/docs/install.rst index f8e0efa2..627704fb 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -27,6 +27,7 @@ To change these values correctly, only update the second parameter of the functi define('PSM_DB_NAME', 'db_name'); define('PSM_DB_USER', 'db_user'); define('PSM_DB_PASS', 'db_user_password'); + define('PSM_DB_PORT', '3306'); For example: to change your username you should ONLY change the 'db\_user' part. Do NOT remove the quotes around your username as that will result in an error. From b2043b1b654c3808f95ec70a90a481fda53d7aa3 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:28:25 +0100 Subject: [PATCH 06/10] Add protected variable $db_port --- src/psm/Service/Database.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/psm/Service/Database.php b/src/psm/Service/Database.php index afb022a7..c15348e0 100644 --- a/src/psm/Service/Database.php +++ b/src/psm/Service/Database.php @@ -35,6 +35,12 @@ class Database { */ protected $db_host; + /** + * DB port + * @var string $db_port + */ + protected $db_port; + /** * DB name * @var string $db_name From cd977e2e515e7242330742c3856646c5f2b3e94a Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:30:39 +0100 Subject: [PATCH 07/10] Initialize protected variable db_port with value 3306 --- src/psm/Service/Database.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psm/Service/Database.php b/src/psm/Service/Database.php index c15348e0..16ff69fc 100644 --- a/src/psm/Service/Database.php +++ b/src/psm/Service/Database.php @@ -39,7 +39,7 @@ class Database { * DB port * @var string $db_port */ - protected $db_port; + protected $db_port = 3306; /** * DB name From b780a6237e72b867a4584886eb3329fdcc877f77 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:38:50 +0100 Subject: [PATCH 08/10] Add port input fields to template --- src/templates/default/module/install/config_new.tpl.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/templates/default/module/install/config_new.tpl.html b/src/templates/default/module/install/config_new.tpl.html index 64fe07ab..4a07a4ce 100644 --- a/src/templates/default/module/install/config_new.tpl.html +++ b/src/templates/default/module/install/config_new.tpl.html @@ -17,6 +17,12 @@ +
+ +
+ +
+
@@ -60,4 +66,4 @@
{% endif %}
-{% endblock %} \ No newline at end of file +{% endblock %} From b1df28d4d97d1e006de22fd75fd6348cecafc899 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:41:03 +0100 Subject: [PATCH 09/10] Add port to installer --- src/psm/Module/Install/Controller/InstallController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/psm/Module/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php index dad31b14..fab71709 100644 --- a/src/psm/Module/Install/Controller/InstallController.php +++ b/src/psm/Module/Install/Controller/InstallController.php @@ -121,6 +121,7 @@ class InstallController extends AbstractController { $config = array( 'host' => 'localhost', + 'port' => '3306', 'name' => '', 'user' => '', 'pass' => '', @@ -143,7 +144,8 @@ class InstallController extends AbstractController { $config['host'], $config['user'], $config['pass'], - $config['name'] + $config['name'], + $config['port'], ); if($this->db->status()) { @@ -307,6 +309,7 @@ class InstallController extends AbstractController { 'pass' => '', 'name' => '', 'host' => '', + 'port' => '3306', ); $pattern = "/define\('SM_DB_{key}', '(.*?)'/u"; From 6805903089e54eab6d4157b98553eff86f95e009 Mon Sep 17 00:00:00 2001 From: Tom Hatzer Date: Fri, 23 Dec 2016 15:42:15 +0100 Subject: [PATCH 10/10] Remove trailing comma --- src/psm/Module/Install/Controller/InstallController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/psm/Module/Install/Controller/InstallController.php b/src/psm/Module/Install/Controller/InstallController.php index fab71709..75a7e94a 100644 --- a/src/psm/Module/Install/Controller/InstallController.php +++ b/src/psm/Module/Install/Controller/InstallController.php @@ -145,7 +145,7 @@ class InstallController extends AbstractController { $config['user'], $config['pass'], $config['name'], - $config['port'], + $config['port'] ); if($this->db->status()) { @@ -309,7 +309,7 @@ class InstallController extends AbstractController { 'pass' => '', 'name' => '', 'host' => '', - 'port' => '3306', + 'port' => '3306' ); $pattern = "/define\('SM_DB_{key}', '(.*?)'/u";