Merge 11aa10a into 4a243e3

facile-it · Feb 21, 2019 · 29b4833 · 29b4833
2 parents 4a243e3 + 11aa10a
commit 29b4833
Show file tree

Hide file tree

Showing 54 changed files with 359 additions and 866 deletions.
diff --git a/composer.json b/composer.json
@@ -24,15 +24,17 @@
     ],
     "require": {
         "php": "^7.1",
+        "ext-dom": "*",
+        "ext-json": "*",
         "jean85/pretty-package-versions": "^1.0.3",
-        "phpunit/php-code-coverage": "^4.0||^5.0||^6.0||^7.0.2",
+        "phpunit/php-code-coverage": "^6.0||^7.0.2",
         "phpunit/php-file-iterator": "^1.0||^2.0",
-        "phpunit/phpunit": "^6.0.9||^7.0||^8.0",
-        "symfony/console": "^2.8||^3.0||^4.0",
-        "symfony/dependency-injection": "^2.8||^3.0||^4.0",
-        "symfony/event-dispatcher": "^2.8||^3.0||^4.0",
-        "symfony/process": "^3.3||^4.0",
-        "symfony/stopwatch": "^2.8||^3.0||^4.0"
+        "phpunit/phpunit": "^7.0||^8.0",
+        "symfony/console": "^3.4||^4.0",
+        "symfony/dependency-injection": "^3.4||^4.0",
+        "symfony/event-dispatcher": "^3.4||^4.0",
+        "symfony/process": "^3.4||^4.0",
+        "symfony/stopwatch": "^3.4||^4.0"
     },
     "require-dev": {
         "facile-it/facile-coding-standard": "^0.3.1",
@@ -41,8 +43,8 @@
         "phpstan/phpstan-phpunit": "^0.11",
         "phpunit/php-invoker": "^1.1",
         "php-coveralls/php-coveralls": "^2.0",
-        "symfony/expression-language": "^2.8||^3.0||^4.0",
-        "symfony/phpunit-bridge": "^4.1.3"
+        "symfony/expression-language": "^3.4||^4.0",
+        "symfony/phpunit-bridge": "^4.2"
     },
     "bin": [
         "src/Paraunit/Bin/paraunit"

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,14 +1,8 @@
 parameters:
     ignoreErrors:
         - '/does not call parent constructor from PHPUnit\\Util\\Printer/'
-        # needed with Symfony <3.3
-        - '/Call to function is_array\(\) with string will always evaluate to false./'
-        - '/Class Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher not found/'
         - '/Call to function method_exists.. with .Tests..BaseTestCase. and .assertStringContain.... will always evaluate to false./'
     excludes_analyse:
-        # needed with PHPUnit 6
-        - src/Paraunit/Parser/JSON/LogPrinterV6.php
-        - src/Paraunit/Process/ProcessBuilderFactory.php
         - tests/Stub/ParseErrorTestStub.php
 includes:
 	- vendor/phpstan/phpstan-phpunit/extension.neon

diff --git a/src/Paraunit/Configuration/DependencyInjection/CoverageContainerDefinition.php b/src/Paraunit/Configuration/DependencyInjection/CoverageContainerDefinition.php
@@ -33,13 +33,13 @@ public function configure(ContainerBuilder $container): ContainerBuilder
         return $container;
     }
 
-    private function configureCoverageConfiguration(ContainerBuilder $container)
+    private function configureCoverageConfiguration(ContainerBuilder $container): void
     {
         $container->setDefinition(PHPDbgBinFile::class, new Definition(PHPDbgBinFile::class));
         $container->setDefinition(XDebugProxy::class, new Definition(XDebugProxy::class));
     }
 
-    private function configureProcessWithCoverage(ContainerBuilder $container)
+    private function configureProcessWithCoverage(ContainerBuilder $container): void
     {
         $container->setDefinition(CommandLineWithCoverage::class, new Definition(CommandLineWithCoverage::class, [
             new Reference(PHPUnitBinFile::class),
@@ -54,7 +54,7 @@ private function configureProcessWithCoverage(ContainerBuilder $container)
             ]);
     }
 
-    private function configureCoverage(ContainerBuilder $container)
+    private function configureCoverage(ContainerBuilder $container): void
     {
         $container->setDefinition(CoverageFetcher::class, new Definition(CoverageFetcher::class, [
             new Reference(TempFilenameFactory::class),

diff --git a/src/Paraunit/Configuration/DependencyInjection/ParallelContainerDefinition.php b/src/Paraunit/Configuration/DependencyInjection/ParallelContainerDefinition.php
@@ -19,7 +19,6 @@
 use Paraunit\Printer\SharkPrinter;
 use Paraunit\Printer\SingleResultFormatter;
 use Paraunit\Process\CommandLine;
-use Paraunit\Process\ProcessBuilderFactory;
 use Paraunit\Process\ProcessFactory;
 use Paraunit\Process\ProcessFactoryInterface;
 use Paraunit\Proxy\PHPUnitUtilXMLProxy;
@@ -32,11 +31,9 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
 use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Process\Process;
 
 class ParallelContainerDefinition
 {
@@ -69,7 +66,7 @@ public function configure(ContainerBuilder $container): ContainerBuilder
         return $container;
     }
 
-    private function configureConfiguration(ContainerBuilder $container)
+    private function configureConfiguration(ContainerBuilder $container): void
     {
         $container->setDefinition(PHPUnitBinFile::class, new Definition(PHPUnitBinFile::class));
         $container->setDefinition(PHPUnitConfig::class, new Definition(PHPUnitConfig::class, [
@@ -81,16 +78,9 @@ private function configureConfiguration(ContainerBuilder $container)
         ]));
     }
 
-    private function configureEventDispatcher(ContainerBuilder $container)
+    private function configureEventDispatcher(ContainerBuilder $container): void
     {
-        if (class_exists('Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument')) {
-            $container->setDefinition(EventDispatcherInterface::class, new Definition(EventDispatcher::class));
-        } else {
-            $container->setDefinition(
-                EventDispatcherInterface::class,
-                new Definition(ContainerAwareEventDispatcher::class, [new Reference('service_container')])
-            );
-        }
+        $container->setDefinition(EventDispatcherInterface::class, new Definition(EventDispatcher::class));
 
         $container->addCompilerPass(
             new RegisterListenersPass(
@@ -101,15 +91,15 @@ private function configureEventDispatcher(ContainerBuilder $container)
         );
     }
 
-    private function configureFile(ContainerBuilder $container)
+    private function configureFile(ContainerBuilder $container): void
     {
         $container->setDefinition(TempDirectory::class, new Definition(TempDirectory::class));
         $container->setDefinition(Cleaner::class, new Definition(Cleaner::class, [
             new Reference(TempDirectory::class),
         ]));
     }
 
-    private function configurePrinter(ContainerBuilder $container)
+    private function configurePrinter(ContainerBuilder $container): void
     {
         $output = new Reference(OutputInterface::class);
 
@@ -136,20 +126,20 @@ private function configurePrinter(ContainerBuilder $container)
         ]));
     }
 
-    private function configureProcess(ContainerBuilder $container)
+    private function configureProcess(ContainerBuilder $container): void
     {
         $container->setDefinition(CommandLine::class, new Definition(CommandLine::class, [
             new Reference(PHPUnitBinFile::class),
         ]));
 
-        $container->setDefinition(ProcessFactoryInterface::class, new Definition($this->getProcessFactoryClass(), [
+        $container->setDefinition(ProcessFactoryInterface::class, new Definition(ProcessFactory::class, [
             new Reference(CommandLine::class),
             new Reference(PHPUnitConfig::class),
             new Reference(TempFilenameFactory::class),
         ]));
     }
 
-    private function configureRunner(ContainerBuilder $container)
+    private function configureRunner(ContainerBuilder $container): void
     {
         $container->setDefinition(PipelineFactory::class, new Definition(PipelineFactory::class, [
             new Reference(EventDispatcherInterface::class),
@@ -167,7 +157,7 @@ private function configureRunner(ContainerBuilder $container)
             ->setPublic(true);
     }
 
-    private function configureServices(ContainerBuilder $container)
+    private function configureServices(ContainerBuilder $container): void
     {
         if (! class_exists('SebastianBergmann\FileIterator\Facade')) {
             \class_alias('\File_Iterator_Facade', 'SebastianBergmann\FileIterator\Facade');
@@ -186,16 +176,4 @@ private function configureServices(ContainerBuilder $container)
             '%paraunit.string_filter%',
         ]));
     }
-
-    private function getProcessFactoryClass(): string
-    {
-        // only reliable way to detect symfony/process 3.3+: CLI parsing
-        $process = new Process(['cmd as array']);
-        if (\is_array($process->getCommandLine())) {
-            // Commandline not parsed, we have Symfony < 3.3
-            return ProcessBuilderFactory::class;
-        }
-
-        return ProcessFactory::class;
-    }
 }
diff --git a/src/Paraunit/Configuration/DependencyInjection/TestResultDefinition.php b/src/Paraunit/Configuration/DependencyInjection/TestResultDefinition.php
@@ -15,13 +15,13 @@
 
 class TestResultDefinition
 {
-    public function configure(ContainerBuilder $container)
+    public function configure(ContainerBuilder $container): void
     {
         $container->setDefinition(TestResultFactory::class, new Definition(TestResultFactory::class));
         $this->configureTestResultContainer($container);
     }
 
-    private function configureTestResultContainer(ContainerBuilder $container)
+    private function configureTestResultContainer(ContainerBuilder $container): void
     {
         $testResultList = new Definition(TestResultList::class);
 

diff --git a/src/Paraunit/Configuration/PHPUnitConfig.php b/src/Paraunit/Configuration/PHPUnitConfig.php
@@ -39,7 +39,7 @@ public function getBaseDirectory(): string
         return dirname($this->configFilename);
     }
 
-    public function addPhpunitOption(PHPUnitOption $option)
+    public function addPhpunitOption(PHPUnitOption $option): void
     {
         $this->phpunitOptions[] = $option;
     }

diff --git a/src/Paraunit/Configuration/PHPUnitOption.php b/src/Paraunit/Configuration/PHPUnitOption.php
@@ -33,26 +33,20 @@ public function getName(): string
         return $this->name;
     }
 
-    /**
-     * @return string|null
-     */
-    public function getShortName()
+    public function getShortName(): ?string
     {
         return $this->shortName;
     }
 
     /**
      * @param string $value
      */
-    public function setValue(string $value = null)
+    public function setValue(string $value = null): void
     {
         $this->value = $value;
     }
 
-    /**
-     * @return string|null
-     */
-    public function getValue()
+    public function getValue(): ?string
     {
         return $this->value;
     }

diff --git a/src/Paraunit/Configuration/ParallelConfiguration.php b/src/Paraunit/Configuration/ParallelConfiguration.php
@@ -78,15 +78,15 @@ protected function loadCommandLineOptions(ContainerBuilder $containerBuilder, In
         }
     }
 
-    private function enableDebugMode(ContainerBuilder $containerBuilder)
+    private function enableDebugMode(ContainerBuilder $containerBuilder): void
     {
         $definition = new Definition(DebugPrinter::class, [new Reference(OutputInterface::class)]);
         $definition->addTag(self::TAG_EVENT_SUBSCRIBER);
 
         $containerBuilder->setDefinition(DebugPrinter::class, $definition);
     }
 
-    private function createPublicAliases(ContainerBuilder $containerBuilder)
+    private function createPublicAliases(ContainerBuilder $containerBuilder): void
     {
         if (! $this->createPublicServiceAliases) {
             return;
@@ -96,11 +96,6 @@ private function createPublicAliases(ContainerBuilder $containerBuilder)
         // the synthetic service isn't listed
         $services[] = OutputInterface::class;
         foreach ($services as $serviceName) {
-            if ($serviceName === 'service_container') {
-                // needed with SF 3.x
-                continue;
-            }
-
             $containerBuilder->setAlias(
                 sprintf(self::PUBLIC_ALIAS_FORMAT, $serviceName),
                 new Alias($serviceName, true)

diff --git a/src/Paraunit/Coverage/CoverageMerger.php b/src/Paraunit/Coverage/CoverageMerger.php
@@ -29,7 +29,7 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    public function onProcessParsingCompleted(ProcessEvent $processEvent)
+    public function onProcessParsingCompleted(ProcessEvent $processEvent): void
     {
         $process = $processEvent->getProcess();
         if ($process->isToBeRetried()) {
@@ -39,7 +39,7 @@ public function onProcessParsingCompleted(ProcessEvent $processEvent)
         $this->merge($process);
     }
 
-    private function merge(AbstractParaunitProcess $process)
+    private function merge(AbstractParaunitProcess $process): void
     {
         $newCoverageData = $this->coverageFetcher->fetch($process);
 

diff --git a/src/Paraunit/Coverage/CoverageResult.php b/src/Paraunit/Coverage/CoverageResult.php
@@ -29,12 +29,12 @@ public static function getSubscribedEvents(): array
         ];
     }
 
-    public function addCoverageProcessor(CoverageProcessorInterface $processor)
+    public function addCoverageProcessor(CoverageProcessorInterface $processor): void
     {
         $this->coverageProcessors[] = $processor;
     }
 
-    public function generateResults()
+    public function generateResults(): void
     {
         $coverageData = $this->coverageMerger->getCoverageData();
 

diff --git a/src/Paraunit/Coverage/Processor/AbstractText.php b/src/Paraunit/Coverage/Processor/AbstractText.php
@@ -34,7 +34,7 @@ public function __construct(OutputInterface $output, bool $showColors, bool $onl
     /**
      * @throws \RuntimeException
      */
-    public function process(CodeCoverage $coverage)
+    public function process(CodeCoverage $coverage): void
     {
         $coverageResults = $this->text->process($coverage, $this->showColors);
 

diff --git a/src/Paraunit/Coverage/Processor/Clover.php b/src/Paraunit/Coverage/Processor/Clover.php
@@ -25,7 +25,7 @@ public function __construct(OutputFile $targetFile)
     /**
      * @throws \RuntimeException
      */
-    public function process(CodeCoverage $codeCoverage)
+    public function process(CodeCoverage $codeCoverage): void
     {
         $this->clover->process($codeCoverage, $this->targetFile->getFilePath());
     }

diff --git a/src/Paraunit/Coverage/Processor/CoverageProcessorInterface.php b/src/Paraunit/Coverage/Processor/CoverageProcessorInterface.php
@@ -10,10 +10,8 @@ interface CoverageProcessorInterface
 {
     /**
      * @throws \RuntimeException If the processor is missing a needed info, like the target dir/filename
-     *
-     * @return void
      */
-    public function process(CodeCoverage $codeCoverage);
+    public function process(CodeCoverage $codeCoverage): void;
 
     public static function getConsoleOptionName(): string;
 }
diff --git a/src/Paraunit/Coverage/Processor/Crap4j.php b/src/Paraunit/Coverage/Processor/Crap4j.php
@@ -25,7 +25,7 @@ public function __construct(OutputFile $targetFile)
     /**
      * @throws \RuntimeException
      */
-    public function process(CodeCoverage $codeCoverage)
+    public function process(CodeCoverage $codeCoverage): void
     {
         $this->crap4j->process($codeCoverage, $this->targetFile->getFilePath());
     }

diff --git a/src/Paraunit/Coverage/Processor/Html.php b/src/Paraunit/Coverage/Processor/Html.php
@@ -25,7 +25,7 @@ public function __construct(OutputPath $targetPath)
     /**
      * @throws \RuntimeException
      */
-    public function process(CodeCoverage $codeCoverage)
+    public function process(CodeCoverage $codeCoverage): void
     {
         $this->html->process($codeCoverage, $this->targetPath->getPath());
     }

diff --git a/src/Paraunit/Coverage/Processor/Php.php b/src/Paraunit/Coverage/Processor/Php.php
@@ -25,7 +25,7 @@ public function __construct(OutputFile $targetFile)
     /**
      * @throws \RuntimeException
      */
-    public function process(CodeCoverage $codeCoverage)
+    public function process(CodeCoverage $codeCoverage): void
     {
         $this->php->process($codeCoverage, $this->targetFile->getFilePath());
     }

diff --git a/src/Paraunit/Coverage/Processor/Xml.php b/src/Paraunit/Coverage/Processor/Xml.php
@@ -26,7 +26,7 @@ public function __construct(OutputPath $targetPath)
     /**
      * @throws \RuntimeException
      */
-    public function process(CodeCoverage $codeCoverage)
+    public function process(CodeCoverage $codeCoverage): void
     {
         $this->xml->process($codeCoverage, $this->targetPath->getPath());
     }