🚿 move and exclude test traits

codemasher · codemasher · commit 8237857cc3af · 2025-11-01T21:28:10.000+01:00
diff --git a/benchmark/BenchmarkAbstract.php b/benchmark/BenchmarkAbstract.php
@@ -14,7 +14,7 @@
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Common\{EccLevel, Mode, Version};
 use chillerlan\QRCode\Data\QRMatrix;
-use chillerlan\QRCodeTest\QRMaxLengthTrait;
+use chillerlan\QRCodeTest\Traits\QRMaxLengthTrait;
 use PhpBench\Attributes\{Iterations, ParamProviders, Revs, Warmup};
 use Generator, RuntimeException;
 use function extension_loaded, is_dir, mb_substr, mkdir, sprintf, str_repeat, str_replace;
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,8 @@
 	<testsuites>
 		<testsuite name="php-qrcode test suite">
 			<directory>tests</directory>
-			<exclude>tests/Performance</exclude>
+			<exclude>tests/samples</exclude>
+			<exclude>tests/Traits</exclude>
 		</testsuite>
 	</testsuites>
 	<source>
diff --git a/tests/Data/DataInterfaceTestAbstract.php b/tests/Data/DataInterfaceTestAbstract.php
@@ -14,7 +14,7 @@
 use chillerlan\QRCode\Common\{BitBuffer, EccLevel, MaskPattern, Mode, Version};
 use chillerlan\QRCode\Data\{QRCodeDataException, QRData, QRDataModeInterface, QRMatrix};
 use chillerlan\QRCode\QROptions;
-use chillerlan\QRCodeTest\QRMaxLengthTrait;
+use chillerlan\QRCodeTest\Traits\QRMaxLengthTrait;
 use Exception, Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\ExpectationFailedException;
diff --git a/tests/Data/QRDataTest.php b/tests/Data/QRDataTest.php
@@ -19,7 +19,7 @@
 use chillerlan\QRCode\Output\QRGdImagePNG;
 use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
-use chillerlan\QRCodeTest\QRMatrixDebugTrait;
+use chillerlan\QRCodeTest\Traits\QRMatrixDebugTrait;
 use PHPUnit\Framework\TestCase;
 
 final class QRDataTest extends TestCase{
diff --git a/tests/Data/QRMatrixTest.php b/tests/Data/QRMatrixTest.php
@@ -14,7 +14,7 @@
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Common\{EccLevel, MaskPattern, Version};
 use chillerlan\QRCode\Data\{QRCodeDataException, QRMatrix};
-use chillerlan\QRCodeTest\QRMatrixDebugTrait;
+use chillerlan\QRCodeTest\Traits\QRMatrixDebugTrait;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Generator;
diff --git a/tests/Output/QRFpdfTest.php b/tests/Output/QRFpdfTest.php
@@ -14,6 +14,7 @@
 use chillerlan\QRCode\QROptions;
 use chillerlan\QRCode\Data\QRMatrix;
 use chillerlan\QRCode\Output\{QRFpdf, QROutputInterface};
+use chillerlan\QRCodeTest\Traits\RGBArrayModuleValueProviderTrait;
 use chillerlan\Settings\SettingsContainerInterface;
 use FPDF;
 use function class_exists;
diff --git a/tests/Output/QRGdImageTestAbstract.php b/tests/Output/QRGdImageTestAbstract.php
@@ -14,6 +14,7 @@
 namespace chillerlan\QRCodeTest\Output;
 
 use chillerlan\QRCode\Data\QRMatrix;
+use chillerlan\QRCodeTest\Traits\RGBArrayModuleValueProviderTrait;
 use GdImage;
 use function extension_loaded;
 
diff --git a/tests/Output/QRInterventionImageTest.php b/tests/Output/QRInterventionImageTest.php
@@ -15,6 +15,7 @@
 use chillerlan\QRCode\Output\QRInterventionImage;
 use chillerlan\QRCode\Output\QROutputInterface;
 use chillerlan\QRCode\QROptions;
+use chillerlan\QRCodeTest\Traits\CssColorModuleValueProviderTrait;
 use chillerlan\Settings\SettingsContainerInterface;
 use Intervention\Image\Interfaces\ImageInterface;
 use function extension_loaded;
diff --git a/tests/Output/QRMarkupTestAbstract.php b/tests/Output/QRMarkupTestAbstract.php
@@ -12,6 +12,7 @@
 namespace chillerlan\QRCodeTest\Output;
 
 use chillerlan\QRCode\Data\QRMatrix;
+use chillerlan\QRCodeTest\Traits\CssColorModuleValueProviderTrait;
 
 /**
  * Tests the QRMarkup output module
diff --git a/tests/Output/QROutputTestAbstract.php b/tests/Output/QROutputTestAbstract.php
@@ -11,7 +11,7 @@
 
 namespace chillerlan\QRCodeTest\Output;
 
-use chillerlan\QRCodeTest\BuildDirTrait;
+use chillerlan\QRCodeTest\Traits\BuildDirTrait;
 use chillerlan\QRCode\{QRCode, QROptions};
 use chillerlan\QRCode\Data\QRMatrix;
 use chillerlan\QRCode\Output\{QRCodeOutputException, QROutputInterface};
diff --git a/tests/Output/QRStringJSONTest.php b/tests/Output/QRStringJSONTest.php
@@ -14,6 +14,7 @@
 use chillerlan\QRCode\QROptions;
 use chillerlan\QRCode\Data\QRMatrix;
 use chillerlan\QRCode\Output\{QROutputInterface, QRStringJSON};
+use chillerlan\QRCodeTest\Traits\CssColorModuleValueProviderTrait;
 use chillerlan\Settings\SettingsContainerInterface;
 
 final class QRStringJSONTest extends QROutputTestAbstract{
diff --git a/tests/QRCodeReaderTestAbstract.php b/tests/QRCodeReaderTestAbstract.php
@@ -18,11 +18,11 @@
 use chillerlan\QRCode\Common\{EccLevel, LuminanceSourceInterface, Mode, Version};
 use chillerlan\QRCode\Decoder\Decoder;
 use chillerlan\QRCode\Output\QRGdImagePNG;
+use chillerlan\QRCodeTest\Traits\{QRMatrixDebugTrait, QRMaxLengthTrait};
 use chillerlan\Settings\SettingsContainerInterface;
 use PHPUnit\Framework\Attributes\{DataProvider, Group};
 use PHPUnit\Framework\TestCase;
-use Exception, Generator;
-use RuntimeException;
+use Exception, Generator, RuntimeException;
 use function array_map, defined, realpath, sprintf, str_repeat, substr;
 
 /**
diff --git a/tests/QRCodeTest.php b/tests/QRCodeTest.php
@@ -13,6 +13,7 @@
 
 use chillerlan\QRCode\{QROptions, QRCode};
 use chillerlan\QRCode\Output\QRCodeOutputException;
+use chillerlan\QRCodeTest\Traits\BuildDirTrait;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
diff --git a/tests/Traits/BuildDirTrait.php b/tests/Traits/BuildDirTrait.php
@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\QRCodeTest;
+namespace chillerlan\QRCodeTest\Traits;
 
 use RuntimeException;
 use function dirname, file_exists, file_get_contents, is_file, mkdir, realpath, sprintf, trim;
@@ -19,13 +19,13 @@
  */
 trait BuildDirTrait{
 
-	private string $_buildDir = __DIR__.'/../.build/';
+	protected const _buildDir = __DIR__.'/../../.build/';
 
 	/**
 	 * returns the full raw path to the build dir
 	 */
 	protected function getBuildPath(string $subPath):string{
-		return $this->_buildDir.trim($subPath, '\\/');
+		return $this::_buildDir.trim($subPath, '\\/');
 	}
 
 	/**
diff --git a/tests/Traits/CssColorModuleValueProviderTrait.php b/tests/Traits/CssColorModuleValueProviderTrait.php
@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\QRCodeTest\Output;
+namespace chillerlan\QRCodeTest\Traits;
 
 /**
  * A data provider for use in tests that include CssColorModuleValueTrait
diff --git a/tests/Traits/QRMatrixDebugTrait.php b/tests/Traits/QRMatrixDebugTrait.php
@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\QRCodeTest;
+namespace chillerlan\QRCodeTest\Traits;
 
 use chillerlan\QRCode\QROptions;
 use chillerlan\QRCode\Data\QRMatrix;
diff --git a/tests/Traits/QRMaxLengthTrait.php b/tests/Traits/QRMaxLengthTrait.php
@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\QRCodeTest;
+namespace chillerlan\QRCodeTest\Traits;
 
 use chillerlan\QRCode\Common\{EccLevel, Mode, Version};
 use chillerlan\QRCode\QRCodeException;
diff --git a/tests/Traits/RGBArrayModuleValueProviderTrait.php b/tests/Traits/RGBArrayModuleValueProviderTrait.php
@@ -9,7 +9,7 @@
  */
 declare(strict_types=1);
 
-namespace chillerlan\QRCodeTest\Output;
+namespace chillerlan\QRCodeTest\Traits;
 
 /**
  * A data provider for use in tests that include RGBArrayModuleValueTrait
