bogdananton / Selenium-Setup

lib/Config/ConfigFactory.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
         $fileSystem = new FileSystem();
         
         if (!$configFilePath) {
-            $configFilePath = SeleniumSetup::$APP_CONF_PATH . DIRECTORY_SEPARATOR . Config::DEFAULT_CONFIGURATION_FILENAME;
+            $configFilePath = SeleniumSetup::$APP_CONF_PATH.DIRECTORY_SEPARATOR.Config::DEFAULT_CONFIGURATION_FILENAME;
         }
 
         $configContents = $fileSystem->readFile($configFilePath);

lib/Locker/Locker.php

Spacing +3 added lines, -3 removed lines

@@ -19,11 +19,11 @@ 
 
     public function openLockFile()
     {
-        if (!$this->fileSystem->isFile(SeleniumSetup::$APP_ROOT_PATH . DIRECTORY_SEPARATOR . SeleniumSetup::DEFAULT_LOCK_FILENAME)) {
+        if (!$this->fileSystem->isFile(SeleniumSetup::$APP_ROOT_PATH.DIRECTORY_SEPARATOR.SeleniumSetup::DEFAULT_LOCK_FILENAME)) {
             return false;
         }
 
-        $contents = $this->fileSystem->readFile(SeleniumSetup::$APP_ROOT_PATH . DIRECTORY_SEPARATOR . SeleniumSetup::DEFAULT_LOCK_FILENAME);
+        $contents = $this->fileSystem->readFile(SeleniumSetup::$APP_ROOT_PATH.DIRECTORY_SEPARATOR.SeleniumSetup::DEFAULT_LOCK_FILENAME);
         $lockerRaw = json_decode($contents);
         foreach ($lockerRaw as $serverObj) {
             $this->addServer(ServerItemFactory::createFromObj($serverObj));
@@ -34,7 +34,7 @@ 
     public function writeToLockFile()
     {   
         $this->fileSystem->writeToFile(
-            SeleniumSetup::$APP_ROOT_PATH . DIRECTORY_SEPARATOR . SeleniumSetup::DEFAULT_LOCK_FILENAME,
+            SeleniumSetup::$APP_ROOT_PATH.DIRECTORY_SEPARATOR.SeleniumSetup::DEFAULT_LOCK_FILENAME,
             $this->toJson()
         );
         

lib/Environment.php

Spacing +17 added lines, -17 removed lines

@@ -54,29 +54,29 @@ 
                 $writeln[] = '<error>[ ] Your Java version needs to be >= 1.6</error>';
                 $canInstall = false;
             } else {
-                $writeln[] = '<info>[x] Your Java version ' . $javaVersion . ' seems up to date.</info>';
+                $writeln[] = '<info>[x] Your Java version '.$javaVersion.' seems up to date.</info>';
             }
         }
 
         if ($this->isPHPVersionDeprecated()) {
-            $writeln[] = '<error>[ ] Your PHP version ' . $this->getPHPVersion() . ' should be >= 5.3</error>';
+            $writeln[] = '<error>[ ] Your PHP version '.$this->getPHPVersion().' should be >= 5.3</error>';
             $canInstall = false;
         } else {
-            $writeln[] = '<info>[x] Your PHP version is ' . $this->getPHPVersion() . '</info>';
+            $writeln[] = '<info>[x] Your PHP version is '.$this->getPHPVersion().'</info>';
         }
 
         if (!$this->hasPHPCurlExtInstalled()) {
             $writeln[] = '<error>[ ] cURL extension for PHP is missing.</error>';
             $canInstall = false;
         } else {
-            $writeln[] = '<info>[x] cURL ' . $this->getPHPCurlExtVersion() . ' extension is installed.</info>';
+            $writeln[] = '<info>[x] cURL '.$this->getPHPCurlExtVersion().' extension is installed.</info>';
         }
 
         if (!$this->hasPHPOpenSSLExtInstalled()) {
             $writeln[] = '<error>[ ] OpenSSL extension for PHP is missing.</error>';
             $canInstall = false;
         } else {
-            $writeln[] = '<info>[x] ' . $this->getPHPOpenSSLExtVersion() . ' extension is installed.</info>';
+            $writeln[] = '<info>[x] '.$this->getPHPOpenSSLExtVersion().' extension is installed.</info>';
         }
 
         $this->output->writeln($writeln);
@@ -148,7 +148,7 @@ 
             $output->write($line);
         });
         
-        return !(preg_match('/' . $lookForNegative . '/is', $output->fetch()));
+        return !(preg_match('/'.$lookForNegative.'/is', $output->fetch()));
     }
 
     public function getJavaVersion()
@@ -237,7 +237,7 @@ 
     public function setEnvVar($varName, $varValue = '')
     {
         if ($varValue != '') {
-            putenv($varName . '=' . $varValue);
+            putenv($varName.'='.$varValue);
         } else {
             putenv($varName);
         }
@@ -251,14 +251,14 @@ 
             $separator = ':';
         }
 
-        putenv('PATH=' . getenv('PATH') . $separator . $path);
+        putenv('PATH='.getenv('PATH').$separator.$path);
         $this->output->writeln(sprintf('Added %s to global path.', $path));
     }
 
     public function download($from, $to)
     {
         $client = new Client();
-        $client->setDefaultOption('verify', SeleniumSetup::$APP_ROOT_PATH . DIRECTORY_SEPARATOR . SeleniumSetup::SSL_CERT_FILENAME);
+        $client->setDefaultOption('verify', SeleniumSetup::$APP_ROOT_PATH.DIRECTORY_SEPARATOR.SeleniumSetup::SSL_CERT_FILENAME);
         $request = $client->createRequest('GET', $from, ['save_to'=> $to]);
 
         $computeRemainingSize = function(ProgressEvent $e) {
@@ -405,14 +405,14 @@ 
         // @todo Refactor this in 5.0; split binaries and drivers; Add Opera.
         // @see https://github.com/bogdananton/Selenium-Setup/issues/12
         $cmdExtra = '';
-        if ($binary = $this->config->getBinary('chromedriver.' . $this->getOsName() . '.' . $this->getOsType())) {
-            $cmdExtra .= sprintf(' -Dwebdriver.chrome.driver=%s', $this->config->getBuildPath() . DIRECTORY_SEPARATOR . $binary->getBinName());
+        if ($binary = $this->config->getBinary('chromedriver.'.$this->getOsName().'.'.$this->getOsType())) {
+            $cmdExtra .= sprintf(' -Dwebdriver.chrome.driver=%s', $this->config->getBuildPath().DIRECTORY_SEPARATOR.$binary->getBinName());
         }
-        if ($binary = $this->config->getBinary('iedriver.' . $this->getOsName() . '.' . $this->getOsType())) {
-            $cmdExtra .= sprintf(' -Dwebdriver.ie.driver=%s', $this->config->getBuildPath() . DIRECTORY_SEPARATOR . $binary->getBinName());
+        if ($binary = $this->config->getBinary('iedriver.'.$this->getOsName().'.'.$this->getOsType())) {
+            $cmdExtra .= sprintf(' -Dwebdriver.ie.driver=%s', $this->config->getBuildPath().DIRECTORY_SEPARATOR.$binary->getBinName());
         }
-        if ($binary = $this->config->getBinary('phantomjs.' . $this->getOsName() . '.' . $this->getOsType())) {
-            $cmdExtra .= sprintf(' -Dphantomjs.binary.path=%s', $this->config->getBuildPath() . DIRECTORY_SEPARATOR . $binary->getBinName());
+        if ($binary = $this->config->getBinary('phantomjs.'.$this->getOsName().'.'.$this->getOsType())) {
+            $cmdExtra .= sprintf(' -Dphantomjs.binary.path=%s', $this->config->getBuildPath().DIRECTORY_SEPARATOR.$binary->getBinName());
         }
         
         if ($this->isWindows()) {
@@ -423,11 +423,11 @@ 
         }
 
         $cmd = vsprintf($cmd, [
-            'binary' => $this->config->getBuildPath() . DIRECTORY_SEPARATOR . $this->config->getBinary('selenium')->getBinName(),
+            'binary' => $this->config->getBuildPath().DIRECTORY_SEPARATOR.$this->config->getBinary('selenium')->getBinName(),
             'port' => $this->config->getPort(),
             'proxyHost' => $this->config->getProxyHost(),
             'proxyPort' => $this->config->getProxyPort(),
-            'log' => $this->config->getLogsPath() . DIRECTORY_SEPARATOR . 'selenium.log',
+            'log' => $this->config->getLogsPath().DIRECTORY_SEPARATOR.'selenium.log',
             'cmdExtra' => $cmdExtra
         ]);
 

lib/Controller/StartServer.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         $configFilePath = null;
 
         if ($input->getArgument('name')) {
-            $configFilePath = SeleniumSetup::$APP_CONF_PATH . DIRECTORY_SEPARATOR . $input->getArgument('name') . '.json';
+            $configFilePath = SeleniumSetup::$APP_CONF_PATH.DIRECTORY_SEPARATOR.$input->getArgument('name').'.json';
         }
 
         if ($input->getOption('config')) { 

lib/Service/RegisterServerService.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 
     protected function getInstanceConfigFilename($name)
     {
-        return dirname($this->config->getFilePath()) . DIRECTORY_SEPARATOR . $name . '.json';
+        return dirname($this->config->getFilePath()).DIRECTORY_SEPARATOR.$name.'.json';
     }
 
     /**
@@ -120,6 +120,6 @@ 
     }
 
     protected function log($message, $value = null, $type = self::LOG_TYPE_INFO) {
-        $this->output->writeln(sprintf('<' . $type . '>' . $message . '</' . $type . '>', $value));
+        $this->output->writeln(sprintf('<'.$type.'>'.$message.'</'.$type.'>', $value));
     }
 }
\ No newline at end of file

lib/Service/StartServerService.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
                 continue;
             }
 
-            $binaryPath = $this->config->getBuildPath() . DIRECTORY_SEPARATOR . $binary->getBinName();
+            $binaryPath = $this->config->getBuildPath().DIRECTORY_SEPARATOR.$binary->getBinName();
 
             if (!$this->fileSystem->isFile($binaryPath)) {
                 $this->output->writeln(
@@ -42,7 +42,7 @@ 
                 );
                 
                 // Download.
-                $downloadTo = $this->config->getBuildPath() . DIRECTORY_SEPARATOR . pathinfo($binary->getDownloadUrl(), PATHINFO_BASENAME);
+                $downloadTo = $this->config->getBuildPath().DIRECTORY_SEPARATOR.pathinfo($binary->getDownloadUrl(), PATHINFO_BASENAME);
                 $download = $this->env->download($binary->getDownloadUrl(), $downloadTo);
                 $this->output->writeln($download);
 
@@ -58,11 +58,11 @@ 
                         $zip->close();
                     }
                 } else {
-                    $this->fileSystem->rename($downloadTo, $this->config->getBuildPath() . DIRECTORY_SEPARATOR . $binary->getBinName());
+                    $this->fileSystem->rename($downloadTo, $this->config->getBuildPath().DIRECTORY_SEPARATOR.$binary->getBinName());
                 }
 
                 // Make executable.
-                $this->env->makeExecutable($this->config->getBuildPath() . DIRECTORY_SEPARATOR . $binary->getBinName());
+                $this->env->makeExecutable($this->config->getBuildPath().DIRECTORY_SEPARATOR.$binary->getBinName());
             } else {
                 $this->output->writeln(
                     sprintf('Skipping %s %s. Binary already exists.', $binary->getLabel(), $binary->getVersion())
@@ -88,13 +88,13 @@ 
         
         // Warn if Chrome or Firefox binaries are not available.
         if ($chromeVersion = $this->env->getChromeVersion()) {
-            $this->output->writeln('Chrome binary found, v.' . $chromeVersion);
+            $this->output->writeln('Chrome binary found, v.'.$chromeVersion);
         } else {
             $this->output->writeln('<info>WARNING: Chrome binary not found.</info>');
         }
 
         if ($firefoxVersion = $this->env->getFirefoxVersion()) {
-            $this->output->writeln('Firefox binary found, v.' . $firefoxVersion);
+            $this->output->writeln('Firefox binary found, v.'.$firefoxVersion);
         } else {
             $this->output->writeln('<info>WARNING: Firefox binary not found.</info>');
         }

lib/SeleniumSetup.php

Spacing +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
     
     public function __construct()
     {
-        self::$APP_ROOT_PATH = realpath(dirname(__FILE__) . '/../');
-        self::$APP_CONF_PATH = realpath(dirname(__FILE__) . '/../config/');
+        self::$APP_ROOT_PATH = realpath(dirname(__FILE__).'/../');
+        self::$APP_CONF_PATH = realpath(dirname(__FILE__).'/../config/');
         self::$APP_PROCESS_ENV = array_merge($_SERVER, $_ENV);
     }