Merge pull request #4 from dotkernel/develop

Develop
dotkernel · Mar 15, 2017 · 8d5a8e4 · 8d5a8e4
2 parents bcd1d28 + 1cc7db1
commit 8d5a8e4
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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')