Merge branch 'release/2.1.4'

webdevops · Aug 1, 2015 · e6aef91 · e6aef91
2 parents 6010636 + eefe3f2
commit e6aef91
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 CliTools Changelog
 ==================
 
+2.1.4 - 2015-08-01
+------------------
+- Fixed "CliTools\Shell\CommandBuilder\DatabaseConnection" not found
+- Fixed `typo3:domain` incorrect setting baseurl to hidden domains
+- Set new fallback download url (dl.webdevops.io)
+
+2.1.3 - 2015-07-31
+------------------
+- PSR2 reformatting
+- Fixed mysql/mysqldump username/passwort/hostname/port setting from internal connection
+- Changed github repository to webdevops organisation
+
 2.1.2 - 2015-07-22
 ------------------
 - Fixed smaller issues

diff --git a/Documentation/INSTALL.md b/Documentation/INSTALL.md
@@ -72,7 +72,7 @@ alias dcmysql='ct docker:mysql'
 
 CliTools will read /etc/clitools.ini (system wide) and ~/.clitools.ini (personal) for configuration
 
-The [default configuration](https://github.com/mblaschke/vagrant-clitools/blob/develop/src/config.ini) is inside the phar.
+The [default configuration](https://github.com/webdevops/clitools/blob/develop/src/config.ini) is inside the phar.
 
 ### Docker specific configuration
 ```ini
@@ -119,3 +119,20 @@ ct self-update --beta
 ## Fallback update (if GitHub fails)
 ct self-update --fallback
 ```
+
+
+
+## Install clitools from source (You don't have to perform any tasks of the default installation procedure)
+
+```bash
+# Clone the repository
+git clone https://github.com/webdevops/clitools clitools
+
+# cd into cloned repository
+cd clitools
+
+# run all makefile tasks which are necessary for building and installing from source
+make all
+```
+
+If you take a look into the `Makefile` you see which tasks have been executed. The steps are: first the composer cmd, then the main build script and at last the previously built phar file gets copied to `/usr/local/bin` so that you can execute clitools just by typing `ct` without the complete path to the executable.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # CliTools for Docker, PHP und MySQL development
 
-[![latest v2.1.3](https://img.shields.io/badge/latest-v2.1.3-green.svg?style=flat)](https://github.com/mblaschke/clitools/releases/tag/2.1.3)
+[![latest v2.1.4](https://img.shields.io/badge/latest-v2.1.4-green.svg?style=flat)](https://github.com/mblaschke/clitools/releases/tag/2.1.4)
 [![License GPL3](https://img.shields.io/badge/license-GPL3-blue.svg?style=flat)](/LICENSE)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mblaschke/clitools.svg)](http://isitmaintained.com/project/mblaschke/clitools "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/clitools.svg)](http://isitmaintained.com/project/mblaschke/clitools "Percentage of issues still open")

diff --git a/src/app/CliTools/Console/Command/TYPO3/DomainCommand.php b/src/app/CliTools/Console/Command/TYPO3/DomainCommand.php
@@ -170,6 +170,7 @@ protected function updateBaseUrlConfig()
                          (SELECT sd.domainName
                             FROM sys_domain sd
                            WHERE sd.pid = st.pid
+                             AND sd.hidden = 0
                         ORDER BY sd.forced DESC,
                                  sd.sorting ASC
                            LIMIT 1) as domain_name
@@ -234,7 +235,10 @@ protected function addDuplicateDomains($suffix)
      */
     protected function showDomainList($dbName)
     {
-        $query      = 'SELECT domainName FROM sys_domain ORDER BY domainName ASC';
+        $query      = 'SELECT domainName
+                         FROM sys_domain
+                        WHERE hidden = 0
+                     ORDER BY domainName ASC';
         $domainList = DatabaseConnection::getCol($query);
 
         $this->output->writeln('<p>Domain list of "' . $dbName . '":</p>');

diff --git a/src/app/CliTools/Shell/CommandBuilder/MysqlCommandBuilder.php b/src/app/CliTools/Shell/CommandBuilder/MysqlCommandBuilder.php
@@ -20,6 +20,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+use CliTools\Database\DatabaseConnection;
+
 class MysqlCommandBuilder extends CommandBuilder
 {
 

diff --git a/src/command.php b/src/command.php
@@ -20,7 +20,7 @@
  */
 
 error_reporting(E_ALL);
-define('CLITOOLS_COMMAND_VERSION', '2.1.3');
+define('CLITOOLS_COMMAND_VERSION', '2.1.4');
 define('CLITOOLS_ROOT_FS', __DIR__);
 
 require __DIR__ . '/vendor/autoload.php';

diff --git a/src/config.ini b/src/config.ini
@@ -3,7 +3,7 @@ ssh_conf_path       = "/opt/conf/ssh"
 www_base_path       = "/var/www"
 domain_dev          = "vm"
 github_repo         = "webdevops/clitools"
-update_fallback_url = "https://www.achenar.net/clicommand/clitools.phar"
+update_fallback_url = "https://dl.webdevops.io/clicommand/clitools.phar"
 
 [db]
 dsn = "mysql:host=localhost"
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ @@
      * along with this program.  If not, see <http://www.gnu.org/licenses/>.
      */
+    use CliTools\Database\DatabaseConnection;
     class MysqlCommandBuilder extends CommandBuilder
     {
@@ Expand Down @@