Codeception / Codeception

src/Codeception/Command/Run.php

Spacing +8 added lines, -8 removed lines

@@ -121,8 +121,8 @@ 
         $this->setDefinition([
             new InputArgument('suite', InputArgument::OPTIONAL, 'suite to be tested'),
             new InputArgument('test', InputArgument::OPTIONAL, 'test to be run'),
-            new InputOption('override', 'o', InputOption::VALUE_IS_ARRAY  | InputOption::VALUE_REQUIRED, 'Override config values'),
-            new InputOption('ext', 'e', InputOption::VALUE_IS_ARRAY  | InputOption::VALUE_REQUIRED, 'Run with extension enabled'),
+            new InputOption('override', 'o', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Override config values'),
+            new InputOption('ext', 'e', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Run with extension enabled'),
             new InputOption('report', '', InputOption::VALUE_NONE, 'Show output in compact style'),
             new InputOption('html', '', InputOption::VALUE_OPTIONAL, 'Generate html with results', 'report.html'),
             new InputOption('xml', '', InputOption::VALUE_OPTIONAL, 'Generate JUnit XML Log', 'report.xml'),
@@ -241,7 +241,7 @@ 
         }
         if (!$this->options['silent']) {
             $this->output->writeln(
-                Codecept::versionString() . "\nPowered by " . \PHPUnit\Runner\Version::getVersionString()
+                Codecept::versionString()."\nPowered by ".\PHPUnit\Runner\Version::getVersionString()
             );
         }
         if ($this->options['debug']) {
@@ -315,7 +315,7 @@ 
                             );
                         }
 
-                        $testsPath = $include . DIRECTORY_SEPARATOR.  $config['paths']['tests'];
+                        $testsPath = $include.DIRECTORY_SEPARATOR.$config['paths']['tests'];
 
                         try {
                             list(, $suite, $test) = $this->matchTestFromFilename($suite, $testsPath);
@@ -387,7 +387,7 @@ 
         // Workaround when codeception.yml is inside tests directory and tests path is set to "."
         // @see https://github.com/Codeception/Codeception/issues/4432
         if ($config['paths']['tests'] === '.' && !preg_match('~^\.[/\\\]~', $suite)) {
-            $suite = './' . $suite;
+            $suite = './'.$suite;
         }
 
         // running a single test when suite has a configured path
@@ -396,7 +396,7 @@ 
                 if (!isset($suiteConfig['path'])) {
                     continue;
                 }
-                $testsPath = $config['paths']['tests'] . DIRECTORY_SEPARATOR . $suiteConfig['path'];
+                $testsPath = $config['paths']['tests'].DIRECTORY_SEPARATOR.$suiteConfig['path'];
                 if ($suiteConfig['path'] === '.') {
                     $testsPath = $config['paths']['tests'];
                 }
@@ -409,7 +409,7 @@ 
         }
 
         // Run single test without included tests
-        if (! Configuration::isEmpty() && strpos($suite, $config['paths']['tests']) === 0) {
+        if (!Configuration::isEmpty() && strpos($suite, $config['paths']['tests']) === 0) {
             return $this->matchTestFromFilename($suite, $config['paths']['tests']);
         }
     }
@@ -423,7 +423,7 @@ 
     protected function runIncludedSuites($suites, $parent_dir)
     {
         foreach ($suites as $relativePath) {
-            $current_dir = rtrim($parent_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $relativePath;
+            $current_dir = rtrim($parent_dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.$relativePath;
             $config = Configuration::config($current_dir);
             $suites = Configuration::suites();
 

src/Codeception/Command/Console.php

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
             throw new ConfigurationException("Interactive shell can't be started without an actor");
         }
         if (isset($config["namespace"])) {
-            $settings['actor'] = $config["namespace"] .'\\' . $settings['actor'];
+            $settings['actor'] = $config["namespace"].'\\'.$settings['actor'];
         }
         $actor = $settings['actor'];
         $I = new $actor($scenario);
@@ -126,7 +126,7 @@ 
 
             $command = $dialog->ask($input, $output, $question);
             if ($command == 'actions') {
-                $output->writeln("<info>" . implode(' ', $this->actions));
+                $output->writeln("<info>".implode(' ', $this->actions));
                 continue;
             }
             if ($command == 'exit') {
@@ -141,9 +141,9 @@ 
                     codecept_debug($value);
                 }
             } catch (\PHPUnit\Framework\AssertionFailedError $fail) {
-                $output->writeln("<error>fail</error> " . $fail->getMessage());
+                $output->writeln("<error>fail</error> ".$fail->getMessage());
             } catch (\Exception $e) {
-                $output->writeln("<error>error</error> " . $e->getMessage());
+                $output->writeln("<error>error</error> ".$e->getMessage());
             }
         } while (true);
     }

src/Codeception/Lib/GroupManager.php

Spacing +6 added lines, -6 removed lines

@@ -62,10 +62,10 @@ 
             if (is_array($tests)) {
                 foreach ($tests as $test) {
                     $file = str_replace(['/', '\\'], [DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR], $test);
-                    $this->testsInGroups[$group][] = Configuration::projectDir() . $file;
+                    $this->testsInGroups[$group][] = Configuration::projectDir().$file;
                 }
-            } elseif (is_file(Configuration::projectDir() . $tests)) {
-                $handle = @fopen(Configuration::projectDir() . $tests, "r");
+            } elseif (is_file(Configuration::projectDir().$tests)) {
+                $handle = @fopen(Configuration::projectDir().$tests, "r");
                 if ($handle) {
                     while (($test = fgets($handle, 4096)) !== false) {
                         // if the current line is blank then we need to move to the next line
@@ -75,7 +75,7 @@ 
                             continue;
                         }
 
-                        $file = trim(Configuration::projectDir() . $test);
+                        $file = trim(Configuration::projectDir().$test);
                         $file = str_replace(['/', '\\'], [DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR], $file);
                         $this->testsInGroups[$group][] = $file;
                     }
@@ -115,13 +115,13 @@ 
                 if ($filename == $testPattern) {
                     $groups[] = $group;
                 }
-                if (strpos($filename . ':' . $test->getName(false), $testPattern) === 0) {
+                if (strpos($filename.':'.$test->getName(false), $testPattern) === 0) {
                     $groups[] = $group;
                 }
                 if ($test instanceof \PHPUnit\Framework\TestSuite\DataProvider) {
                     $firstTest = $test->testAt(0);
                     if ($firstTest != false && $firstTest instanceof TestInterface) {
-                        if (strpos($filename . ':' . $firstTest->getName(false), $testPattern) === 0) {
+                        if (strpos($filename.':'.$firstTest->getName(false), $testPattern) === 0) {
                             $groups[] = $group;
                         }
                     }

src/Codeception/Command/Clean.php

Spacing +2 added lines, -2 removed lines

@@ -32,13 +32,13 @@
     private function cleanProjectsRecursively(OutputInterface $output, $projectDir)
     {
         $logDir = Configuration::logDir();
-        $output->writeln("<info>Cleaning up output " . $logDir . "...</info>");
+        $output->writeln("<info>Cleaning up output ".$logDir."...</info>");
         FileSystem::doEmptyDir($logDir);
 
         $config = Configuration::config($projectDir);
         $subProjects = $config['include'];
         foreach ($subProjects as $subProject) {
-            $subProjectDir = $projectDir . $subProject;
+            $subProjectDir = $projectDir.$subProject;
             $this->cleanProjectsRecursively($output, $subProjectDir);
         }
     }

src/Codeception/Test/Descriptor.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
             return $testCase->getSignature();
         }
         if ($testCase instanceof \PHPUnit\Framework\TestCase) {
-            return get_class($testCase) . ':' . $testCase->getName(false);
+            return get_class($testCase).':'.$testCase->getName(false);
         }
         return $testCase->toString();
     }
@@ -37,10 +37,10 @@ 
         if (is_callable([$testCase, 'getMetadata'])
             && $example = $testCase->getMetadata()->getCurrent('example')
         ) {
-            $example = ':' . substr(sha1(json_encode($example)), 0, 7);
+            $example = ':'.substr(sha1(json_encode($example)), 0, 7);
         }
 
-        return self::getTestSignature($testCase) . $example;
+        return self::getTestSignature($testCase).$example;
     }
 
     public static function getTestAsString(\PHPUnit\Framework\SelfDescribing $testCase)
@@ -52,7 +52,7 @@ 
             $text = preg_replace('/^test /', '', $text);
             $text = ucfirst(strtolower($text));
             $text = str_replace(['::', 'with data set'], [':', '|'], $text);
-            return ReflectionHelper::getClassShortName($testCase) . ': ' . $text;
+            return ReflectionHelper::getClassShortName($testCase).': '.$text;
         }
 
         return $testCase->toString();
@@ -83,12 +83,12 @@ 
         }
         if ($testCase instanceof Descriptive) {
             $signature = $testCase->getSignature(); // cut everything before ":" from signature
-            return self::getTestFileName($testCase) . ':' . preg_replace('~^(.*?):~', '', $signature);
+            return self::getTestFileName($testCase).':'.preg_replace('~^(.*?):~', '', $signature);
         }
         if ($testCase instanceof \PHPUnit\Framework\TestCase) {
-            return self::getTestFileName($testCase) . ':' . $testCase->getName(false);
+            return self::getTestFileName($testCase).':'.$testCase->getName(false);
         }
-        return self::getTestFileName($testCase) . ':' . $testCase->toString();
+        return self::getTestFileName($testCase).':'.$testCase->toString();
     }
 
     /**

src/Codeception/Module/WebDriver.php

Spacing +34 added lines, -34 removed lines

@@ -469,7 +469,7 @@ 
         if (file_exists($firefox_profile) === false) {
             throw new ModuleConfigException(
                 __CLASS__,
-                "Firefox profile does not exist under given path " . $firefox_profile
+                "Firefox profile does not exist under given path ".$firefox_profile
             );
         }
         // Set firefox profile as capability
@@ -504,9 +504,9 @@ 
         $this->debugWebDriverLogs($test);
         $filename = preg_replace('~\W~', '.', Descriptor::getTestSignatureUnique($test));
         $outputDir = codecept_output_dir();
-        $this->_saveScreenshot($report = $outputDir . mb_strcut($filename, 0, 245, 'utf-8') . '.fail.png');
+        $this->_saveScreenshot($report = $outputDir.mb_strcut($filename, 0, 245, 'utf-8').'.fail.png');
         $test->getMetadata()->addReport('png', $report);
-        $this->_savePageSource($report = $outputDir . mb_strcut($filename, 0, 244, 'utf-8') . '.fail.html');
+        $this->_savePageSource($report = $outputDir.mb_strcut($filename, 0, 244, 'utf-8').'.fail.html');
         $test->getMetadata()->addReport('html', $report);
         $this->debug("Screenshot and page source were saved into '$outputDir' dir");
     }
@@ -535,7 +535,7 @@ 
                     $this->debugSection("Selenium {$logType} Logs", " EMPTY ");
                     continue;
                 }
-                $this->debugSection("Selenium {$logType} Logs", "\n" . $this->formatLogEntries($logEntries));
+                $this->debugSection("Selenium {$logType} Logs", "\n".$this->formatLogEntries($logEntries));
 
                 if ($logType === 'browser' && $this->config['log_js_errors']
                     && ($test instanceof ScenarioDriven)
@@ -544,7 +544,7 @@ 
                 }
             }
         } catch (\Exception $e) {
-            $this->debug('Unable to retrieve Selenium logs : ' . $e->getMessage());
+            $this->debug('Unable to retrieve Selenium logs : '.$e->getMessage());
         }
     }
 
@@ -562,9 +562,9 @@ 
 
         foreach ($logEntries as $logEntry) {
             // Timestamp is in milliseconds, but date() requires seconds.
-            $time = date('H:i:s', $logEntry['timestamp'] / 1000) .
+            $time = date('H:i:s', $logEntry['timestamp'] / 1000).
                 // Append the milliseconds to the end of the time string
-                '.' . ($logEntry['timestamp'] % 1000);
+                '.'.($logEntry['timestamp'] % 1000);
             $formattedLogs .= "{$time} {$logEntry['level']} - {$logEntry['message']}\n";
         }
         return $formattedLogs;
@@ -584,9 +584,9 @@ 
                 && $this->isJSError($logEntry['level'], $logEntry['message'])
             ) {
                 // Timestamp is in milliseconds, but date() requires seconds.
-                $time = date('H:i:s', $logEntry['timestamp'] / 1000) .
+                $time = date('H:i:s', $logEntry['timestamp'] / 1000).
                     // Append the milliseconds to the end of the time string
-                    '.' . ($logEntry['timestamp'] % 1000);
+                    '.'.($logEntry['timestamp'] % 1000);
                 $test->getScenario()->comment("{$time} {$logEntry['level']} - {$logEntry['message']}");
             }
         }
@@ -607,7 +607,7 @@ 
                 ($this->isPhantom() && $logEntryLevel != 'INFO')          // phantomjs logs errors as "WARNING"
                 || $logEntryLevel === 'SEVERE'                            // other browsers log errors as "SEVERE"
             )
-            && strpos($message, 'ERR_PROXY_CONNECTION_FAILED') === false;  // ignore blackhole proxy
+            && strpos($message, 'ERR_PROXY_CONNECTION_FAILED') === false; // ignore blackhole proxy
     }
 
     public function _afterSuite()
@@ -657,13 +657,13 @@ 
         if ($this->config['http_proxy']) {
             $proxyConfig['httpProxy'] = $this->config['http_proxy'];
             if ($this->config['http_proxy_port']) {
-                $proxyConfig['httpProxy'] .= ':' . $this->config['http_proxy_port'];
+                $proxyConfig['httpProxy'] .= ':'.$this->config['http_proxy_port'];
             }
         }
         if ($this->config['ssl_proxy']) {
             $proxyConfig['sslProxy'] = $this->config['ssl_proxy'];
             if ($this->config['ssl_proxy_port']) {
-                $proxyConfig['sslProxy'] .= ':' . $this->config['ssl_proxy_port'];
+                $proxyConfig['sslProxy'] .= ':'.$this->config['ssl_proxy_port'];
             }
         }
         if (!empty($proxyConfig)) {
@@ -697,7 +697,7 @@ 
         try {
             $this->webDriver->takeScreenshot($filename);
         } catch (\Exception $e) {
-            $this->debug('Unable to retrieve screenshot from Selenium : ' . $e->getMessage());
+            $this->debug('Unable to retrieve screenshot from Selenium : '.$e->getMessage());
         }
     }
 
@@ -719,7 +719,7 @@ 
         try {
             file_put_contents($filename, $this->webDriver->getPageSource());
         } catch (\Exception $e) {
-            $this->debug('Unable to retrieve source page from Selenium : ' . $e->getMessage());
+            $this->debug('Unable to retrieve source page from Selenium : '.$e->getMessage());
         }
     }
 
@@ -742,11 +742,11 @@ 
         if (empty($name)) {
             $name = uniqid(date("Y-m-d_H-i-s_"));
         }
-        $debugDir = codecept_log_dir() . 'debug';
+        $debugDir = codecept_log_dir().'debug';
         if (!is_dir($debugDir)) {
             mkdir($debugDir, 0777);
         }
-        $screenName = $debugDir . DIRECTORY_SEPARATOR . $name . '.png';
+        $screenName = $debugDir.DIRECTORY_SEPARATOR.$name.'.png';
         $this->_saveScreenshot($screenName);
         $this->debug("Screenshot saved to $screenName");
     }
@@ -772,7 +772,7 @@ 
     {
         $cookies = $this->filterCookies($this->webDriver->manage()->getCookies(), $params);
         $cookies = array_map(
-            function ($c) {
+            function($c) {
                 return $c['name'];
             },
             $cookies
@@ -785,7 +785,7 @@ 
     {
         $cookies = $this->filterCookies($this->webDriver->manage()->getCookies(), $params);
         $cookies = array_map(
-            function ($c) {
+            function($c) {
                 return $c['name'];
             },
             $cookies
@@ -851,7 +851,7 @@ 
             }
             $cookies = array_filter(
                 $cookies,
-                function ($item) use ($filter, $params) {
+                function($item) use ($filter, $params) {
                     return $item[$filter] == $params[$filter];
                 }
             );
@@ -1125,7 +1125,7 @@ 
 
         $nodes = array_filter(
             $nodes,
-            function (WebDriverElement $e) use ($expectedUrl, $absoluteCurrentUrl) {
+            function(WebDriverElement $e) use ($expectedUrl, $absoluteCurrentUrl) {
                 $elementHref = Uri::mergeUrls($absoluteCurrentUrl, $e->getAttribute('href'));
                 return $elementHref === $expectedUrl;
             }
@@ -1171,7 +1171,7 @@ 
         $matches = [];
         $res = preg_match($uri, $this->_getCurrentUri(), $matches);
         if (!$res) {
-            $this->fail("Couldn't match $uri in " . $this->_getCurrentUri());
+            $this->fail("Couldn't match $uri in ".$this->_getCurrentUri());
         }
         if (!isset($matches[1])) {
             $this->fail("Nothing to grab. A regex parameter required. Ex: '/user/(\\d+)'");
@@ -1322,7 +1322,7 @@ 
             'Contains',
             $value,
             $currentValues,
-            "Failed testing for '$value' in $strField's value: '" . implode("', '", $currentValues) . "'"
+            "Failed testing for '$value' in $strField's value: '".implode("', '", $currentValues)."'"
         ];
     }
 
@@ -1386,7 +1386,7 @@ 
         // partially matching
         foreach ($option as $opt) {
             try {
-                $optElement = $el->findElement(WebDriverBy::xpath('.//option [contains (., "' . $opt . '")]'));
+                $optElement = $el->findElement(WebDriverBy::xpath('.//option [contains (., "'.$opt.'")]'));
                 $matched = true;
                 if (!$optElement->isSelected()) {
                     $optElement->click();
@@ -1647,7 +1647,7 @@ 
     {
         $el = $this->findField($field);
         // in order to be compatible on different OS
-        $filePath = codecept_data_dir() . $filename;
+        $filePath = codecept_data_dir().$filename;
         if (!file_exists($filePath)) {
             throw new \InvalidArgumentException("File does not exist: $filePath");
         }
@@ -1714,7 +1714,7 @@ 
     {
         $els = $this->match($this->baseElement, $cssOrXpath);
         return array_map(
-            function (WebDriverElement $e) use ($attribute) {
+            function(WebDriverElement $e) use ($attribute) {
                 if ($attribute) {
                     return $e->getAttribute($attribute);
                 }
@@ -1730,7 +1730,7 @@ 
         foreach ($attributes as $attr => $value) {
             $els = array_filter(
                 $els,
-                function (WebDriverElement $el) use ($attr, $value) {
+                function(WebDriverElement $el) use ($attr, $value) {
                     return $el->getAttribute($attr) == $value;
                 }
             );
@@ -1836,7 +1836,7 @@ 
             $this->assertNotEmpty(
                 array_filter(
                     $els,
-                    function ($e) {
+                    function($e) {
                         return $e && $e->isSelected();
                     }
                 )
@@ -1858,7 +1858,7 @@ 
             $this->assertEmpty(
                 array_filter(
                     $els,
-                    function ($e) {
+                    function($e) {
                         return $e && $e->isSelected();
                     }
                 )
@@ -2256,7 +2256,7 @@ 
     public function waitForElementChange($element, \Closure $callback, $timeout = 30)
     {
         $el = $this->matchFirstOrFail($this->baseElement, $element);
-        $checker = function () use ($el, $callback) {
+        $checker = function() use ($el, $callback) {
             return $callback($el);
         };
         $this->webDriver->wait($timeout)->until($checker);
@@ -2486,7 +2486,7 @@ 
      */
     public function waitForJS($script, $timeout = 5)
     {
-        $condition = function ($wd) use ($script) {
+        $condition = function($wd) use ($script) {
             return $wd->executeScript($script);
         };
         $message = sprintf(
@@ -2694,12 +2694,12 @@ 
             try {
                 return $page->findElements($this->getStrictLocator($selector));
             } catch (InvalidSelectorException $e) {
-                throw new MalformedLocatorException(key($selector) . ' => ' . reset($selector), "Strict locator");
+                throw new MalformedLocatorException(key($selector).' => '.reset($selector), "Strict locator");
             } catch (InvalidElementStateException $e) {
                 if ($this->isPhantom() and $e->getResults()['status'] == 12) {
                     throw new MalformedLocatorException(
-                        key($selector) . ' => ' . reset($selector),
-                        "Strict locator " . $e->getCode()
+                        key($selector).' => '.reset($selector),
+                        "Strict locator ".$e->getCode()
                     );
                 }
             }
@@ -2984,7 +2984,7 @@ 
         $els = $this->match($this->baseElement, $selector);
         $nodes = array_filter(
             $els,
-            function (WebDriverElement $el) {
+            function(WebDriverElement $el) {
                 return $el->isDisplayed();
             }
         );

src/Codeception/Util/Uri.php

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
 
         //If the relative URL does not parse, attempt to parse the entire URL.
         //PHP Known bug ( https://bugs.php.net/bug.php?id=70942 )
-        $parts = ($parts === false)?parse_url($baseUri):$parts;
+        $parts = ($parts === false) ?parse_url($baseUri) : $parts;
         if ($parts === false) {
             throw new \InvalidArgumentException("Invalid URI $uri");
         }
@@ -46,14 +46,14 @@ 
                 if ($basePath) {
                     // if it ends with a slash, relative paths are below it
                     if (preg_match('~/$~', $basePath)) {
-                        $path = $basePath . $path;
+                        $path = $basePath.$path;
                     } else {
                         // remove double slashes
                         $dir = rtrim(dirname($basePath), '\\/');
-                        $path = $dir . '/' . $path;
+                        $path = $dir.'/'.$path;
                     }
                 } else {
-                    $path = '/' . ltrim($path, '/');
+                    $path = '/'.ltrim($path, '/');
                 }
             }
             $base = $base->withPath($path);
@@ -68,7 +68,7 @@ 
             $base = $base->withFragment($parts['fragment']);
         }
 
-        return (string) $base;
+        return (string)$base;
     }
 
     /**
@@ -91,9 +91,9 @@ 
         if (!isset($urlParts['host']) or !isset($urlParts['scheme'])) {
             throw new \InvalidArgumentException("Wrong URL passes, host and scheme not set");
         }
-        $host = $urlParts['scheme'] . '://' . $urlParts['host'];
+        $host = $urlParts['scheme'].'://'.$urlParts['host'];
         if (isset($urlParts['port'])) {
-            $host .= ':' . $urlParts['port'];
+            $host .= ':'.$urlParts['port'];
         }
         return $host;
     }
@@ -104,9 +104,9 @@ 
         $cutUrl = (string)$uri->withQuery('')->withFragment('');
 
         if ($path === '' || $path[0] === '#') {
-            return $cutUrl . $path;
+            return $cutUrl.$path;
         }
 
-        return rtrim($cutUrl, '/') . '/'  . ltrim($path, '/');
+        return rtrim($cutUrl, '/').'/'.ltrim($path, '/');
     }
 }