richdynamix / magestead

src/Magestead/Service/VersionControl.php

Braces +6 added lines, -12 removed lines

@@ -15,8 +15,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    public function __construct($repoUrl, $projectPath, OutputInterface $output)
-    {
+    public function __construct($repoUrl, $projectPath, OutputInterface $output) {
         $this->_repoUrl = $repoUrl;
         $this->_projectPath = $projectPath;
         $this->_output = $output;
@@ -27,8 +26,7 @@ 
     /**
      * @param OutputInterface $output
      */
-    protected function execute(OutputInterface $output)
-    {
+    protected function execute(OutputInterface $output) {
         $output->writeln('<info>Configuring GIT repo</info>');
         $this->init();
 
@@ -47,8 +45,7 @@ 
      *
      * @return $this
      */
-    public function init()
-    {
+    public function init() {
         $command = 'git init; git remote add origin ' . $this->_repoUrl;
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
@@ -60,8 +57,7 @@ 
      *
      * @return $this
      */
-    public function addFiles()
-    {
+    public function addFiles() {
         $command = 'git add -A';
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
@@ -73,8 +69,7 @@ 
      *
      * @return $this
      */
-    public function commitFiles()
-    {
+    public function commitFiles() {
         $command = "git commit -m 'Initial commit'";
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 
@@ -86,8 +81,7 @@ 
      *
      * @return $this
      */
-    public function pushFiles()
-    {
+    public function pushFiles() {
         $command = "git push -u origin master";
         new ProcessCommand($command, $this->_projectPath, $this->_output);
 

src/Magestead/Service/Notification.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
      *
      * @param $message
      */
-    public static function send($message)
-    {
+    public static function send($message) {
         $notifier = NotifierFactory::create();
         $basePath = dirname( __FILE__ ) . '/../../../';
         $notification =

src/Magestead/Helper/HostsPluginChecker.php

Braces +2 added lines, -4 removed lines

@@ -12,8 +12,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    public static function verify(array $options, OutputInterface $output)
-    {
+    public static function verify(array $options, OutputInterface $output) {
         $hostPlugin = `vagrant plugin list | grep vagrant-hostsupdater`;
         if (is_null($hostPlugin)) {
             self::editHostsInstructions($options, $output);
@@ -26,8 +25,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected static function editHostsInstructions(array $options, OutputInterface $output)
-    {
+    protected static function editHostsInstructions(array $options, OutputInterface $output) {
         $output->writeln('<comment>NOTE: You will need to add the following to your hosts file!</comment>');
         $comment = $options['vagrantfile']['vm']['network']['private_network'] .
             ' ' . $options['magestead']['apps']['mba_12345']['base_url'];

src/Magestead/Helper/Config.php

Braces +4 added lines, -8 removed lines

@@ -13,8 +13,7 @@ 
      * Config constructor.
      * @param OutputInterface $output
      */
-    public function __construct(OutputInterface $output)
-    {
+    public function __construct(OutputInterface $output) {
         $this->_projectPath = getcwd();
         $this->_config = $this->getConfigFile($output);
     }
@@ -23,8 +22,7 @@ 
      * @param $name
      * @return mixed
      */
-    function __get($name)
-    {
+    function __get($name) {
         return $this->_config['magestead']['apps']['mba_12345'][$name];
     }
 
@@ -32,8 +30,7 @@ 
      * @param OutputInterface $output
      * @return bool|mixed
      */
-    protected function getConfigFile(OutputInterface $output)
-    {
+    protected function getConfigFile(OutputInterface $output) {
         $config = new Parser();
         try {
             return $config->parse($this->readConfigFile());
@@ -48,8 +45,7 @@ 
      * @return string
      * @throws MissingConfigFileException
      */
-    protected function readConfigFile()
-    {
+    protected function readConfigFile() {
         if (!file_exists($this->_projectPath . '/magestead.yaml')) {
             throw new MissingConfigFileException('No config file was found, are you in the project root?');
         }

src/Magestead/Helper/Options.php

Braces +13 added lines, -26 removed lines

@@ -34,8 +34,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    public function __construct($helper, InputInterface $input, OutputInterface $output)
-    {
+    public function __construct($helper, InputInterface $input, OutputInterface $output) {
         $this->setVagrantSettings($helper, $input, $output);
 
         $this->setServerConfig($helper, $input, $output);
@@ -50,8 +49,7 @@ 
     /**
      * @return array
      */
-    public function getAllOptions()
-    {
+    public function getAllOptions() {
         return [
           'app' => $this->_app,
           'server' => $this->_server,
@@ -75,8 +73,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setVagrantSettings($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setVagrantSettings($helper, InputInterface $input, OutputInterface $output) {
         $output->writeln('<comment>Lets configure your project\'s VM</comment>');
 
         $ipQuestion = new Question("Configure the IP for your VM (192.168.47.47): ", '192.168.47.47');
@@ -94,8 +91,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setApplicationSettings($helper, InputInterface $input, OutputInterface $output) {
         $output->writeln('<comment>Lets configure your project\'s application</comment>');
         if ($this->_phpVer !== '70') {
             $appQuestion = new ChoiceQuestion(
@@ -122,8 +118,7 @@ 
      * @param OutputInterface $output
      * @return bool
      */
-    protected function setMagento2Settings($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setMagento2Settings($helper, InputInterface $input, OutputInterface $output) {
         if ($this->_app === 'magento2') {
             return $this->verifyAuth($helper, $input, $output);
         }
@@ -136,8 +131,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setVersionControlSettings($helper, InputInterface $input, OutputInterface $output) {
         $versionControl = new ConfirmationQuestion("Would you like to add your project to GIT? (no/yes) ", false);
         $versioning = $helper->ask($input, $output, $versionControl);
         if ($versioning) {
@@ -151,8 +145,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function askForAuth($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function askForAuth($helper, InputInterface $input, OutputInterface $output) {
         $username = new Question("Please enter your Magento username (public key): ", '');
         $this->_m2Username = $helper->ask($input, $output, $username);
 
@@ -166,8 +159,7 @@ 
      * @param OutputInterface $output
      * @return bool
      */
-    protected function verifyAuth($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function verifyAuth($helper, InputInterface $input, OutputInterface $output) {
         $authFile = $_SERVER['HOME'] . "/.composer/auth.json";
 
         $authObj = [];
@@ -194,8 +186,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setPhp($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setPhp($helper, InputInterface $input, OutputInterface $output) {
         $output->writeln('<info>Keep in mind PHP7 is only available for Magento 2</info>');
         $phpVerQuestion = new ChoiceQuestion(
             "Which version of PHP should be installed?",
@@ -209,8 +200,7 @@ 
     /**
      * Set box name from concat user options
      */
-    protected function setVagrantBox()
-    {
+    protected function setVagrantBox() {
         $this->_box = self::BOX_PREFIX . $this->_os . "-$this->_server-php$this->_phpVer";
     }
 
@@ -219,8 +209,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setServerConfig($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setServerConfig($helper, InputInterface $input, OutputInterface $output) {
         $output->writeln('<comment>Lets configure your server</comment>');
         $this->setOperatingSystem($helper, $input, $output);
         $this->setWebServer($helper, $input, $output);
@@ -232,8 +221,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setWebServer($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setWebServer($helper, InputInterface $input, OutputInterface $output) {
         $serverQuestion = new ChoiceQuestion(
             "Which webserver would you like?",
             ['NGINX', 'Apache'],
@@ -247,8 +235,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output)
-    {
+    protected function setOperatingSystem($helper, InputInterface $input, OutputInterface $output) {
         $osQuestion = new ChoiceQuestion(
             "Which OS would you like to install?",
             ['CentOS 6.5', 'Ubuntu 14'],

src/Magestead/Installers/Magento2Project.php

Braces +13 added lines, -26 removed lines

@@ -20,8 +20,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    public function __construct(array $options, array $config, $projectPath, OutputInterface $output)
-    {
+    public function __construct(array $options, array $config, $projectPath, OutputInterface $output) {
         $this->composerInstall($projectPath, $output);
         $this->installMagento($config, $projectPath, $output);
         $this->finaliseSetup($options, $projectPath, $output);
@@ -34,8 +33,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function composerInstall($projectPath, OutputInterface $output)
-    {
+    protected function composerInstall($projectPath, OutputInterface $output) {
         $output->writeln('<info>Installing Magento 2 with Composer</info>');
         $command = 'composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition public';
         new ProcessCommand($command, $projectPath, $output);
@@ -49,8 +47,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function addPhpSpecPackage($projectPath, OutputInterface $output)
-    {
+    protected function addPhpSpecPackage($projectPath, OutputInterface $output) {
         $output->writeln('<comment>Installing PHPSpec</comment>');
         $command = 'cd '.$projectPath.'/public; composer require phpspec/phpspec --dev;';
         new ProcessCommand($command, $projectPath, $output);
@@ -62,8 +59,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function addBehatPackage($projectPath, OutputInterface $output)
-    {
+    protected function addBehatPackage($projectPath, OutputInterface $output) {
         $output->writeln('<comment>Installing Behat</comment>');
         $command = 'cd '.$projectPath.'/public; composer require behat/behat --dev;';
         new ProcessCommand($command, $projectPath, $output);
@@ -76,8 +72,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function installMagento(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function installMagento(array $options, $projectPath, OutputInterface $output) {
         $this->setPermissions($projectPath, $output);
 
         $output->writeln('<info>Installing Magento 2 Software</info>');
@@ -110,8 +105,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function setPermissions($projectPath, OutputInterface $output)
-    {
+    protected function setPermissions($projectPath, OutputInterface $output) {
         $output->writeln('<info>Setting Permissions</info>');
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo find . -type d -exec chmod 700 {} \;\'';
         new ProcessCommand($command, $projectPath, $output);
@@ -130,8 +124,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function configureRedis($projectPath, OutputInterface $output)
-    {
+    protected function configureRedis($projectPath, OutputInterface $output) {
         $output->writeln('<comment>Configuring Redis Cache</comment>');
         $file = "$projectPath/public/app/etc/env.php";
         $env = include $file;
@@ -183,8 +176,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/public; bin/magento indexer:reindex; \'';
         $output->writeln('<comment>Reindexing Tables</comment>');
         new ProcessCommand($command, $projectPath, $output);
@@ -201,8 +193,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected function showCredentials(array $options, OutputInterface $output)
-    {
+    protected function showCredentials(array $options, OutputInterface $output) {
         $output->writeln('<info>SUCCESS: Magestead has finished installing Magento 2!</info>');
         $table = new Table($output);
         $table
@@ -221,8 +212,7 @@ 
      * @param OutputInterface $output
      * @return VersionControl
      */
-    protected function processVcs(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function processVcs(array $options, $projectPath, OutputInterface $output) {
         if (!empty($options['repo_url'])) {
             copy($projectPath . "/puphpet/magestead/magento2/stubs/gitignore.tmp", $projectPath . "/.gitignore");
             return new VersionControl($options['repo_url'], $projectPath, $output);
@@ -232,8 +222,7 @@ 
     /**
      * @param $projectPath
      */
-    protected function setComposerBinDir($projectPath)
-    {
+    protected function setComposerBinDir($projectPath) {
         $file = "$projectPath/public/composer.json";
         $composer = json_decode(file_get_contents($file), true);
         $composer['config']['bin-dir'] = 'bin';
@@ -244,8 +233,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function setPhpSpecPermissions($projectPath, OutputInterface $output)
-    {
+    protected function setPhpSpecPermissions($projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/phpspec; bin/phpspec run\'';
         new ProcessCommand($command, $projectPath, $output);
     }
@@ -254,8 +242,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function setBehatPermissions($projectPath, OutputInterface $output)
-    {
+    protected function setBehatPermissions($projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/public; sudo chmod 755 bin/behat; bin/behat --init\'';
         new ProcessCommand($command, $projectPath, $output);
     }

src/Magestead/Installers/Project.php

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
      * @param $output
      * @return Magento2Project|MagentoProject
      */
-    public static function create(array $options, array $config, $projectPath, $output)
-    {
+    public static function create(array $options, array $config, $projectPath, $output) {
         switch ($options['app']) {
             case "magento":
                 return new MagentoProject($options, $config, $projectPath, $output);

src/Magestead/Installers/MagentoProject.php

Braces +14 added lines, -28 removed lines

@@ -24,8 +24,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    public function __construct(array $options, array $config, $projectPath, OutputInterface $output)
-    {
+    public function __construct(array $options, array $config, $projectPath, OutputInterface $output) {
         $output->writeln('<info>Installing Magento with Composer</info>');
         $this->composerInstall($projectPath, $output);
 
@@ -46,8 +45,7 @@ 
      * @param $projectPath
      * @param $output
      */
-    protected function installMagento(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function installMagento(array $options, $projectPath, OutputInterface $output) {
         $locale = $options['magestead']['apps']['mba_12345']['locale'];
         $db_name = $options['magestead']['apps']['mba_12345']['db_name'];
         $base_url = $options['magestead']['apps']['mba_12345']['base_url'];
@@ -86,8 +84,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function setPermissions($projectPath, OutputInterface $output)
-    {
+    protected function setPermissions($projectPath, OutputInterface $output) {
 //        $command = 'vagrant ssh -c \'cd /var/www/public; sudo find . -type f -exec chmod 400 {} \;\'';
 //        $output->writeln('<comment>Setting Files Permissions</comment>');
 //        new ProcessCommand($command, $projectPath, $output);
@@ -125,8 +122,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function installMagerun($projectPath, OutputInterface $output)
-    {
+    protected function installMagerun($projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/bin; sudo wget https://files.magerun.net/n98-magerun.phar;\'';
         $output->writeln('<info>Downloading Magerun</info>');
         new ProcessCommand($command, $projectPath, $output);
@@ -141,8 +137,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function finaliseSetup(array $options, $projectPath, OutputInterface $output) {
         $command = 'vagrant ssh -c \'cd /var/www/public; ../bin/n98-magerun.phar index:reindex:all;\'';
         $output->writeln('<comment>Reindexing Tables</comment>');
         new ProcessCommand($command, $projectPath, $output);
@@ -166,8 +161,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected function showCredentials(array $options, OutputInterface $output)
-    {
+    protected function showCredentials(array $options, OutputInterface $output) {
         $output->writeln('<info>SUCCESS: Magestead has finished installing Magento!</info>');
         $table = new Table($output);
         $table
@@ -186,8 +180,7 @@ 
      * @param OutputInterface $output
      * @return VersionControl
      */
-    protected function processVcs(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function processVcs(array $options, $projectPath, OutputInterface $output) {
         if (!empty($options['repo_url'])) {
             copy($projectPath . "/puphpet/magestead/magento/stubs/gitignore.tmp", $projectPath . "/.gitignore");
             return new VersionControl($options['repo_url'], $projectPath, $output);
@@ -198,8 +191,7 @@ 
      * @param $projectPath
      * @param OutputInterface $output
      */
-    protected function composerInstall($projectPath, OutputInterface $output)
-    {
+    protected function composerInstall($projectPath, OutputInterface $output) {
         copy($projectPath . "/puphpet/magestead/magento/stubs/composer.tmp", $projectPath . "/composer.json");
         new ProcessCommand('composer install', $projectPath, $output);
     }
@@ -207,8 +199,7 @@ 
     /**
      * @param $projectPath
      */
-    protected function configureRedis($projectPath)
-    {
+    protected function configureRedis($projectPath) {
         $this->updateConfigXml($projectPath);
         $this->activateModule($projectPath);
     }
@@ -216,8 +207,7 @@ 
     /**
      * @param $projectPath
      */
-    protected function updateConfigXml($projectPath)
-    {
+    protected function updateConfigXml($projectPath) {
         $localFile = '/public/app/etc/local.xml';
         $localXml = file_get_contents($projectPath . $localFile);
 
@@ -247,8 +237,7 @@ 
     /**
      * @param $projectPath
      */
-    protected function activateModule($projectPath)
-    {
+    protected function activateModule($projectPath) {
         $moduleFile = '/public/app/etc/modules/Cm_RedisSession.xml';
         $moduleXml = file_get_contents($projectPath . $moduleFile);
         $config = new \SimpleXMLElement($moduleXml);
@@ -262,8 +251,7 @@ 
      * @param OutputInterface $output
      * @return ProcessCommand
      */
-    protected function configureTestSuites(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function configureTestSuites(array $options, $projectPath, OutputInterface $output) {
         $output->writeln('<info>Configuring PHPSpec & Behat Suites</info>');
         $progress = new ProgressBar($output, 2);
 
@@ -285,8 +273,7 @@ 
      * @param OutputInterface $output
      * @return bool|mixed
      */
-    protected function getBehatConfig(array $options, $projectPath, OutputInterface $output)
-    {
+    protected function getBehatConfig(array $options, $projectPath, OutputInterface $output) {
         $yaml = new Parser();
         try {
             $behat = $yaml->parse(file_get_contents($projectPath . "/puphpet/magestead/magento/stubs/behat.yml"));
@@ -305,8 +292,7 @@ 
      * @param $behat
      * @param $progress
      */
-    protected function saveBehatConfig($projectPath, OutputInterface $output, $behat, $progress)
-    {
+    protected function saveBehatConfig($projectPath, OutputInterface $output, $behat, $progress) {
         $dumper = new Dumper();
         $yaml = $dumper->dump($behat, 6);
         try {

src/Magestead/Command/SetupCommand.php

Braces +7 added lines, -14 removed lines

@@ -20,8 +20,7 @@ 
     protected $_projectPath;
     protected $_magesteadConfig;
 
-    protected function configure()
-    {
+    protected function configure() {
         $this->_basePath = dirname( __FILE__ ) . '/../../../';
         $this->_projectPath = getcwd();
 
@@ -34,8 +33,7 @@ 
      * @param OutputInterface $output
      * @return \Magestead\Installers\Magento2Project|\Magestead\Installers\MagentoProject
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
+    protected function execute(InputInterface $input, OutputInterface $output) {
         $helper = $this->getHelper('question');
         $options = new Options($helper, $input, $output);
 
@@ -52,8 +50,7 @@ 
      * @param $target
      * @param OutputInterface $output
      */
-    protected function copyConfigFiles($source, $target, OutputInterface $output)
-    {
+    protected function copyConfigFiles($source, $target, OutputInterface $output) {
         try {
             $progress = new ProgressBar($output, 3720);
             $progress->start();
@@ -80,8 +77,7 @@ 
      * @param array $options
      * @param OutputInterface $output
      */
-    protected function configureProject(array $options, OutputInterface $output)
-    {
+    protected function configureProject(array $options, OutputInterface $output) {
         $this->_magesteadConfig = $this->getConfigFile($output);
 
         $this->_magesteadConfig['vagrantfile']['vm']['box'] = $options['box'];
@@ -103,8 +99,7 @@ 
      * @param OutputInterface $output
      * @return mixed
      */
-    protected function getConfigFile(OutputInterface $output)
-    {
+    protected function getConfigFile(OutputInterface $output) {
         $yaml = new Parser();
         try {
             return $yaml->parse(file_get_contents($this->_projectPath . '/magestead.yaml'));
@@ -118,8 +113,7 @@ 
      * @param array $config
      * @param OutputInterface $output
      */
-    protected function saveConfigFile(array $config, OutputInterface $output)
-    {
+    protected function saveConfigFile(array $config, OutputInterface $output) {
         $dumper = new Dumper();
         $yaml = $dumper->dump($config, 6);
 
@@ -134,8 +128,7 @@ 
      * @param OutputInterface $output
      * @param $options
      */
-    protected function setupProject(OutputInterface $output, $options)
-    {
+    protected function setupProject(OutputInterface $output, $options) {
         $output->writeln('<info>Setting up project structure</info>');
         $provisionFolder = $this->_basePath . "provision";
         $this->copyConfigFiles($provisionFolder, $this->_projectPath, $output);