Merge pull request #12 from usamamuneerchaudhary/master

WordPress Installation Issue on Windows & Removed Vertical Scrollbar from the landing page

Author: azeemhassni

src/WPCli.php

@@ -32,7 +32,7 @@ class WPCli
      */
     public function __construct(InputInterface $input, OutputInterface $output)
     {
-        $this->input  = $input;
+        $this->input = $input;
         $this->output = $output;
 
         // try from local vendor/bin
@@ -43,6 +43,9 @@ public function __construct(InputInterface $input, OutputInterface $output)
             $this->wp = dirname(dirname(dirname(__DIR__))) . '/bin/wp';
         }
 
+        // make it cross-platform
+        $this->wp = str_replace("/", DIRECTORY_SEPARATOR, $this->wp);
+
     }
 
     /**
@@ -53,10 +56,10 @@ public function __construct(InputInterface $input, OutputInterface $output)
     public function config($args = [])
     {
         $args = $this->parseArgs([
-            'dbname'   => '',
-            'dbhost'   => '',
-            'dbuser'   => '',
-            'dbpass'   => '',
+            'dbname' => '',
+            'dbhost' => '',
+            'dbuser' => '',
+            'dbpass' => '',
             'dbprefix' => 'wp_',
         ], $args);
 
@@ -72,7 +75,7 @@ public function parseArgs(array $defaults, array $args)
     {
         foreach ($args as $key => $value) {
             if (!empty($value)) {
-                $defaults[ $key ] = $value;
+                $defaults[$key] = $value;
             }
         }
 
@@ -88,21 +91,25 @@ public function parseArgs(array $defaults, array $args)
      */
     public function execute($command, $args = [])
     {
-        $command = "$this->wp $command ";
+        $command = sprintf('"%s" %s', $this->wp, $command);
+
         foreach ($args as $arg => $value) {
             if (substr($arg, 0, strlen('prompt=')) == 'prompt=') {
-                $command .= "--$arg ";
+                $command .= " --$arg ";
                 continue;
             }
 
-            $command .= "--$arg='$value' ";
+            $command .= " --$arg=\"$value\"";
         }
 
         $process = new Process($command);
         if ('\\' !== DIRECTORY_SEPARATOR && file_exists('/dev/tty') && is_readable('/dev/tty')) {
             $process->setTty(true);
         }
-        $process->run();
+
+        $process->run(function ($type, $line) {
+            $this->output->writeln($line);
+        });
 
         return $process;
     }
@@ -116,13 +123,13 @@ public function execute($command, $args = [])
     public function install($args)
     {
         $args = $this->parseArgs([
-            'url'            => 'localhost/' . $this->input->getArgument('name'),
-            'title'          => 'Just another WordPress site',
-            'admin_user'     => 'admin',
+            'url' => 'localhost/' . $this->input->getArgument('name'),
+            'title' => 'Just another WordPress site',
+            'admin_user' => 'admin',
             'admin_password' => null,
-            'admin_email'    => '',
-            'skip-email'     => false,
-            'path'           => '',
+            'admin_email' => '',
+            'skip-email' => false,
+            'path' => '',
         ], $args);
 
         return $this->execute('core install', $args);

src/WPInstaller.php

@@ -59,11 +59,12 @@ public function __construct(
         InputInterface $input,
         OutputInterface $output,
         WPCli $WPCli
-    ) {
-        $this->config  = $config;
-        $this->input   = $input;
-        $this->output  = $output;
-        $this->WPCli   = $WPCli;
+    )
+    {
+        $this->config = $config;
+        $this->input = $input;
+        $this->output = $output;
+        $this->WPCli = $WPCli;
         $this->command = $command;
     }
 
@@ -109,22 +110,22 @@ public function pathToWordPress()
     protected function run()
     {
         $args = [
-            'url'         => $this->input->getOption('url'),
-            'title'       => $this->input->getOption('title'),
-            'admin_user'  => $this->config->get('wp_username'),
+            'url' => $this->input->getOption('url'),
+            'title' => $this->input->getOption('title'),
+            'admin_user' => $this->config->get('wp_username'),
             'admin_email' => $this->config->get('email'),
-            'skip-email'  => true,
-            'path'        => $this->input->getArgument('name'),
+            'skip-email' => true,
+            'path' => realpath($this->input->getArgument('name')),
         ];
 
         $this->output->writeln("<comment>Installing WordPress, you'll be asked for admin password which is optional if not provided we'll generate one for you.<comment>");
 
         // ask for admin password and feed it to wp-cli
-        $helper   = $this->command->getHelper('question');
+        $helper = $this->command->getHelper('question');
         $question = new Question('<info>Please enter new password for WordPress admin panel : </info>', null);
         $question->setHidden(true);
         $question->setHiddenFallback(false);
-        $args[ 'admin_password' ] = $helper->ask($this->input, $this->output, $question);
+        $args['admin_password'] = $helper->ask($this->input, $this->output, $question);
 
         $this->WPCli->install($args);
 
@@ -139,11 +140,11 @@ protected function run()
     protected function configure()
     {
         $this->WPCli->config([
-            'dbname'   => $this->input->getOption('db') ?: $this->input->getArgument('name'),
-            'dbuser'   => $this->config->get('username'),
-            'dbpass'   => $this->config->get('password'),
-            'dbhost'   => $this->config->get('host'),
-            'path'     => $this->input->getArgument('name'),
+            'dbname' => $this->input->getOption('db') ?: $this->input->getArgument('name'),
+            'dbuser' => $this->config->get('username'),
+            'dbpass' => $this->config->get('password'),
+            'dbhost' => $this->config->get('host'),
+            'path' => realpath($this->input->getArgument('name')),
             'dbprefix' => $this->input->getOption('prefix') ?: $this->input->getArgument('name') . '_',
         ]);
 
@@ -178,7 +179,7 @@ protected function createDatabase()
      */
     protected function connect()
     {
-        $host     = $this->config->get('host');
+        $host = $this->config->get('host');
         $username = $this->config->get('username');
         $password = $this->config->get('password');
 

theme/views/includes/header.twig

@@ -23,7 +23,6 @@
                 color: #636b6f;
                 font-family: 'Raleway', sans-serif;
                 font-weight: 100;
-                height: 100vh;
                 margin: 0;
                 margin-top:8%;
             }