Merge pull request #54 from OndraM/fix/codestyle

Codestyle improvements

src-tests/Process/ProcessWrapperTest.php

@@ -150,9 +150,9 @@ public function testShouldFailIfWrongProcessStatusGiven()
 
         $this->setExpectedException(
             InvalidArgumentException::class,
-            'Value "Foo" is not an element of the valid values: prepared, queued, done'
+            'Value "WrongStatus" is not an element of the valid values: prepared, queued, done'
         );
-        $wrapper->setStatus('Foo', 'WrongStatus');
+        $wrapper->setStatus('WrongStatus');
     }
 
     public function testShouldPublishProcessStatusWhenStatusWasSet()

src-tests/Publisher/XmlPublisherTest.php

@@ -16,7 +16,7 @@ public function setUp()
         ConfigHelper::setEnvironmentVariables($configValues);
         ConfigHelper::unsetConfigInstance();
 
-        $this->publisher = new XmlPublisher(null, null, null);
+        $this->publisher = new XmlPublisher();
     }
 
     public static function tearDownAfterClass()
@@ -95,8 +95,7 @@ public function testShouldAddTestResultToEmptyFile()
         $this->publisher->publishResult('testCaseNameFoo', 'testNameBar', 'started');
 
         /** @var \SimpleXMLElement $xml */
-        $fullXml = simplexml_load_file($fileName);
-        $xml = $fullXml[0];
+        $xml = simplexml_load_file($fileName);
 
         $this->assertInstanceOf(\SimpleXMLElement::class, $xml->testcase);
         $this->assertEquals('testCaseNameFoo', $xml->testcase['name']);
@@ -112,7 +111,7 @@ public function testShouldAddTestResultToEmptyFile()
         $startDate = (string) $xml->testcase->test['start']; // convert to string so it could be serialized by PHPUnit
         $this->assertEmpty($xml->testcase->test['end']);
 
-        return [$fileName, $fullXml->asXML(), $startDate];
+        return [$fileName, $xml->asXML(), $startDate];
     }
 
     /**
@@ -132,7 +131,7 @@ public function testShouldUpdateTestStatusWhenTestIsDone($params)
         $this->publisher->publishResult('testCaseNameFoo', 'testNameBar', 'done', 'passed');
 
         /** @var \SimpleXMLElement $xml */
-        $xml = simplexml_load_file($fileName)[0];
+        $xml = simplexml_load_file($fileName);
 
         // still only one test result is present
         $this->assertInstanceOf(\SimpleXMLElement::class, $xml->testcase->test);
@@ -157,7 +156,7 @@ public function testShouldAddTestcaseResultToEmptyFile()
         $this->publisher->publishResults('testCaseNameFoo', 'queued');
 
         /** @var \SimpleXMLElement $xml */
-        $xml = simplexml_load_file($fileName)[0];
+        $xml = simplexml_load_file($fileName);
 
         $this->assertInstanceOf(\SimpleXMLElement::class, $xml->testcase);
         $this->assertEquals('testCaseNameFoo', $xml->testcase['name']);
@@ -187,7 +186,7 @@ public function testShouldUpdateTestcaseStatusWhenDone($params)
         );
 
         /** @var \SimpleXMLElement $xml */
-        $xml = simplexml_load_file($fileName)[0];
+        $xml = simplexml_load_file($fileName);
 
         $this->assertInstanceOf(\SimpleXMLElement::class, $xml->testcase);
         $this->assertEquals('testCaseNameFoo', $xml->testcase['name']);
@@ -208,7 +207,7 @@ public function testShouldFailIfGivenDirectoryDoesNotExists()
         ConfigHelper::setEnvironmentVariables($configValues);
         ConfigHelper::unsetConfigInstance();
 
-        $publisher = new XmlPublisher(null, null, null);
+        $publisher = new XmlPublisher();
         $publisher->publishResult('testCaseNameFoo', 'testNameBar', 'started');
     }
 
@@ -223,7 +222,7 @@ public function testShouldNotOverwriteTestsWithSameName()
         $this->publisher->publishResult('testCaseNameBar', 'testFoo', 'done', XmlPublisher::TEST_RESULT_PASSED);
 
         /** @var \SimpleXMLElement $xml */
-        $xml = simplexml_load_file($fileName)[0];
+        $xml = simplexml_load_file($fileName);
 
         $tests = $xml->xpath('//test[@name="testFoo"]');
 
@@ -246,7 +245,7 @@ public function testShouldProperlyHandleTestsWithDataProvider($testCaseName, $te
         $this->publisher->publishResult($testCaseName, $testName, XmlPublisher::TEST_STATUS_STARTED);
 
         /** @var \SimpleXMLElement $xml */
-        $xml = simplexml_load_file($fileName)[0];
+        $xml = simplexml_load_file($fileName);
         $this->assertInstanceOf(\SimpleXMLElement::class, $xml->testcase);
         $this->assertEquals(1, count($xml->testcase));
         $this->assertEquals($testCaseName, $xml->testcase['name']);
@@ -264,7 +263,7 @@ public function testShouldProperlyHandleTestsWithDataProvider($testCaseName, $te
         );
 
         /** @var \SimpleXMLElement $xml */
-        $xml = simplexml_load_file($fileName)[0];
+        $xml = simplexml_load_file($fileName);
         $this->assertInstanceOf(\SimpleXMLElement::class, $xml->testcase);
         $this->assertEquals(1, count($xml->testcase));
         $this->assertEquals($testCaseName, $xml->testcase['name']);

src/Component/Legacy.php

@@ -214,12 +214,12 @@ public function loadWithName($legacyName)
     /**
      * Converts legacy value to string that can be printed (e.g. in log)
      * calls __toString on the object if it's defined otherwise print_r()
-     * @param $obj
+     * @param mixed $obj
      * @return string
      */
     private function getPrintableValue($obj)
     {
-        if (method_exists($obj, '__toString')) {
+        if (is_object($obj) && method_exists($obj, '__toString')) {
             return $obj;
         }
 

src/Component/TestUtils.php

@@ -89,7 +89,7 @@ public function getFixturePath($fixture)
      */
     public static function sleep($seconds)
     {
-        $fullSecond = floor($seconds);
+        $fullSecond = (int) floor($seconds);
         $microseconds = fmod($seconds, 1) * 1000000000;
 
         time_nanosleep($fullSecond, $microseconds);

src/Console/Command/RunCommand.php

@@ -331,7 +331,7 @@ protected function getSeleniumAdapter()
     protected function getProcessSetCreator(InputInterface $input, OutputInterface $output)
     {
         if (!$this->processSetCreator) {
-            $xmlPublisher = new XmlPublisher($input->getArgument(self::ARGUMENT_ENVIRONMENT), null, null);
+            $xmlPublisher = new XmlPublisher();
             $xmlPublisher->setFileDir($input->getOption(self::OPTION_LOGS_DIR));
             $xmlPublisher->clean();
 

src/Console/EventListener/ListenerInstantiator.php

@@ -30,7 +30,7 @@ public function instantiate(EventDispatcher $dispatcher, $dir)
                 && !$r->isAbstract()
             ) {
                 /** @var EventSubscriberInterface $listenerInstance */
-                $listenerInstance = $r->newInstance();
+                $listenerInstance = $r->newInstanceWithoutConstructor();
                 $dispatcher->addSubscriber($listenerInstance);
             }
         }

src/Process/ProcessWrapper.php

@@ -52,7 +52,7 @@ class ProcessWrapper
     private $status;
     /** @var string */
     private $result;
-    /** @var string */
+    /** @var int */
     private $finishedTime;
 
 
@@ -178,7 +178,7 @@ public function getResult()
     }
 
     /**
-     * @return string
+     * @return int
      */
     public function getFinishedTime()
     {

src/Publisher/AbstractPublisher.php

@@ -48,25 +48,6 @@ abstract class AbstractPublisher
         \PHPUnit_Runner_BaseTestRunner::STATUS_ERROR => self::TEST_RESULT_BROKEN,
     ];
 
-    /** @var string */
-    protected $environment;
-
-    /** @var string */
-    protected $jobName;
-
-    /** @var int */
-    protected $buildNumber;
-
-    /** @var bool */
-    protected $debug = false;
-
-    /**
-     * @param string $environment
-     * @param string $jobName
-     * @param int $buildNumber
-     */
-    abstract public function __construct($environment, $jobName, $buildNumber);
-
     /**
      * Publish testcase result
      *

src/Publisher/XmlPublisher.php

@@ -15,17 +15,6 @@ class XmlPublisher extends AbstractPublisher
     /** @var resource */
     protected $fileHandle;
 
-    /**
-     * Create the publisher.
-     *
-     * @param string $environment
-     * @param string $jobName
-     * @param int $buildNumber
-     */
-    public function __construct($environment, $jobName, $buildNumber)
-    {
-    }
-
     /**
      * Set directory where results file should be stored. Usable when config object is not available (when
      * not called from PHPUnit testcase but from Command). If the file dir is not set, the value from Config object