Merge branch 'master' into php-7.4

# Conflicts:
#	tests/Output/QROutputTestAbstract.php
This commit is contained in:
codemasher
2019-12-04 19:02:13 +01:00
7 changed files with 111 additions and 32 deletions
+8 -3
View File
@@ -18,11 +18,11 @@ use chillerlan\QRCode\Output\{QRCodeOutputException, QROutputInterface};
use chillerlan\QRCodeTest\QRTestAbstract;
use chillerlan\Settings\SettingsContainerInterface;
/**
*/
use function dirname, file_exists, mkdir;
abstract class QROutputTestAbstract extends QRTestAbstract{
protected const cachefile = __DIR__.'/output_test.';
protected const cachefile = __DIR__.'/../../.build/output_test/test.';
protected QROutputInterface $outputInterface;
/** @var \chillerlan\Settings\SettingsContainerInterface|\chillerlan\QRCode\QROptions */
@@ -33,6 +33,11 @@ abstract class QROutputTestAbstract extends QRTestAbstract{
protected function setUp():void{
parent::setUp();
$buildDir = dirname($this::cachefile);
if(!file_exists($buildDir)){
mkdir($buildDir, 0777, true);
}
$this->options = new QROptions;
$this->setOutputInterface();
}