Fixed code building path handling

gplanchat · gplanchat · commit 88da32b28074 · 2022-05-18T12:01:06.000+02:00
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "0.2.x-dev"
+            "dev-main": "0.4.x-dev"
         }
     }
 }
diff --git a/src/Assert/BuilderAssertTrait.php b/src/Assert/BuilderAssertTrait.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Kiboko\Component\PHPUnitExtension\Assert;
+
+trait BuilderAssertTrait
+{
+    abstract protected function getBuilderCompilePath(): string;
+}
diff --git a/src/Assert/ExtractorBuilderAssertTrait.php b/src/Assert/ExtractorBuilderAssertTrait.php
@@ -13,12 +13,15 @@
 
 trait ExtractorBuilderAssertTrait
 {
+    use BuilderAssertTrait;
+
     abstract public static function assertThat($value, Constraint $constraint, string $message = ''): void;
     abstract public function pipelineRunner(): PipelineRunnerInterface;
 
     protected function assertBuildsExtractorExtractsLike(iterable $expected, DefaultBuilder $builder, string $message = '')
     {
         $this->assertThat($builder, new BuilderProducesCodeThat(
+            $this->getBuilderCompilePath(),
             new PipelineExtractsLike($expected, fn ($item) => new IsEqual($item), $this->pipelineRunner())
         ), $message);
     }
@@ -27,6 +30,7 @@ protected function assertBuildsExtractorDoesNotExtractLike(iterable $expected, D
     {
         $this->assertThat($builder, new LogicalNot(
             new BuilderProducesCodeThat(
+                $this->getBuilderCompilePath(),
                 new PipelineExtractsLike($expected, fn ($item) => new IsEqual($item), $this->pipelineRunner())
             ),
         ), $message);
@@ -35,6 +39,7 @@ protected function assertBuildsExtractorDoesNotExtractLike(iterable $expected, D
     protected function assertBuildsExtractorExtractsExactly(iterable $expected, DefaultBuilder $builder, string $message = '')
     {
         $this->assertThat($builder, new BuilderProducesCodeThat(
+            $this->getBuilderCompilePath(),
             new PipelineExtractsLike($expected, fn ($item) => new IsIdentical($item), $this->pipelineRunner())
         ), $message);
     }
@@ -43,6 +48,7 @@ protected function assertBuildsExtractorDoesNotExtractExactly(iterable $expected
     {
         $this->assertThat($builder, new LogicalNot(
             new BuilderProducesCodeThat(
+                $this->getBuilderCompilePath(),
                 new PipelineExtractsLike($expected, fn ($item) => new IsIdentical($item), $this->pipelineRunner())
             ),
         ), $message);
diff --git a/src/Assert/LoaderBuilderAssertTrait.php b/src/Assert/LoaderBuilderAssertTrait.php
@@ -14,12 +14,15 @@
 
 trait LoaderBuilderAssertTrait
 {
+    use BuilderAssertTrait;
+
     abstract public static function assertThat($value, Constraint $constraint, string $message = ''): void;
     abstract public function pipelineRunner(): PipelineRunnerInterface;
 
     protected function assertBuildsLoaderLoadsLike(iterable $expected, iterable $input, DefaultBuilder $builder, string $message = '')
     {
         $this->assertThat($builder, new BuilderProducesCodeThat(
+            $this->getBuilderCompilePath(),
             new PipelineLoadsLike($expected, $input, fn ($item) => new IsEqual($item), $this->pipelineRunner())
         ), $message);
     }
@@ -28,6 +31,7 @@ protected function assertBuildsLoaderDoesNotLoadLike(iterable $expected, iterabl
     {
         $this->assertThat($builder, new LogicalNot(
             new BuilderProducesCodeThat(
+                $this->getBuilderCompilePath(),
                 new PipelineLoadsLike($expected, $input, fn ($item) => new IsEqual($item), $this->pipelineRunner())
             ),
         ), $message);
@@ -36,6 +40,7 @@ protected function assertBuildsLoaderDoesNotLoadLike(iterable $expected, iterabl
     protected function assertBuildsLoaderLoadsExactly(iterable $expected, iterable $input, DefaultBuilder $builder, string $message = '')
     {
         $this->assertThat($builder, new BuilderProducesCodeThat(
+            $this->getBuilderCompilePath(),
             new PipelineLoadsLike($expected, $input, fn ($item) => new IsIdentical($item), $this->pipelineRunner())
         ), $message);
     }
@@ -44,6 +49,7 @@ protected function assertBuildsLoaderDoesNotLoadExactly(iterable $expected, iter
     {
         $this->assertThat($builder, new LogicalNot(
             new BuilderProducesCodeThat(
+                $this->getBuilderCompilePath(),
                 new PipelineLoadsLike($expected, $input, fn ($item) => new IsIdentical($item), $this->pipelineRunner())
             ),
         ), $message);
@@ -52,6 +58,7 @@ protected function assertBuildsLoaderDoesNotLoadExactly(iterable $expected, iter
     protected function assertBuildsLoaderProducesFile(string $expected, iterable $input, DefaultBuilder $builder, string $message = '')
     {
         $this->assertThat($builder, new BuilderProducesCodeThat(
+            $this->getBuilderCompilePath(),
             new PipelineWritesFile($input, $expected, $this->pipelineRunner()),
         ), $message);
     }
@@ -60,6 +67,7 @@ protected function assertBuildsLoaderDoesNotProduceFile(string $expected, iterab
     {
         $this->assertThat($builder, new LogicalNot(
             new BuilderProducesCodeThat(
+                $this->getBuilderCompilePath(),
                 new PipelineWritesFile($input, $expected, $this->pipelineRunner()),
             ),
         ), $message);
diff --git a/src/Assert/PipelineBuilderAssertTrait.php b/src/Assert/PipelineBuilderAssertTrait.php
@@ -10,11 +10,14 @@
 
 trait PipelineBuilderAssertTrait
 {
+    use BuilderAssertTrait;
+
     abstract public static function assertThat($value, Constraint $constraint, string $message = ''): void;
 
     protected function assertBuilderProducesInstanceOf(string $expected, DefaultBuilder $builder, string $message = '')
     {
         $this->assertThat($builder, new BuilderProducesCodeThat(
+            $this->getBuilderCompilePath(),
             new IsInstanceOf($expected)
         ), $message);
     }
@@ -23,6 +26,7 @@ protected function assertBuilderProducesNotInstanceOf(string $expected, DefaultB
     {
         $this->assertThat($builder, new LogicalNot(
             new BuilderProducesCodeThat(
+                $this->getBuilderCompilePath(),
                 new IsInstanceOf($expected)
             ),
         ), $message);
diff --git a/src/Assert/TransformerBuilderAssertTrait.php b/src/Assert/TransformerBuilderAssertTrait.php
@@ -13,12 +13,15 @@
 
 trait TransformerBuilderAssertTrait
 {
+    use BuilderAssertTrait;
+
     abstract public static function assertThat($value, Constraint $constraint, string $message = ''): void;
     abstract public function pipelineRunner(): PipelineRunnerInterface;
 
     protected function assertBuildsTransformerTransformsLike(iterable $expected, iterable $input, DefaultBuilder $builder, string $message = '')
     {
         $this->assertThat($builder, new BuilderProducesCodeThat(
+            $this->getBuilderCompilePath(),
             new PipelineTransformsLike($expected, $input, fn ($item) => new IsEqual($item), $this->pipelineRunner())
         ), $message);
     }
@@ -27,6 +30,7 @@ protected function assertBuildsTransformerDoesNotTransformLike(iterable $expecte
     {
         $this->assertThat($builder, new LogicalNot(
             new BuilderProducesCodeThat(
+                $this->getBuilderCompilePath(),
                 new PipelineTransformsLike($expected, $input, fn ($item) => new IsEqual($item), $this->pipelineRunner())
             ),
         ), $message);
@@ -35,6 +39,7 @@ protected function assertBuildsTransformerDoesNotTransformLike(iterable $expecte
     protected function assertBuildsTransformerTransformsExactly(iterable $expected, iterable $input, DefaultBuilder $builder, string $message = '')
     {
         $this->assertThat($builder, new BuilderProducesCodeThat(
+            $this->getBuilderCompilePath(),
             new PipelineTransformsLike($expected, $input, fn ($item) => new IsIdentical($item), $this->pipelineRunner())
         ), $message);
     }
@@ -43,6 +48,7 @@ protected function assertBuildsTransformerDoesNotTransformExactly(iterable $expe
     {
         $this->assertThat($builder, new LogicalNot(
             new BuilderProducesCodeThat(
+                $this->getBuilderCompilePath(),
                 new PipelineTransformsLike($expected, $input, fn ($item) => new IsIdentical($item), $this->pipelineRunner())
             ),
         ), $message);
diff --git a/src/Constraint/Builder/BuilderProducesCodeThat.php b/src/Constraint/Builder/BuilderProducesCodeThat.php
@@ -10,6 +10,13 @@
 
 final class BuilderProducesCodeThat extends UnaryOperator
 {
+    public function __construct(
+        private string $builderCompilePath,
+        $constraint,
+    ) {
+        parent::__construct($constraint);
+    }
+
     /**
      * Evaluates the constraint for parameter $other. Returns true if the
      * constraint is met, false otherwise.
@@ -52,7 +59,7 @@ protected function matches($other): bool
 
     private function createFile(): string
     {
-        return 'vfs://' . hash('sha512', random_bytes(512)) .'.php';
+        return $this->builderCompilePath . '/' . hash('sha512', random_bytes(512)) .'.php';
     }
 
     public function operator(): string

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`},`
`34`	`34`	`"extra": {`
`35`	`35`	`"branch-alias": {`
`36`		`- "dev-main": "0.2.x-dev"`
	`36`	`+ "dev-main": "0.4.x-dev"`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,15 @@`
`13`	`13`
`14`	`14`	`trait ExtractorBuilderAssertTrait`
`15`	`15`	`{`
	`16`	`+ use BuilderAssertTrait;`
	`17`	`+`
`16`	`18`	`abstract public static function assertThat($value, Constraint $constraint, string $message = ''): void;`
`17`	`19`	`abstract public function pipelineRunner(): PipelineRunnerInterface;`
`18`	`20`
`19`	`21`	`protected function assertBuildsExtractorExtractsLike(iterable $expected, DefaultBuilder $builder, string $message = '')`
`20`	`22`	`{`
`21`	`23`	`$this->assertThat($builder, new BuilderProducesCodeThat(`
	`24`	`+ $this->getBuilderCompilePath(),`
`22`	`25`	`new PipelineExtractsLike($expected, fn ($item) => new IsEqual($item), $this->pipelineRunner())`
`23`	`26`	`), $message);`
`24`	`27`	`}`
`@@ -27,6 +30,7 @@ protected function assertBuildsExtractorDoesNotExtractLike(iterable $expected, D`
`27`	`30`	`{`
`28`	`31`	`$this->assertThat($builder, new LogicalNot(`
`29`	`32`	`new BuilderProducesCodeThat(`
	`33`	`+ $this->getBuilderCompilePath(),`
`30`	`34`	`new PipelineExtractsLike($expected, fn ($item) => new IsEqual($item), $this->pipelineRunner())`
`31`	`35`	`),`
`32`	`36`	`), $message);`
`@@ -35,6 +39,7 @@ protected function assertBuildsExtractorDoesNotExtractLike(iterable $expected, D`
`35`	`39`	`protected function assertBuildsExtractorExtractsExactly(iterable $expected, DefaultBuilder $builder, string $message = '')`
`36`	`40`	`{`
`37`	`41`	`$this->assertThat($builder, new BuilderProducesCodeThat(`
	`42`	`+ $this->getBuilderCompilePath(),`
`38`	`43`	`new PipelineExtractsLike($expected, fn ($item) => new IsIdentical($item), $this->pipelineRunner())`
`39`	`44`	`), $message);`
`40`	`45`	`}`
`@@ -43,6 +48,7 @@ protected function assertBuildsExtractorDoesNotExtractExactly(iterable $expected`
`43`	`48`	`{`
`44`	`49`	`$this->assertThat($builder, new LogicalNot(`
`45`	`50`	`new BuilderProducesCodeThat(`
	`51`	`+ $this->getBuilderCompilePath(),`
`46`	`52`	`new PipelineExtractsLike($expected, fn ($item) => new IsIdentical($item), $this->pipelineRunner())`
`47`	`53`	`),`
`48`	`54`	`), $message);`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,15 @@`
`14`	`14`
`15`	`15`	`trait LoaderBuilderAssertTrait`
`16`	`16`	`{`
	`17`	`+ use BuilderAssertTrait;`
	`18`	`+`
`17`	`19`	`abstract public static function assertThat($value, Constraint $constraint, string $message = ''): void;`
`18`	`20`	`abstract public function pipelineRunner(): PipelineRunnerInterface;`
`19`	`21`
`20`	`22`	`protected function assertBuildsLoaderLoadsLike(iterable $expected, iterable $input, DefaultBuilder $builder, string $message = '')`
`21`	`23`	`{`
`22`	`24`	`$this->assertThat($builder, new BuilderProducesCodeThat(`
	`25`	`+ $this->getBuilderCompilePath(),`
`23`	`26`	`new PipelineLoadsLike($expected, $input, fn ($item) => new IsEqual($item), $this->pipelineRunner())`
`24`	`27`	`), $message);`
`25`	`28`	`}`
`@@ -28,6 +31,7 @@ protected function assertBuildsLoaderDoesNotLoadLike(iterable $expected, iterabl`
`28`	`31`	`{`
`29`	`32`	`$this->assertThat($builder, new LogicalNot(`
`30`	`33`	`new BuilderProducesCodeThat(`
	`34`	`+ $this->getBuilderCompilePath(),`
`31`	`35`	`new PipelineLoadsLike($expected, $input, fn ($item) => new IsEqual($item), $this->pipelineRunner())`
`32`	`36`	`),`
`33`	`37`	`), $message);`
`@@ -36,6 +40,7 @@ protected function assertBuildsLoaderDoesNotLoadLike(iterable $expected, iterabl`
`36`	`40`	`protected function assertBuildsLoaderLoadsExactly(iterable $expected, iterable $input, DefaultBuilder $builder, string $message = '')`
`37`	`41`	`{`
`38`	`42`	`$this->assertThat($builder, new BuilderProducesCodeThat(`
	`43`	`+ $this->getBuilderCompilePath(),`
`39`	`44`	`new PipelineLoadsLike($expected, $input, fn ($item) => new IsIdentical($item), $this->pipelineRunner())`
`40`	`45`	`), $message);`
`41`	`46`	`}`
`@@ -44,6 +49,7 @@ protected function assertBuildsLoaderDoesNotLoadExactly(iterable $expected, iter`
`44`	`49`	`{`
`45`	`50`	`$this->assertThat($builder, new LogicalNot(`
`46`	`51`	`new BuilderProducesCodeThat(`
	`52`	`+ $this->getBuilderCompilePath(),`
`47`	`53`	`new PipelineLoadsLike($expected, $input, fn ($item) => new IsIdentical($item), $this->pipelineRunner())`
`48`	`54`	`),`
`49`	`55`	`), $message);`
`@@ -52,6 +58,7 @@ protected function assertBuildsLoaderDoesNotLoadExactly(iterable $expected, iter`
`52`	`58`	`protected function assertBuildsLoaderProducesFile(string $expected, iterable $input, DefaultBuilder $builder, string $message = '')`
`53`	`59`	`{`
`54`	`60`	`$this->assertThat($builder, new BuilderProducesCodeThat(`
	`61`	`+ $this->getBuilderCompilePath(),`
`55`	`62`	`new PipelineWritesFile($input, $expected, $this->pipelineRunner()),`
`56`	`63`	`), $message);`
`57`	`64`	`}`
`@@ -60,6 +67,7 @@ protected function assertBuildsLoaderDoesNotProduceFile(string $expected, iterab`
`60`	`67`	`{`
`61`	`68`	`$this->assertThat($builder, new LogicalNot(`
`62`	`69`	`new BuilderProducesCodeThat(`
	`70`	`+ $this->getBuilderCompilePath(),`
`63`	`71`	`new PipelineWritesFile($input, $expected, $this->pipelineRunner()),`
`64`	`72`	`),`
`65`	`73`	`), $message);`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,14 @@`
`10`	`10`
`11`	`11`	`trait PipelineBuilderAssertTrait`
`12`	`12`	`{`
	`13`	`+ use BuilderAssertTrait;`
	`14`	`+`
`13`	`15`	`abstract public static function assertThat($value, Constraint $constraint, string $message = ''): void;`
`14`	`16`
`15`	`17`	`protected function assertBuilderProducesInstanceOf(string $expected, DefaultBuilder $builder, string $message = '')`
`16`	`18`	`{`
`17`	`19`	`$this->assertThat($builder, new BuilderProducesCodeThat(`
	`20`	`+ $this->getBuilderCompilePath(),`
`18`	`21`	`new IsInstanceOf($expected)`
`19`	`22`	`), $message);`
`20`	`23`	`}`
`@@ -23,6 +26,7 @@ protected function assertBuilderProducesNotInstanceOf(string $expected, DefaultB`
`23`	`26`	`{`
`24`	`27`	`$this->assertThat($builder, new LogicalNot(`
`25`	`28`	`new BuilderProducesCodeThat(`
	`29`	`+ $this->getBuilderCompilePath(),`
`26`	`30`	`new IsInstanceOf($expected)`
`27`	`31`	`),`
`28`	`32`	`), $message);`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,13 @@`
`10`	`10`
`11`	`11`	`final class BuilderProducesCodeThat extends UnaryOperator`
`12`	`12`	`{`
	`13`	`+ public function __construct(`
	`14`	`+ private string $builderCompilePath,`
	`15`	`+ $constraint,`
	`16`	`+ ) {`
	`17`	`+ parent::__construct($constraint);`
	`18`	`+ }`
	`19`	`+`
`13`	`20`	`/**`
`14`	`21`	`* Evaluates the constraint for parameter $other. Returns true if the`
`15`	`22`	`* constraint is met, false otherwise.`
`@@ -52,7 +59,7 @@ protected function matches($other): bool`
`52`	`59`
`53`	`60`	`private function createFile(): string`
`54`	`61`	`{`
`55`		`- return 'vfs://' . hash('sha512', random_bytes(512)) .'.php';`
	`62`	`+ return $this->builderCompilePath . '/' . hash('sha512', random_bytes(512)) .'.php';`
`56`	`63`	`}`
`57`	`64`
`58`	`65`	`public function operator(): string`