From 1cc7db12ef9d9f8888e101e512cf9c17cde7b87b Mon Sep 17 00:00:00 2001 From: n3vrax Date: Thu, 16 Mar 2017 00:36:03 +0200 Subject: [PATCH] updates to PSR11 container dependencies updates --- CHANGELOG.md | 19 +++++++++++++++++++ composer.json | 6 +++--- src/Factory/FilterPluginManagerFactory.php | 6 +++++- src/Factory/FormatterPluginManagerFactory.php | 6 +++++- src/Factory/ProcessorPluginManagerFactory.php | 6 +++++- src/Factory/WriterPluginManagerFactory.php | 6 +++++- 6 files changed, 42 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37ff177..c24d8a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +## 1.1.0 - 2017-03-16 + +### Changed +* updates to PSR11 container where possible +* dependencies updates + +### Added +* Nothing + +### Deprecated +* Nothing + +### Removed +* Nothing + +### Fixed +* Nothing + + ## 1.0.1 - 2017-03-11 Updated php file headers doc blocks diff --git a/composer.json b/composer.json index 188c6df..1598192 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,7 @@ "require": { "php": "^7.1", "psr/http-message": "^1.0", - "container-interop/container-interop": "^1.1", - "zendframework/zend-servicemanager": "^3.0", + "zendframework/zend-servicemanager": "^3.3.0", "zendframework/zend-log": "^2.9.0" }, "require-dev": { @@ -34,7 +33,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.1-dev", + "dev-develop": "1.2-dev" } } } diff --git a/src/Factory/FilterPluginManagerFactory.php b/src/Factory/FilterPluginManagerFactory.php index 75c0937..25eb776 100644 --- a/src/Factory/FilterPluginManagerFactory.php +++ b/src/Factory/FilterPluginManagerFactory.php @@ -9,7 +9,7 @@ namespace Dot\Log\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Zend\Log\FilterPluginManager; /** @@ -18,6 +18,10 @@ */ class FilterPluginManagerFactory { + /** + * @param ContainerInterface $container + * @return FilterPluginManager + */ public function __invoke(ContainerInterface $container) { $config = $container->has('config') diff --git a/src/Factory/FormatterPluginManagerFactory.php b/src/Factory/FormatterPluginManagerFactory.php index a56b441..27b4dd6 100644 --- a/src/Factory/FormatterPluginManagerFactory.php +++ b/src/Factory/FormatterPluginManagerFactory.php @@ -9,7 +9,7 @@ namespace Dot\Log\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Zend\Log\FormatterPluginManager; /** @@ -18,6 +18,10 @@ */ class FormatterPluginManagerFactory { + /** + * @param ContainerInterface $container + * @return FormatterPluginManager + */ public function __invoke(ContainerInterface $container) { $config = $container->has('config') diff --git a/src/Factory/ProcessorPluginManagerFactory.php b/src/Factory/ProcessorPluginManagerFactory.php index baa25ab..dfee3a4 100644 --- a/src/Factory/ProcessorPluginManagerFactory.php +++ b/src/Factory/ProcessorPluginManagerFactory.php @@ -9,7 +9,7 @@ namespace Dot\Log\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Zend\Log\ProcessorPluginManager; /** @@ -18,6 +18,10 @@ */ class ProcessorPluginManagerFactory { + /** + * @param ContainerInterface $container + * @return ProcessorPluginManager + */ public function __invoke(ContainerInterface $container) { $config = $container->has('config') diff --git a/src/Factory/WriterPluginManagerFactory.php b/src/Factory/WriterPluginManagerFactory.php index e44b9c5..09a081e 100644 --- a/src/Factory/WriterPluginManagerFactory.php +++ b/src/Factory/WriterPluginManagerFactory.php @@ -9,7 +9,7 @@ namespace Dot\Log\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Zend\Log\WriterPluginManager; /** @@ -18,6 +18,10 @@ */ class WriterPluginManagerFactory { + /** + * @param ContainerInterface $container + * @return WriterPluginManager + */ public function __invoke(ContainerInterface $container) { $config = $container->has('config')