geckon01/php-qrcode
1
0
Fork 0
mirror of https://github.com/chillerlan/php-qrcode.git synced 2026-08-17 18:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

:octocat: rework output interface invocation

Browse Source
This commit is contained in:
smiley
2023-03-02 23:04:23 +01:00
parent ca56fe5ca9
commit c474cc704e
2 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/QRCode.php
+8 -16
View File
@@ -267,28 +267,20 @@ class QRCode{
* @throws \chillerlan\QRCode\Output\QRCodeOutputException
*/
protected function initOutputInterface(QRMatrix $matrix):QROutputInterface{
$outputInterface = QROutputInterface::MODES[$this->options->outputType] ?? null;
if($this->options->outputType === QROutputInterface::CUSTOM){
if(!class_exists($this->options->outputInterface)){
throw new QRCodeOutputException('invalid custom output module');
}
if(!in_array(QROutputInterface::class, class_implements($this->options->outputInterface))){
throw new QRCodeOutputException('custom output module does not implement QROutputInterface');
}
/** @phan-suppress-next-line PhanTypeExpectedObjectOrClassName */
return new $this->options->outputInterface($this->options, $matrix);
$outputInterface = $this->options->outputInterface;
}
$outputInterface = QROutputInterface::MODES[$this->options->outputType] ?? false;
if($outputInterface){
return new $outputInterface($this->options, $matrix);
if(!$outputInterface || !class_exists($outputInterface)){
throw new QRCodeOutputException('invalid output module');
}
throw new QRCodeOutputException('invalid output type');
if(!in_array(QROutputInterface::class, class_implements($outputInterface))){
throw new QRCodeOutputException('output module does not implement QROutputInterface');
}
return new $outputInterface($this->options, $matrix);
}
/**
tests/QRCodeTest.php
+29 -4
View File
@@ -11,16 +11,16 @@
namespace chillerlan\QRCodeTest;
use chillerlan\QRCode\{QROptions, QRCode};
use chillerlan\QRCode\Data\QRCodeDataException;
use chillerlan\QRCode\Output\QRCodeOutputException;
use chillerlan\QRCode\Output\{QRCodeOutputException, QROutputInterface};
use PHPUnit\Framework\TestCase;
use stdClass;
/**
* Tests basic functions of the QRCode class
*/
final class QRCodeTest extends TestCase{
private QRCode $qrcode;
private QRCode $qrcode;
private QROptions $options;
/**
@@ -36,11 +36,36 @@ final class QRCodeTest extends TestCase{
*/
public function testInitOutputInterfaceException():void{
$this->expectException(QRCodeOutputException::class);
$this->expectExceptionMessage('invalid output type');
$this->expectExceptionMessage('invalid output module');
$this->options->outputType = 'foo';
(new QRCode($this->options))->render('test');
}
/**
* tests if an exception is thrown if the given output class does not exist
*/
public function testInitCustomOutputInterfaceNotExistsException():void{
$this->expectException(QRCodeOutputException::class);
$this->expectExceptionMessage('invalid output module');
$this->options->outputType = QROutputInterface::CUSTOM;
(new QRCode($this->options))->render('test');
}
/**
* tests if an exception is thrown if the given output class does not implement QROutputInterface
*/
public function testInitCustomOutputInterfaceNotImplementsException():void{
$this->expectException(QRCodeOutputException::class);
$this->expectExceptionMessage('output module does not implement QROutputInterface');
$this->options->outputType = QROutputInterface::CUSTOM;
$this->options->outputInterface = stdClass::class;
(new QRCode($this->options))->render('test');
}
}