dependency update

Author: codemasher

composer.json

@@ -23,11 +23,11 @@
 		"php": "^7.2",
 		"psr/log": "^1.0",
 		"psr/simple-cache": "^1.0",
-		"chillerlan/php-traits": "^1.1"
+		"chillerlan/php-settings-container": "^1.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^7.1",
-		"chillerlan/php-database": "^2.0",
+		"phpunit/phpunit": "^7.5",
+		"chillerlan/php-database": "^3.0",
 		"ezyang/htmlpurifier": "^4.10"
 	},
 	"autoload": {

src/BBCode.php

@@ -13,19 +13,17 @@
 namespace chillerlan\BBCode;
 
 use chillerlan\BBCode\Output\BBCodeOutputInterface;
-use chillerlan\Traits\{
-	ClassLoader, ContainerInterface
-};
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\{
 	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger
 };
 use Psr\SimpleCache\CacheInterface;
 
 class BBCode implements LoggerAwareInterface{
-	use ClassLoader, LoggerAwareTrait;
+	use LoggerAwareTrait;
 
 	/**
-	 * @var \chillerlan\BBCode\BBCodeOptions|\chillerlan\Traits\ContainerInterface
+	 * @var \chillerlan\BBCode\BBCodeOptions|\chillerlan\Settings\SettingsContainerInterface
 	 */
 	protected $options;
 
@@ -67,11 +65,11 @@ class BBCode implements LoggerAwareInterface{
 	/**
 	 * BBCode constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface|null $options
-	 * @param \Psr\SimpleCache\CacheInterface|null       $cache
-	 * @param \Psr\Log\LoggerInterface|null              $logger
+	 * @param \chillerlan\Settings\SettingsContainerInterface|null $options
+	 * @param \Psr\SimpleCache\CacheInterface|null                 $cache
+	 * @param \Psr\Log\LoggerInterface|null                        $logger
 	 */
-	public function __construct(ContainerInterface $options = null, CacheInterface $cache = null, LoggerInterface $logger = null){
+	public function __construct(SettingsContainerInterface $options = null, CacheInterface $cache = null, LoggerInterface $logger = null){
 		$this
 			->setCache($cache ?? new BBCache)
 			->setLogger($logger ?? new NullLogger);
@@ -112,12 +110,12 @@ public function setCache(CacheInterface $cache):BBCode{
 	/**
 	 * @todo
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 *
 	 * @throws \chillerlan\BBCode\BBCodeException
 	 * @return \chillerlan\BBCode\BBCode
 	 */
-	public function setOptions(ContainerInterface $options):BBCode{
+	public function setOptions(SettingsContainerInterface $options):BBCode{
 		$this->options = $options;
 
 		mb_internal_encoding('UTF-8');
@@ -138,16 +136,28 @@ public function setOptions(ContainerInterface $options):BBCode{
 		}
 
 		if($this->options->sanitizeInput || $this->options->sanitizeOutput){
-			$this->sanitizerInterface  = $this->loadClass($this->options->sanitizerInterface, SanitizerInterface::class, $this->options);
+			$this->sanitizerInterface  = new $this->options->sanitizerInterface($this->options);
+
+			if(!$this->sanitizerInterface instanceof SanitizerInterface){
+				throw new BBcodeException('invalid SanitizerInterface');
+			}
 		}
 
 
 
 		if($this->options->preParse || $this->options->postParse){
-			$this->parserMiddleware = $this->loadClass($this->options->parserMiddlewareInterface, ParserMiddlewareInterface::class, $this->options, $this->cache, $this->logger);
+			$this->parserMiddleware = new $this->options->parserMiddlewareInterface($this->options, $this->cache, $this->logger);
+
+			if(!$this->parserMiddleware instanceof ParserMiddlewareInterface){
+				throw new BBcodeException('invalid ParserMiddlewareInterface');
+			}
 		}
 
-		$this->outputInterface = $this->loadClass($this->options->outputInterface, BBCodeOutputInterface::class, $this->options, $this->cache, $this->logger);
+		$this->outputInterface = new $this->options->outputInterface($this->options, $this->cache, $this->logger);
+
+		if(!$this->outputInterface instanceof BBCodeOutputInterface){
+			throw new BBcodeException('invalid BBCodeOutputInterface');
+		}
 
 		$this->tags    = $this->outputInterface->getTags();
 		$this->noparse = $this->outputInterface->getNoparse();

src/BBCodeOptions.php

@@ -12,7 +12,8 @@
 
 namespace chillerlan\BBCode;
 
-use chillerlan\Traits\ContainerAbstract;
+
+use chillerlan\Settings\SettingsContainerAbstract;
 
 /**
  * @property string $sanitizerInterface
@@ -32,6 +33,6 @@
  * @property array  $allowedTags
  * @property bool   $allowAvailableTags
  */
-class BBCodeOptions extends ContainerAbstract{
+class BBCodeOptions extends SettingsContainerAbstract{
 	use BBCodeOptionsTrait;
 }

src/Output/BBCodeModuleAbstract.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\BBCode\Output;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -60,7 +60,14 @@ abstract class BBCodeModuleAbstract implements BBCodeModuleInterface{
 	 */
 	protected $logger;
 
-	public function __construct(ContainerInterface $options, CacheInterface $cache, LoggerInterface $logger){
+	/**
+	 * BBCodeModuleAbstract constructor.
+	 *
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
+	 * @param \Psr\SimpleCache\CacheInterface                 $cache
+	 * @param \Psr\Log\LoggerInterface                        $logger
+	 */
+	public function __construct(SettingsContainerInterface $options, CacheInterface $cache, LoggerInterface $logger){
 		$this->options = $options;
 		$this->cache   = $cache;
 		$this->logger  = $logger;

src/Output/BBCodeModuleInterface.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\BBCode\Output;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -21,11 +21,11 @@ interface BBCodeModuleInterface{
 	/**
 	 * BBCodeModuleInterface constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface       $cache
 	 * @param \Psr\Log\LoggerInterface              $logger
 	 */
-	public function __construct(ContainerInterface $options, CacheInterface $cache, LoggerInterface $logger);
+	public function __construct(SettingsContainerInterface $options, CacheInterface $cache, LoggerInterface $logger);
 
 	/**
 	 * @return array

src/Output/BBCodeOutputAbstract.php

@@ -12,9 +12,7 @@
 
 namespace chillerlan\BBCode\Output;
 
-use chillerlan\Traits\{
-	ClassLoader, ContainerInterface
-};
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -73,11 +71,11 @@ abstract class BBCodeOutputAbstract implements BBCodeOutputInterface{
 	/**
 	 * BBCodeOutputInterface constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface  $cache
 	 * @param \Psr\Log\LoggerInterface         $logger
 	 */
-	public function __construct(ContainerInterface $options, CacheInterface $cache, LoggerInterface $logger){
+	public function __construct(SettingsContainerInterface $options, CacheInterface $cache, LoggerInterface $logger){
 		$options->replacement_eol = $options->replacement_eol ?? $this->eol;
 
 		$this->options = $options;
@@ -86,7 +84,8 @@ public function __construct(ContainerInterface $options, CacheInterface $cache,
 
 		foreach($this->modules as $module){
 			/** @var \chillerlan\BBCode\Output\BBCodeModuleInterface $moduleInterface */
-			$moduleInterface = $this->loadClass($module, BBCodeModuleInterface::class, $this->options, $this->cache, $this->logger);
+			$moduleInterface = new $module($this->options, $this->cache, $this->logger);
+
 			foreach($moduleInterface->getTags() as $tag){
 				$this->tagmap[$tag] = $module;
 			}

src/Output/BBCodeOutputInterface.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\BBCode\Output;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\SimpleCache\CacheInterface;
 
@@ -21,11 +21,11 @@ interface BBCodeOutputInterface{
 	/**
 	 * BBCodeOutputInterface constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 * @param \Psr\SimpleCache\CacheInterface  $cache
 	 * @param \Psr\Log\LoggerInterface         $logger
 	 */
-	public function __construct(ContainerInterface $options, CacheInterface $cache, LoggerInterface $logger);
+	public function __construct(SettingsContainerInterface $options, CacheInterface $cache, LoggerInterface $logger);
 
 	/**
 	 * returns a list of tags the output interface is able to process

src/SanitizerAbstract.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\BBCode;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Settings\SettingsContainerInterface;
 
 abstract class SanitizerAbstract implements SanitizerInterface{
 
@@ -24,9 +24,9 @@ abstract class SanitizerAbstract implements SanitizerInterface{
 	/**
 	 * SanitizerInterface constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Settings\SettingsContainerInterface $options
 	 */
-	public function __construct(ContainerInterface $options){
+	public function __construct(SettingsContainerInterface $options){
 		$this->options = $options;
 	}