diff --git a/examples/example.php b/examples/example.php
index 44520ff92..c0c71bf7f 100644
--- a/examples/example.php
+++ b/examples/example.php
@@ -9,6 +9,8 @@
require_once '../vendor/autoload.php';
+use chillerlan\QRCode\Output\QRMarkup;
+use chillerlan\QRCode\Output\QRMarkupOptions;
use chillerlan\QRCode\QRCode;
use chillerlan\QRCode\Output\QRImage;
use chillerlan\QRCode\Output\QRString;
@@ -62,13 +64,26 @@ $data = 'otpauth://totp/test?secret=B3JX4VCVJDVNXNZ5&issuer=chillerlan.net';
output().'" />';
-echo ''.(new QRCode($data, new QRString))->output().'
';
+// image
+echo ')->output().')
';
-$qrStringOptions = new QRStringOptions;
-$qrStringOptions->type = QRCode::OUTPUT_STRING_TEXT;
+// markup - svg
+echo ''.(new QRCode($data, new QRMarkup))->output().'
';
-echo ''.(new QRCode($data, new QRString($qrStringOptions)))->output().'
';
+// markup - html
+$outputOptions = new QRMarkupOptions;
+$outputOptions->type = QRCode::OUTPUT_MARKUP_HTML;
+
+echo ''.(new QRCode($data, new QRMarkup($outputOptions)))->output().'
';
+
+// string - json
+echo ''.(new QRCode($data, new QRString))->output().'';
+
+// string - text
+$outputOptions = new QRStringOptions;
+$outputOptions->type = QRCode::OUTPUT_STRING_TEXT;
+
+echo ''.(new QRCode($data, new QRString($outputOptions)))->output().'
';
?>
diff --git a/examples/html.php b/examples/html.php
index 7c3d1ce08..3824a06fc 100644
--- a/examples/html.php
+++ b/examples/html.php
@@ -2,8 +2,8 @@
require_once '../vendor/autoload.php';
-use chillerlan\QRCode\Output\QRString;
-use chillerlan\QRCode\Output\QRStringOptions;
+use chillerlan\QRCode\Output\QRMarkup;
+use chillerlan\QRCode\Output\QRMarkupOptions;
use chillerlan\QRCode\QRCode;
use chillerlan\QRCode\QROptions;
@@ -42,14 +42,13 @@ echo '';
-$qrStringOptions = new QRStringOptions;
-$qrStringOptions->type = QRCode::OUTPUT_STRING_HTML;
-$qrStringOptions->eol = '';
+$qrStringOptions = new QRMarkupOptions;
+$qrStringOptions->type = QRCode::OUTPUT_MARKUP_HTML;
$qrOptions = new QROptions;
$qrOptions->typeNumber = QRCode::TYPE_05;
-$qrOptions->errorCorrectLevel = QRCode::ERROR_CORRECT_LEVEL_M;
+$qrOptions->errorCorrectLevel = QRCode::ERROR_CORRECT_LEVEL_L;
-$qr = new QRCode('skype://callto:echo123', new QRString($qrStringOptions), $qrOptions);
+$qr = new QRCode('skype://callto:echo123', new QRMarkup($qrStringOptions), $qrOptions);
echo ''.$qr->output().'
';
diff --git a/examples/image.php b/examples/image.php
index b8497eec6..672df2012 100644
--- a/examples/image.php
+++ b/examples/image.php
@@ -8,8 +8,8 @@ use chillerlan\QRCode\QRCode;
$qrImageOptions = new QRImageOptions;
$qrImageOptions->pixelSize = 10;
-#$qrImageOptions->cachefile = 'example_image.png';
+$qrImageOptions->cachefile = 'example_image.png';
-$im = (new QRCode('https://www.youtube.com/watch?v=DLzxrzFCyOs&t=43s', new QRImage($qrImageOptions)))->output();
+(new QRCode('https://www.youtube.com/watch?v=DLzxrzFCyOs&t=43s', new QRImage($qrImageOptions)))->output();
-echo '
';
+echo '
';