Skip to content

Commit

Permalink
Merge pull request #188 from 4AllDigital/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
joemewes authored Feb 1, 2018
2 parents 6831a87 + ab08ac4 commit 76af821
Show file tree
Hide file tree
Showing 50 changed files with 70 additions and 76 deletions.
2 changes: 1 addition & 1 deletion _devtools/docker-sonnarscanner/sonar-runner.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#----- Default SonarQube server
# sonar.host.url=http://sonarqube:9000
sonar.host.url=http://10.254.254.254:5002
sonar.host.url=http://docker.for.mac.localhost:5002


#----- Default source code encoding
Expand Down
4 changes: 3 additions & 1 deletion src/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Application extends ParentApplication {

const NAME = 'Docker Drupal';

const VERSION = '1.4-alpha1.0.6';
const VERSION = '1.4-alpha1.0.8';

// const CDN = 'http://d1gem705zq3obi.cloudfront.net';

Expand Down Expand Up @@ -184,6 +184,8 @@ protected function registerCommands() {
$commands[] = new Command\Drush\DrushModuleDisableCommand();
$commands[] = new Command\Drush\DrushUpDbCommand();
$commands[] = new Command\Drush\DrushInitConfigCommand();
$commands[] = new Command\Drush\DrushConfigExportCommand();
$commands[] = new Command\Drush\DrushConfigImportCommand();

$commands[] = new Command\Redis\RedisMonitorCommand();
$commands[] = new Command\Redis\RedisPingCommand();
Expand Down
6 changes: 2 additions & 4 deletions src/Command/App/AboutCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\AboutCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down Expand Up @@ -100,7 +100,7 @@ private function checkPHPVersion($io) {
}

/**
* @return boolean
* @param object
*/
private function checkGitInstalled($io) {
exec('which git', $output);
Expand All @@ -111,6 +111,4 @@ private function checkGitInstalled($io) {
$io->error('GIT not found. Please install.');
}
}


}
4 changes: 2 additions & 2 deletions src/Command/App/BashCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\BashCommand.
*/

namespace Docker\Drupal\Command\App;
Expand All @@ -16,7 +16,7 @@
use Docker\Drupal\Style\DruDockStyle;

/**
* Class StopCommand
* Class BashCommand
*
* @package Docker\Drupal\Command
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/BuildCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\BuildCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/DestroyCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DestroyCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/ExecCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\ExecCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/InitBuildCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\InitBuildCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
6 changes: 3 additions & 3 deletions src/Command/App/InitCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\InitCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down Expand Up @@ -117,8 +117,8 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$yaml = Yaml::dump($config);
file_put_contents($system_appname . '/.config.yml', $yaml);

if ($application->getOs() == 'Darwin' && isset($appname) && !file_exists('/Library/LaunchDaemons/com.4alldigital.drudock.plist')) {
$message = "If prompted, please type admin password to add app localhost details \n and COPY ifconfig alias.plist to /Library/LaunchDaemons/";
if ($application->getOs() == 'Darwin' && isset($appname)) {
$message = "If prompted, please type admin password to add app localhost details.";
$io->info(' ');
$io->info($message);
$io->info(' ');
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/InitContainersCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\InitContainersCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/OpenAppCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\OpenAppCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/RestartCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\RestartCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/SSHCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\SSHCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/SelfUpdateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\SelfUpdateCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/StartCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\StartCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/StatusCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\StatusCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/StopCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\StopCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/UpdateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\UpdateCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/UpdateConfigCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\UpdateConfigCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/App/UpdateServicesCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\UpdateServicesCommand.
*/

namespace Docker\Drupal\Command\App;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Behat/BehatCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\BehatCommand.
*/

namespace Docker\Drupal\Command\Behat;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Behat/BehatMonitorCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\BehatMonitorCommand.
*/

namespace Docker\Drupal\Command\Behat;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Behat/BehatStatusCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\BehatStatusCommand.
*/

namespace Docker\Drupal\Command\Behat;
Expand Down
4 changes: 2 additions & 2 deletions src/Command/Drush/DrushClearCacheCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DrushClearCacheCommand.
*/

namespace Docker\Drupal\Command\Drush;
Expand All @@ -15,7 +15,7 @@
use Docker\Drupal\Style\DruDockStyle;

/**
* Class DemoCommand
* Class DrushClearCacheCommand
*
* @package Docker\Drupal\Command
*/
Expand Down
6 changes: 3 additions & 3 deletions src/Command/Drush/DrushConfigExportCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DrushConfigExportCommand.
*/

namespace Docker\Drupal\Command\Drush;
Expand All @@ -17,7 +17,7 @@
use Docker\Drupal\Style\DruDockStyle;

/**
* Class DemoCommand
* Class DrushConfigExportCommand
*
* @package Docker\Drupal\Command
*/
Expand Down Expand Up @@ -52,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {

switch ($config['apptype']) {
case 'D8':
$cmd = implode(' ', array_merge(['config-import', $label], $options));
$cmd = implode(' ', array_merge(['config-export', $label], $options));
break;
case 'D7':
$io->error('This command is only available for D8');
Expand Down
4 changes: 2 additions & 2 deletions src/Command/Drush/DrushConfigImportCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DrushConfigImportCommand.
*/

namespace Docker\Drupal\Command\Drush;
Expand All @@ -17,7 +17,7 @@
use Docker\Drupal\Style\DruDockStyle;

/**
* Class DemoCommand
* Class DrushConfigImportCommand
*
* @package Docker\Drupal\Command
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Drush/DrushInitConfigCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DrushInitConfigCommand.
*/

namespace Docker\Drupal\Command\Drush;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Drush/DrushLoginCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DrushLoginCommand.
*/

namespace Docker\Drupal\Command\Drush;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Drush/DrushModuleDisableCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DrushModuleDisableCommand.
*/

namespace Docker\Drupal\Command\Drush;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Drush/DrushModuleEnableCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DrushModuleEnableCommand.
*/

namespace Docker\Drupal\Command\Drush;
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Drush/DrushUpDbCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\DrushUpDbCommand.
*/

namespace Docker\Drupal\Command\Drush;
Expand Down
4 changes: 2 additions & 2 deletions src/Command/Mysql/MysqlExportCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\MysqlExportCommand.
*/

namespace Docker\Drupal\Command\Mysql;
Expand All @@ -17,7 +17,7 @@
use Docker\Drupal\Extension\ApplicationContainerExtension;

/**
* Class MysqlImportExportCommand
* Class MysqlExportCommand
*
* @package Docker\Drupal\Command\Mysql
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Command/Mysql/MysqlImportCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/**
* @file
* Contains \Docker\Drupal\Command\DemoCommand.
* Contains \Docker\Drupal\Command\MysqlImportExportCommand.
*/

namespace Docker\Drupal\Command\Mysql;
Expand Down
Loading

0 comments on commit 76af821

Please sign in to comment.