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

:octocat: proper cache file saving

Browse Source
This commit is contained in:
smiley
2017-10-25 00:01:06 +02:00
parent 6c00acfc84
commit 3cb3b5b9db
3 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Output/QRMarkup.php
+12 -9
View File
@@ -35,7 +35,7 @@ class QRMarkup extends QROutputAbstract{
/**
* @return string
*/
public function dump():string {
public function dump() {
switch($this->options->type){
case QRCode::OUTPUT_MARKUP_SVG : return $this->toSVG();
case QRCode::OUTPUT_MARKUP_HTML:
@@ -45,9 +45,9 @@ class QRMarkup extends QROutputAbstract{
}
/**
* @return string
* @return string|bool
*/
protected function toHTML():string {
protected function toHTML(){
$html = '';
foreach($this->matrix as $row){
@@ -69,16 +69,21 @@ class QRMarkup extends QROutputAbstract{
$html .= $this->options->eol;
}
if($this->options->cachefile){
$html = '<!DOCTYPE html><head><meta charset="UTF-8"></head><body>'.$this->options->eol.$html.'</body>';
return $this->saveToFile($html);
}
return $html;
}
/**
* @link https://github.com/codemasher/php-qrcode/pull/5
*
* @return string
* @throws \chillerlan\QRCode\Output\QRCodeOutputException
* @return string|bool
*/
protected function toSVG():string {
protected function toSVG(){
$length = $this->pixelCount * $this->options->pixelSize + $this->options->marginSize * 2;
$class = !empty($this->options->cssClass) ? $this->options->cssClass : hash('crc32', microtime(true));
@@ -124,9 +129,7 @@ class QRMarkup extends QROutputAbstract{
if($this->options->cachefile){
$svg = '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">'.$this->options->eol.$svg;
if(@file_put_contents($this->options->cachefile, $svg) === false){
throw new QRCodeOutputException('Could not write to cache file.'); // @codeCoverageIgnore
}
return $this->saveToFile($svg);
}
return $svg;
src/Output/QROutputAbstract.php
+17
View File
@@ -81,4 +81,21 @@ abstract class QROutputAbstract implements QROutputInterface{
return $this;
}
/**
* @param string $data
*
* @return bool
* @throws \chillerlan\QRCode\Output\QRCodeOutputException
*/
protected function saveToFile(string $data):bool {
try{
return (bool)file_put_contents($this->options->cachefile, $data);
}
catch(\Exception $e){
throw new QRCodeOutputException('Could not write to cache file: '.$e->getMessage());
}
}
}
tests/Output/MarkupTest.php
+36
View File
@@ -48,4 +48,40 @@ class MarkupTest extends OutputTestAbstract{
$this->assertEquals(file_get_contents(__DIR__.'/markup/'.$expected), (new QRCode($data, new $this->outputInterfaceClass($this->options)))->output());
}
public function markupTestDataProvider(){
return [
[QRCode::OUTPUT_MARKUP_SVG],
[QRCode::OUTPUT_MARKUP_HTML],
];
}
/**
* @dataProvider markupTestDataProvider
*/
public function testSaveToFile(string $type){
$this->options->type = $type;
$this->options->cssClass = 'foo';
$data = (new QRCode('foo', new $this->outputInterfaceClass($this->options)))->output();
$this->options->cachefile = __DIR__.'/markup/save_test.'.$type;
$this->assertTrue((new QRCode('foo', new $this->outputInterfaceClass($this->options)))->output());
$this->assertContains($data, file_get_contents($this->options->cachefile));
}
/**
* @dataProvider markupTestDataProvider
*
* @expectedException \chillerlan\QRCode\Output\QRCodeOutputException
* @expectedExceptionMessage Could not write to cache file
*/
public function testSaveToFileException(string $type){
$this->options->type = $type;
$this->options->cachefile = '\\foo';
(new QRCode('foo', new $this->outputInterfaceClass($this->options)))->output();
}
}