misc (fixes #20, fixes #22, fixes #23, via #24)

Author: remorhaz

composer.json

@@ -37,8 +37,8 @@
     "jetbrains/phpstorm-attributes": "^1",
     "phpunit/phpunit": "^9.5.10",
     "psalm/plugin-phpunit": "^0.16.1",
-    "squizlabs/php_codesniffer": "^3.6.1",
-    "vimeo/psalm": "^4.10"
+    "squizlabs/php_codesniffer": "^3.6.2",
+    "vimeo/psalm": "^4.15"
   },
   "autoload": {
     "psr-4": {
@@ -51,6 +51,9 @@
       "Qameta\\Allure\\Test\\": "test"
     }
   },
+  "conflict": {
+    "amphp/byte-stream": "<1.5.1"
+  },
   "scripts": {
     "test-cs": "vendor/bin/phpcs -sp",
     "test-unit": "vendor/bin/phpunit --log-junit=build/log/junit.xml --coverage-clover=build/coverage/clover.xml --coverage-text",
@@ -60,10 +63,5 @@
       "@test-unit",
       "@test-psalm"
     ]
-  },
-  "extra": {
-    "branch-alias": {
-      "dev-master": "v2.x.x-dev"
-    }
   }
 }

src/Allure.php

@@ -7,7 +7,6 @@
 use Closure;
 use Qameta\Allure\Attribute\AttributeParser;
 use Qameta\Allure\Attribute\AttributeReader;
-use Qameta\Allure\Exception\OutputDirectorySetFailureException;
 use Qameta\Allure\Internal\StepContext;
 use Qameta\Allure\Internal\LifecycleBuilder;
 use Qameta\Allure\Io\DataSourceFactory;
@@ -36,15 +35,12 @@
 
 final class Allure
 {
-
     private const DEFAULT_STEP_NAME = 'step';
 
     private static ?self $instance = null;
 
     private ?LifecycleBuilderInterface $lifecycleBuilder = null;
 
-    private ?string $outputDirectory = null;
-
     private ?AllureLifecycleInterface $lifecycle = null;
 
     private string $defaultStepName = self::DEFAULT_STEP_NAME;
@@ -60,9 +56,12 @@ public static function reset(): void
         self::$instance = null;
     }
 
+    /**
+     * @deprecated Please use lifecycle configurator to set output directory.
+     */
     public static function setOutputDirectory(string $outputDirectory): void
     {
-        self::getInstance()->doSetOutputDirectory($outputDirectory);
+        self::getLifecycleConfigurator()->setOutputDirectory($outputDirectory);
     }
 
     public static function getLifecycleConfigurator(): LifecycleConfiguratorInterface
@@ -305,14 +304,6 @@ public static function setLifecycleBuilder(LifecycleBuilderInterface $builder):
         self::getInstance()->lifecycleBuilder = $builder;
     }
 
-    private function doSetOutputDirectory(string $outputDirectory): void
-    {
-        if (isset($this->resultsWriter)) {
-            throw new OutputDirectorySetFailureException();
-        }
-        $this->outputDirectory = $outputDirectory;
-    }
-
     private function doGetLifecycle(): AllureLifecycleInterface
     {
         return $this->lifecycle ??= $this->getLifecycleFactory()->createLifecycle($this->getResultsWriter());
@@ -343,16 +334,11 @@ private function getLifecycleFactory(): LifecycleFactoryInterface
         return $this->getLifecycleBuilder();
     }
 
-    private function getOutputDirectory(): string
-    {
-        return $this->outputDirectory ?? throw new Exception\OutputDirectoryUndefinedException();
-    }
-
     private function getResultsWriter(): ResultsWriterInterface
     {
         return $this->resultsWriter ??= $this
             ->getLifecycleFactory()
-            ->createResultsWriter($this->getOutputDirectory());
+            ->createResultsWriter();
     }
 
     private function doAddStep(string $name, ?Status $status = null): void

src/AllureLifecycleInterface.php

@@ -13,7 +13,6 @@
 
 interface AllureLifecycleInterface
 {
-
     public function switchThread(?string $thread): void;
 
     public function getCurrentTest(): ?string;

src/Attribute/AbstractDescription.php

@@ -6,7 +6,6 @@
 
 abstract class AbstractDescription implements DescriptionInterface
 {
-
     public function __construct(
         private string $value,
         private bool $isHtml,

src/Attribute/AbstractLabel.php

@@ -6,7 +6,6 @@
 
 abstract class AbstractLabel implements LabelInterface
 {
-
     public function __construct(
         private string $name,
         private ?string $value = null,

src/Attribute/AbstractLink.php

@@ -6,7 +6,6 @@
 
 abstract class AbstractLink implements LinkInterface
 {
-
     public function __construct(
         private ?string $name = null,
         private ?string $url = null,

src/Attribute/AbstractParameter.php

@@ -6,7 +6,6 @@
 
 abstract class AbstractParameter implements ParameterInterface
 {
-
     public function __construct(
         private string $name,
         private ?string $value,

src/Attribute/AttributeReader.php

@@ -18,7 +18,6 @@
 
 final class AttributeReader implements AttributeReaderInterface
 {
-
     /**
      * @param ReflectionClass $class
      * @param class-string|null     $name

src/Attribute/AttributeReaderInterface.php

@@ -11,7 +11,6 @@
 
 interface AttributeReaderInterface
 {
-
     /**
      * @param ReflectionClass $class
      * @param class-string|null     $name

src/Attribute/Description.php

@@ -9,7 +9,6 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD)]
 final class Description extends AbstractDescription
 {
-
     public function __construct(string $value, bool $isHtml = false)
     {
         parent::__construct($value, $isHtml);

src/Attribute/DisplayNameInterface.php

@@ -6,6 +6,5 @@
 
 interface DisplayNameInterface extends AttributeInterface
 {
-
     public function getValue(): string;
 }

src/Attribute/Epic.php

@@ -9,7 +9,6 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class Epic extends AbstractLabel
 {
-
     public function __construct(string $value)
     {
         parent::__construct(Label::EPIC, $value);

src/Attribute/Feature.php

@@ -9,7 +9,6 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class Feature extends AbstractLabel
 {
-
     public function __construct(string $value)
     {
         parent::__construct(Label::FEATURE, $value);

src/Attribute/Issue.php

@@ -9,7 +9,6 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class Issue extends AbstractLink
 {
-
     public function __construct(?string $name = null, ?string $url = null)
     {
         parent::__construct($name, $url, Link::ISSUE);

src/Attribute/Label.php

@@ -10,7 +10,6 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class Label extends AbstractLabel
 {
-
     public const ALLURE_ID = Model\Label::ALLURE_ID;
     public const SUITE = Model\Label::SUITE;
     public const PARENT_SUITE = Model\Label::PARENT_SUITE;

src/Attribute/LabelInterface.php

@@ -6,7 +6,6 @@
 
 interface LabelInterface extends AttributeInterface
 {
-
     public function getName(): string;
 
     public function getValue(): ?string;

src/Attribute/LegacyAttributeReader.php

@@ -19,7 +19,6 @@
 
 final class LegacyAttributeReader implements AttributeReaderInterface
 {
-
     private Reader $legacyDelegate;
 
     public function __construct(

src/Attribute/Link.php

@@ -10,7 +10,6 @@
 #[Attribute(Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class Link extends AbstractLink
 {
-
     public const CUSTOM = Model\LinkType::CUSTOM;
     public const ISSUE = Model\LinkType::ISSUE;
     public const TMS = Model\LinkType::TMS;

src/Attribute/LinkInterface.php

@@ -6,7 +6,6 @@
 
 interface LinkInterface extends AttributeInterface
 {
-
     public function getName(): ?string;
 
     public function getUrl(): ?string;

src/Attribute/Parameter.php

@@ -10,7 +10,6 @@
 #[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_FUNCTION | Attribute::IS_REPEATABLE)]
 class Parameter extends AbstractParameter
 {
-
     public function __construct(
         string $name,
         ?string $value,

src/Attribute/ParameterInterface.php

@@ -6,7 +6,6 @@
 
 interface ParameterInterface extends AttributeInterface
 {
-
     public function getName(): string;
 
     public function getValue(): ?string;

src/Attribute/ParameterMode.php

@@ -8,7 +8,6 @@
 
 final class ParameterMode
 {
-
     public const HIDDEN = Model\ParameterMode::HIDDEN;
     public const MASKED = Model\ParameterMode::MASKED;
 }

src/Attribute/Story.php

@@ -9,7 +9,6 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class Story extends AbstractLabel
 {
-
     public function __construct(string $value)
     {
         parent::__construct(Label::STORY, $value);

src/Attribute/TmsLink.php

@@ -9,7 +9,6 @@
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class TmsLink extends AbstractLink
 {
-
     public function __construct(?string $name = null, ?string $url = null)
     {
         parent::__construct($name, $url, Link::TMS);

src/Exception/ActiveContainerNotFoundException.php

@@ -9,7 +9,6 @@
 
 final class ActiveContainerNotFoundException extends LogicException
 {
-
     public function __construct(Throwable $previous = null)
     {
         parent::__construct("Active container not found", 0, $previous);

src/Exception/ActiveExecutionContextNotFoundException.php

@@ -9,7 +9,6 @@
 
 final class ActiveExecutionContextNotFoundException extends LogicException
 {
-
     public function __construct(Throwable $previous = null)
     {
         parent::__construct("Active test, fixture or step not found", 0, $previous);

src/Exception/ActiveStepNotFoundException.php

@@ -9,7 +9,6 @@
 
 final class ActiveStepNotFoundException extends LogicException
 {
-
     public function __construct(Throwable $previous = null)
     {
         parent::__construct("Active step not found", 0, $previous);

src/Exception/ActiveTestNotFoundException.php

@@ -9,7 +9,6 @@
 
 final class ActiveTestNotFoundException extends LogicException
 {
-
     public function __construct(Throwable $previous = null)
     {
         parent::__construct("Active test or fixture not found", 0, $previous);

src/Exception/InvalidExecutionContextException.php

@@ -10,7 +10,6 @@
 
 final class InvalidExecutionContextException extends DomainException
 {
-
     public function __construct(
         private ExecutionContextInterface $context,
         ?Throwable $previous = null,

src/Exception/InvalidMethodNameException.php

@@ -11,7 +11,6 @@
 
 final class InvalidMethodNameException extends \DomainException
 {
-
     public function __construct(
         private mixed $methodName,
         Throwable $previous = null,

src/Exception/OutputDirectorySetFailureException.php

@@ -10,7 +10,6 @@
 
 final class OutputDirectoryUndefinedException extends LogicException
 {
-
     public function __construct(?Throwable $previous = null)
     {
         $class = Allure::class;

src/Exception/OutputDirectoryUndefinedException.php

@@ -8,6 +8,5 @@
 
 interface AfterAttachmentWriteHookInterface extends LifecycleHookInterface
 {
-
     public function afterAttachmentWrite(AttachmentResult $attachment): void;
 }

src/Hook/AfterAttachmentWriteHookInterface.php

@@ -8,6 +8,5 @@
 
 interface AfterContainerStartHookInterface extends LifecycleHookInterface
 {
-
     public function afterContainerStart(ContainerResult $container): void;
 }

src/Hook/AfterContainerStartHookInterface.php

@@ -8,6 +8,5 @@
 
 interface AfterContainerStopHookInterface extends LifecycleHookInterface
 {
-
     public function afterContainerStop(ContainerResult $container): void;
 }

src/Hook/AfterContainerStopHookInterface.php

@@ -8,6 +8,5 @@
 
 interface AfterContainerUpdateHookInterface extends LifecycleHookInterface
 {
-
     public function afterContainerUpdate(ContainerResult $container): void;
 }

src/Hook/AfterContainerUpdateHookInterface.php

@@ -8,6 +8,5 @@
 
 interface AfterContainerWriteHookInterface extends LifecycleHookInterface
 {
-
     public function afterContainerWrite(ContainerResult $container): void;
 }

src/Hook/AfterContainerWriteHookInterface.php

@@ -8,6 +8,5 @@
 
 interface AfterFixtureStartHookInterface extends LifecycleHookInterface
 {
-
     public function afterFixtureStart(FixtureResult $fixture): void;
 }