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 6865153 + 41d55eb commit dee91fe
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 7 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.1 - 2017-03-11

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

"dotkernel/dot-controller": "^0.1",
"dotkernel/dot-flashmessenger": "^0.1",
"dotkernel/dot-form": "^1.0"
"dotkernel/dot-controller": "^0.2",
"dotkernel/dot-flashmessenger": "^0.2",
"dotkernel/dot-form": "^1.1"
},
"require-dev": {
"phpunit/phpunit": "^4.8",
Expand All @@ -33,7 +33,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/FormsPluginFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

use Dot\Controller\Plugin\Forms\FormsPlugin;
use Dot\FlashMessenger\FlashMessengerInterface;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerInterface;

/**
* Class FormsPluginFactory
Expand Down
2 changes: 1 addition & 1 deletion src/FormsPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use Dot\FlashMessenger\FlashMessengerInterface;
use Dot\Form\Factory\FormAbstractServiceFactory;
use Dot\Form\FormElementManager;
use Interop\Container\ContainerInterface;
use Psr\Container\ContainerInterface;
use Zend\Form\Form;
use Zend\Form\FormInterface;

Expand Down

0 comments on commit dee91fe

Please sign in to comment.