Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/85' into develop
Browse files Browse the repository at this point in the history
Forward port #85
  • Loading branch information
weierophinney committed Apr 21, 2016
2 parents 3b38ab5 + e6597b3 commit 31687bb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#85](https://github.com/zendframework/zend-expressive-skeleton/pull/85)
updates the Aura.Di dependency to stable 3.X versions.

## 1.0.1 - 2016-03-17

Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "zendframework/zend-expressive-skeleton",
"description": "Zend expressive skelton. Begin developing PSR-7 middleware applications in seconds",
"type": "project",
"homepage": "https://github.com/zendframework/zend-expressive-skeleton",
"license": "BSD-3-CLAUSE",
"license": "BSD-3-Clause",
"authors": [
{
"name": "Geert Eltink",
Expand Down Expand Up @@ -35,7 +36,7 @@
"zendframework/zend-expressive-zendviewrenderer": "^1.0",
"zendframework/zend-servicemanager": "^2.7.3 || ^3.0",
"ocramius/proxy-manager": "^1.0",
"aura/di": "3.0.*@beta",
"aura/di": "^3.0",
"xtreamwayz/pimple-container-interop": "^1.0"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/ExpressiveInstaller/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

return [
'packages' => [
'aura/di' => '3.0.*@beta',
'aura/di' => '^3.0',
'filp/whoops' => '^1.1 || ^2.0',
'xtreamwayz/pimple-container-interop' => '^1.0',
'ocramius/proxy-manager' => '^1.0 || ^2.0',
Expand Down

0 comments on commit 31687bb

Please sign in to comment.