Merge pull request #6 from dotkernel/develop

updated factories to PSR11 container
dotkernel · Mar 15, 2017 · 6bcefbb · 6bcefbb
2 parents 8401b0a + 1e5152a
commit 6bcefbb
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 0.2.0 - 2017-03-15
+
+### Changed
+* Updated factories to PSR11 container
+
+### Added
+* Nothing
+
+### Deprecated
+* Nothing
+
+### Removed
+* Nothing
+
+### Fixed
+* Nothing
+
+
 ## 0.1.2 - 2017-03-11
 
 Updated php file headers doc blocks

diff --git a/composer.json b/composer.json
@@ -11,14 +11,12 @@
   ],
   "require": {
     "php": "^7.1",
-    "container-interop/container-interop": "^1.1",
-
-    "zendframework/zend-servicemanager": "^3.0",
+    "zendframework/zend-servicemanager": "^3.3.0",
     "zendframework/zend-paginator": "^2.7",
 
-    "dotkernel/dot-hydrator": "^1.0",
-    "dotkernel/dot-helpers": "^0.1",
-    "dotkernel/dot-event": "^0.1"
+    "dotkernel/dot-hydrator": "^1.1",
+    "dotkernel/dot-helpers": "^0.2",
+    "dotkernel/dot-event": "^0.2"
   },
   "require-dev": {
     "phpunit/phpunit": "^4.8",
@@ -41,7 +39,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.2-dev"
+      "dev-master": "0.2-dev",
+      "dev-develop": "0.3-dev"
     }
   }
 }
diff --git a/src/Factory/DbMapperFactory.php b/src/Factory/DbMapperFactory.php
@@ -10,7 +10,7 @@
 namespace Dot\Mapper\Factory;
 
 use Dot\Mapper\Mapper\MapperManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Zend\Hydrator\HydratorPluginManager;
 
 /**

diff --git a/src/Factory/MapperManagerAwareInitializer.php b/src/Factory/MapperManagerAwareInitializer.php
@@ -11,14 +11,13 @@
 
 use Dot\Mapper\Mapper\MapperManager;
 use Dot\Mapper\Mapper\MapperManagerAwareInterface;
-use Interop\Container\ContainerInterface;
-use Zend\ServiceManager\Initializer\InitializerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class MapperManagerAwareInitializer
  * @package Dot\Mapper\Factory
  */
-class MapperManagerAwareInitializer implements InitializerInterface
+class MapperManagerAwareInitializer
 {
     public function __invoke(ContainerInterface $container, $instance)
     {

diff --git a/src/Factory/MapperManagerFactory.php b/src/Factory/MapperManagerFactory.php
@@ -10,7 +10,7 @@
 namespace Dot\Mapper\Factory;
 
 use Dot\Mapper\Mapper\MapperManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class MapperManagerFactory