From 0044e686ff319959f0b8cd1a47b9c147fab0801f Mon Sep 17 00:00:00 2001
From: codemasher <smiley@chillerlan.net>
Date: Tue, 13 Mar 2018 18:34:39 +0100
Subject: [PATCH] :octocat: accept the ContainerInterface instead of QROptions

---
 src/Data/QRDataAbstract.php     |  7 ++++---
 src/Output/QROutputAbstract.php |  9 +++++----
 src/QRCode.php                  | 12 +++++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Data/QRDataAbstract.php b/src/Data/QRDataAbstract.php
index 2c5698d4c..3ec3a2a9e 100644
--- a/src/Data/QRDataAbstract.php
+++ b/src/Data/QRDataAbstract.php
@@ -19,6 +19,7 @@ use chillerlan\QRCode\Helpers\{
 	BitBuffer, Polynomial
 };
 use chillerlan\Traits\ClassLoader;
+use chillerlan\Traits\ContainerInterface;
 
 /**
  * Processes the binary data and maps it on a matrix which is then being returned
@@ -88,10 +89,10 @@ abstract class QRDataAbstract implements QRDataInterface{
 	/**
 	 * QRDataInterface constructor.
 	 *
-	 * @param \chillerlan\QRCode\QROptions $options
-	 * @param string|null                  $data
+	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param string|null                           $data
 	 */
-	public function __construct(QROptions $options, string $data = null){
+	public function __construct(ContainerInterface $options, string $data = null){
 		$this->options = $options;
 
 		if($data !== null){
diff --git a/src/Output/QROutputAbstract.php b/src/Output/QROutputAbstract.php
index 3a73f0b05..823450014 100644
--- a/src/Output/QROutputAbstract.php
+++ b/src/Output/QROutputAbstract.php
@@ -13,8 +13,9 @@
 namespace chillerlan\QRCode\Output;
 
 use chillerlan\QRCode\{
-	Data\QRMatrix, QRCode, QROptions
+	Data\QRMatrix, QRCode
 };
+use chillerlan\Traits\ContainerInterface;
 
 /**
  *
@@ -49,10 +50,10 @@ abstract class QROutputAbstract implements QROutputInterface{
 	/**
 	 * QROutputAbstract constructor.
 	 *
-	 * @param \chillerlan\QRCode\QROptions     $options
-	 * @param \chillerlan\QRCode\Data\QRMatrix $matrix
+	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\QRCode\Data\QRMatrix      $matrix
 	 */
-	public function __construct(QROptions $options, QRMatrix $matrix){
+	public function __construct(ContainerInterface $options, QRMatrix $matrix){
 		$this->options     = $options;
 		$this->matrix      = $matrix;
 		$this->moduleCount = $this->matrix->size();
diff --git a/src/QRCode.php b/src/QRCode.php
index c2d0cbe6c..a2d9cd0aa 100755
--- a/src/QRCode.php
+++ b/src/QRCode.php
@@ -18,7 +18,9 @@ use chillerlan\QRCode\Data\{
 use chillerlan\QRCode\Output\{
 	QRCodeOutputException, QRImage, QRMarkup, QROutputInterface, QRString
 };
-use chillerlan\Traits\ClassLoader;
+use chillerlan\Traits\{
+	ClassLoader, ContainerInterface
+};
 
 /**
  * Turns a text string into a Model 2 QR Code
@@ -104,9 +106,9 @@ class QRCode{
 	/**
 	 * QRCode constructor.
 	 *
-	 * @param \chillerlan\QRCode\QROptions|null $options
+	 * @param \chillerlan\Traits\ContainerInterface|null $options
 	 */
-	public function __construct(QROptions $options = null){
+	public function __construct(ContainerInterface $options = null){
 		mb_internal_encoding('UTF-8');
 
 		$this->setOptions($options ?? new QROptions);
@@ -115,12 +117,12 @@ class QRCode{
 	/**
 	 * Sets the options, called internally by the constructor
 	 *
-	 * @param \chillerlan\QRCode\QROptions $options
+	 * @param \chillerlan\Traits\ContainerInterface $options
 	 *
 	 * @return \chillerlan\QRCode\QRCode
 	 * @throws \chillerlan\QRCode\QRCodeException
 	 */
-	public function setOptions(QROptions $options):QRCode{
+	public function setOptions(ContainerInterface $options):QRCode{
 
 		if(!array_key_exists($options->eccLevel, $this::ECC_MODES)){
 			throw new QRCodeException('Invalid error correct level: '.$options->eccLevel);