dependency update

Author: codemasher

composer.json

@@ -23,11 +23,10 @@
 	},
 	"require": {
 		"php": "^7.0.3",
-		"chillerlan/php-traits": "^1.1",
+		"chillerlan/php-traits": "^2.0",
 		"psr/log": "^1.0"
 	},
 	"require-dev": {
-		"chillerlan/php-curl": "^1.0",
 		"guzzlehttp/guzzle": "^6.3",
 		"phpunit/phpunit": "^6.5"
 	},

src/CurlClient.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\HTTP;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Traits\ImmutableSettingsInterface;
 
 /**
  * @property resource $http
@@ -27,11 +27,11 @@ class CurlClient extends HTTPClientAbstract{
 	/**
 	 * CurlClient constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
 	 *
 	 * @throws \chillerlan\HTTP\HTTPClientException
 	 */
-	public function __construct(ContainerInterface $options){
+	public function __construct(ImmutableSettingsInterface $options){
 		parent::__construct($options);
 
 		if(!isset($this->options->ca_info) || !is_file($this->options->ca_info)){

src/GuzzleClient.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\HTTP;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Traits\ImmutableSettingsInterface;
 use GuzzleHttp\Client;
 use Psr\Http\Message\StreamInterface;
 
@@ -24,10 +24,10 @@ class GuzzleClient extends HTTPClientAbstract{
 	/**
 	 * GuzzleClient constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
 	 * @param \GuzzleHttp\Client|null               $http
 	 */
-	public function __construct(ContainerInterface $options, Client $http = null){
+	public function __construct(ImmutableSettingsInterface $options, Client $http = null){
 		parent::__construct($options);
 
 		if($http instanceof Client){

src/HTTPClientAbstract.php

@@ -12,7 +12,7 @@
 
 namespace chillerlan\HTTP;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Traits\ImmutableSettingsInterface;
 use Psr\Log\{
 	LoggerAwareInterface, LoggerAwareTrait, LoggerInterface, NullLogger
 };
@@ -26,7 +26,7 @@ abstract class HTTPClientAbstract implements HTTPClientInterface, LoggerAwareInt
 	protected $http;
 
 	/**
-	 * @var \chillerlan\Traits\ContainerInterface|mixed
+	 * @var \chillerlan\Traits\ImmutableSettingsInterface|mixed
 	 */
 	protected $options;
 
@@ -38,7 +38,7 @@ abstract class HTTPClientAbstract implements HTTPClientInterface, LoggerAwareInt
 	protected $requestHeaders;
 
 	/** @inheritdoc */
-	public function __construct(ContainerInterface $options, LoggerInterface $logger = null){
+	public function __construct(ImmutableSettingsInterface $options, LoggerInterface $logger = null){
 		$this->options = $options;
 		$this->logger  = $logger ?? new NullLogger;
 	}

src/HTTPResponse.php

@@ -13,11 +13,11 @@
 namespace chillerlan\HTTP;
 
 use chillerlan\Traits\{
-	Container, ContainerInterface
+	ImmutableSettingsContainer, ImmutableSettingsInterface
 };
 
-class HTTPResponse implements HTTPResponseInterface, ContainerInterface{
-	use Container{
+class HTTPResponse implements HTTPResponseInterface, ImmutableSettingsInterface{
+	use ImmutableSettingsContainer{
 		__get as containerGet;
 	}
 

src/StreamClient.php

@@ -12,18 +12,18 @@
 
 namespace chillerlan\HTTP;
 
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\Traits\ImmutableSettingsInterface;
 
 class StreamClient extends HTTPClientAbstract{
 
 	/**
 	 * StreamClient constructor.
 	 *
-	 * @param \chillerlan\Traits\ContainerInterface $options
+	 * @param \chillerlan\Traits\ImmutableSettingsInterface $options
 	 *
 	 * @throws \chillerlan\HTTP\HTTPClientException
 	 */
-	public function __construct(ContainerInterface $options){
+	public function __construct(ImmutableSettingsInterface $options){
 		parent::__construct($options);
 
 		if(!isset($this->options->ca_info) || !is_file($this->options->ca_info)){

src/TinyCurlClient.php

@@ -12,10 +12,8 @@
 
 namespace chillerlan\HTTPTest;
 
-use chillerlan\HTTP\HTTPClientInterface;
-use chillerlan\HTTP\HTTPOptionsTrait;
-use chillerlan\Traits\Container;
-use chillerlan\Traits\ContainerInterface;
+use chillerlan\HTTP\{HTTPClientInterface, HTTPOptionsTrait};
+use chillerlan\Traits\{ImmutableSettingsContainer, ImmutableSettingsInterface};
 use PHPUnit\Framework\TestCase;
 
 abstract class HTTPClientTestAbstract extends TestCase{
@@ -29,7 +27,7 @@ abstract class HTTPClientTestAbstract extends TestCase{
 	protected $http;
 
 	/**
-	 * @var \chillerlan\Traits\ContainerInterface
+	 * @var \chillerlan\Traits\ImmutableSettingsInterface
 	 */
 	protected $options;
 
@@ -40,9 +38,9 @@ protected function setUp(){
 		]);
 	}
 
-	protected function getOptions(array $arr = null):ContainerInterface{
-		return new class($arr ?? []) implements ContainerInterface{
-			use Container, HTTPOptionsTrait;
+	protected function getOptions(array $arr = null):ImmutableSettingsInterface{
+		return new class($arr ?? []) implements ImmutableSettingsInterface{
+			use ImmutableSettingsContainer, HTTPOptionsTrait;
 		};
 	}