Merge a82d5ea into 19fab19

src/bridge/.editorconfig

@@ -0,0 +1,96 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+# Change these settings to your own preference
+indent_style = space
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.feature]
+indent_style = space
+indent_size = 2
+
+[*.json]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.neon]
+indent_style = tab
+indent_size = 4
+
+[*.php]
+indent_style = space
+indent_size = 4
+
+[*.xml]
+indent_style = space
+indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false
+
+[*.yaml]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false
+
+[.circleci/config.yml]
+indent_style = space
+indent_size = 2
+
+[.gitmodules]
+indent_style = tab
+
+[.php_cs]
+indent_style = space
+indent_size = 4
+
+[.styleci.yml]
+indent_style = space
+indent_size = 2
+
+[.travis.yml]
+indent_style = space
+indent_size = 2
+
+[appveyor.yml]
+indent_style = space
+indent_size = 2
+
+[behat.yml{.dist}]
+indent_style = space
+indent_size = 2
+
+[coverage.yml{,.dist}]
+indent_style = space
+indent_size = 2
+
+[coverage.yaml{,.dist}]
+indent_style = space
+indent_size = 2
+
+[composer.json]
+indent_style = space
+indent_size = 4
+
+[phpstan.neon{,.dist}]
+indent_style = tab
+indent_size = 4
+
+[phpunit.xml{,.dist}]
+indent_style = space
+indent_size = 4

src/bridge/Compiler/CoveragePass.php

@@ -44,11 +44,9 @@ private function processFilter(ContainerBuilder $container)
         $definition = $container->getDefinition('coverage.filter');
 
         foreach ($config as $options) {
-            $options['basePath'] = '';
             $this->filterWhitelist($definition, $options, 'add');
             $exclude = $options['exclude'];
             foreach ($exclude as $item) {
-                $item['basePath'] = '';
                 $this->filterWhitelist($definition, $item, 'remove');
             }
         }
@@ -85,11 +83,13 @@ private function filterWhitelist(Definition $definition, $options, $method)
             if (false !== ($pos=strpos($file, '*'))) {
                 $files = [];
                 foreach (glob($file) as $filename) {
+                    $filename = realpath($filename);
                     $files[] = $filename;
                 }
             }
-
-            $definition->addMethodCall($method.'File'.$methodSuffix, $files);
+            foreach($files as $file){
+                $definition->addMethodCall($method.'File'.$methodSuffix, [$file]);
+            }
         }
     }
 }

src/bridge/Configuration.php

@@ -63,6 +63,7 @@ private function configureCoverageSection(ArrayNodeDefinition $node)
                 ->end()
                 ->booleanNode('xdebug_patch')->defaultTrue()->end()
                 ->booleanNode('debug')->defaultFalse()->end()
+                ->scalarNode('env')->defaultValue('prod')->end()
                 ->arrayNode('coverage')
                     ->addDefaultsIfNotSet()
                     ->children()

src/bridge/ContainerFactory.php

@@ -38,17 +38,14 @@ class ContainerFactory
     public function __construct(array $config = [])
     {
         $this->config = $config;
+        $this->doCreateContainer();
     }
 
     /**
      * @return ContainerInterface
      */
     public function getContainer(): ContainerInterface
     {
-        if (null === $this->container) {
-            $this->doCreateContainer();
-        }
-
         return $this->container;
     }
 

src/bridge/Context/ContainerContext.php

@@ -40,16 +40,21 @@ public function setContainer($container)
      */
     public function iConfigureCodeCoverage(PyStringNode $node = null)
     {
-        $config = [];
+        $config = [
+            'env' => 'behat',
+            'debug' => true,
+        ];
         if (null !== $node) {
             $config = Yaml::parse($node->getRaw());
         }
 
-        $container = (new ContainerFactory($config, true))->getContainer();
-        $container->set('console.input', new StringInput(''));
-        $container->set('console.output', new StreamOutput(fopen('php://memory', '+w')));
+        if(is_null($this->container)){
+            $container = (new ContainerFactory($config))->getContainer();
+            $container->set('console.input', new StringInput(''));
+            $container->set('console.output', new StreamOutput(fopen('php://memory', '+w')));
 
-        $this->container = $container;
+            $this->container = $container;
+        }
     }
 
     /**

src/bridge/Resources/coverage.yaml

@@ -0,0 +1,10 @@
+filter:
+  - directory: ""
+    exclude:
+      - Spec
+      - Resources
+      - Context
+      - Driver
+      - vendor
+      - build
+      - file: RoboFile.php

src/bridge/Resources/features/config.feature

@@ -19,12 +19,12 @@ Feature: Configuration
     Given I have load container with:
       """
       reports:
-        clover: build/clover.xml
-        crap4j: build/logs/crap4j.xml
-        html: build/html
-        php: build/cov/php.cov
+        clover: build/behat-test/clover.xml
+        crap4j: build/behat-test/logs/crap4j.xml
+        html: build/behat-test/html
+        php: build/behat-test/cov/php.cov
         text: console
-        xml: build/xml
+        xml: build/behat-test/xml
       """
     Then service "<processor>" should loaded
 

src/bridge/Session/AbstractSession.php

@@ -72,6 +72,8 @@ abstract class AbstractSession implements SessionInterface, \Serializable
         'testCase',
     ];
 
+    private $started = false;
+
     /**
      * AbstractSession constructor.
      *
@@ -94,6 +96,7 @@ public function init(array $config)
         $this->config = $config;
         $this->createContainer($config);
         $this->processor = $this->container->get('factory')->createProcessor(true);
+        $this->reset();
         $this->save();
     }
 
@@ -131,7 +134,10 @@ public function refresh()
         $adapter = $this->adapter;
 
         $cached = $adapter->getItem(static::CACHE_KEY)->get();
-        $this->fromCache($cached);
+
+        if(!is_null($cached)){
+            $this->fromCache($cached);
+        }
 
         $this->createContainer($this->config);
     }
@@ -153,11 +159,8 @@ private function toCache()
         return $data;
     }
 
-    private function fromCache($cache)
+    private function fromCache(array $cache)
     {
-        if (null === $cache) {
-            return;
-        }
         foreach ($cache as $name => $value) {
             $this->{$name} = $value;
         }
@@ -212,29 +215,50 @@ public function setTestCase(TestCase $testCase)
     public function start()
     {
         if (null === $this->testCase) {
-            throw new SessionException('Can not start coverage without null TestCase');
+            throw new SessionException('Can not start coverage with null TestCase');
         }
 
         try {
             $container = $this->container;
             $testCase  = $this->testCase;
             $processor = $container->get('factory')->createProcessor();
-            $processor->setCurrentTestCase($testCase);
+
+            $processor->start($testCase);
+
             $this->currentProcessor = $processor;
+            $this->started = true;
         } catch (\Exception $exception) {
+            $this->started = false;
+            $message = sprintf(
+                "Can not start coverage on session %s. Error message:\n%s",
+                $this->getName(),
+                $exception->getMessage()
+            );
+            $exception = new  SessionException($message);
             $this->addException($exception);
         }
     }
 
     public function stop()
     {
-        $this->currentProcessor->stop();
-        $this->processor->merge($this->currentProcessor);
+        try{
+            $this->currentProcessor->stop();
+            $this->processor->merge($this->currentProcessor);
+            $this->started = false;
+        }catch (\Exception $exception){
+            $message = sprintf(
+                "Can not stop coverage on session <comment>%s</comment>. Error message:\n<error>%s</error>",
+                $this->name,
+                $exception->getMessage()
+            );
+            $e = new SessionException($message);
+            $this->addException($e);
+        }
     }
 
     public function shutdown()
     {
-        if (null !== $this->currentProcessor) {
+        if ($this->started) {
             $this->stop();
         }
         $this->save();

src/bridge/Session/LocalSession.php

@@ -20,13 +20,10 @@ public static function startSession($name): bool
         $self = new static($name);
         try {
             $self->start();
-            register_shutdown_function([$self, 'shutdown']);
-
             return true;
         } catch (\Exception $exception) {
             $self->addException($exception);
             $self->save();
-
             return false;
         }
     }

src/bridge/Session/RemoteSession.php

@@ -26,31 +26,24 @@ public static function startSession()
             return false;
         }
 
-        $name    = $_SERVER[static::HEADER_SESSION_KEY];
-        $session = new static($name);
-
-        if (isset($_SERVER[static::HEADER_TEST_CASE_KEY])) {
-            $session->doStartSession();
-        } else {
+        if(!isset($_SERVER[static::HEADER_TEST_CASE_KEY])){
             return false;
         }
-        $session->save();
-
-        return true;
-    }
 
-    public function doStartSession()
-    {
-        $name     = $_SERVER[static::HEADER_TEST_CASE_KEY];
-        $testCase = new TestCase($name);
-        $this->setTestCase($testCase);
-
-        try {
-            $this->start();
-            register_shutdown_function([$this, 'shutdown']);
-        } catch (\Exception $e) {
-            $this->reset();
-            $this->exceptions[] = $e;
+        $sessionName = $_SERVER[static::HEADER_SESSION_KEY];
+        $session = new static($sessionName);
+        $testCaseName = $_SERVER[static::HEADER_TEST_CASE_KEY];
+        $testCase = new TestCase($testCaseName);
+
+        try{
+            $session->setTestCase($testCase);
+            $session->start();
+            $session->save();
+            return true;
+        }catch (\Exception $e){
+            $session->addException($e);
+            $session->save();
+            return false;
         }
     }
 }