Skip to content

Commit

Permalink
Merge pull request #1 from dotkernel/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
n3vrax authored Mar 15, 2017
2 parents e90b34a + 563e39c commit b7096dc
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 6 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
## 0.2.0 - 2017-03-16

### Changed
* updated container references to PSR11 container
* updated dependencies

### Added
* Nothing

### Deprecated
* Nothing

### Removed
* Nothing

### Fixed
* Nothing


## 0.1.1 - 2017-03-11

### Added
Expand Down
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
],
"require": {
"php": "^7.1",
"container-interop/container-interop": "^1.1",
"zendframework/zend-servicemanager": "^3.3.0",

"dotkernel/dot-controller": "^0.1",
"dotkernel/dot-session": "^1.0"
"dotkernel/dot-controller": "^0.2",
"dotkernel/dot-session": "^2.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
Expand All @@ -32,7 +32,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "0.2-dev"
"dev-master": "0.2-dev",
"dev-develop": "0.3-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/Factory/SessionPluginFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Dot\Controller\Plugin\Session\Factory;

use Dot\Controller\Plugin\Session\SessionPlugin;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerInterface;

/**
* Class SessionPluginFactory
Expand Down
2 changes: 1 addition & 1 deletion src/SessionPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Dot\Controller\Plugin\Session;

use Dot\Controller\Plugin\PluginInterface;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerInterface;
use Zend\Session\Container;
use Zend\Session\ManagerInterface;
use Zend\Session\SessionManager;
Expand Down

0 comments on commit b7096dc

Please sign in to comment.