Skip to content

Commit

Permalink
migrate to laminas framework #43. master becomes 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
elie29 committed Jan 15, 2020
1 parent d8c0bc6 commit e9c01cf
Show file tree
Hide file tree
Showing 6 changed files with 149 additions and 86 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Changelog

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## V5.0.1 - TBD
## V6.0.0 - TBD

### Added

- Nothing.

### Changed

- Nothing.
- [#43](https://github.com/elie29/zend-di-config/issues/43) migrate to laminas framework.

### Deprecated

Expand Down
12 changes: 7 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"name": "elie29/zend-phpdi-config",
"description": "PSR-11 PHP-DI autowire container configurator for ZF2, ZF3 and Zend Expressive applications",
"description": "PSR-11 PHP-DI autowire container configurator for Laminas, Mezzio, ZF2, ZF3 and Zend Expressive applications",
"type": "library",
"license": "MIT",
"minimum-stability": "stable",
"keywords": [
"expressive",
"zf",
"zendframework",
"laminas",
"mezzio",
"php-di",
"di",
"container",
Expand All @@ -25,16 +27,16 @@
},
"require": {
"php": "^7.1",
"php-di/php-di": "^6.0",
"zendframework/zend-stdlib": "^3.2"
"laminas/laminas-stdlib": "^3.2",
"php-di/php-di": "^6.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "^1.0",
"mikey179/vfsstream": "^1.6",
"mockery/mockery": "^1.0",
"phpstan/phpstan": "^0.10.3",
"phpstan/phpstan-mockery": "^0.10.2",
"phpunit/phpunit": "^7.5",
"zendframework/zend-coding-standard": "~1.0.0"
"phpunit/phpunit": "^7.5"
},
"autoload": {
"psr-4": {
Expand Down
213 changes: 137 additions & 76 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/migration-4.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This guide will help you migrate from a 3.x version to 4.0.

## Breaking change

The only BC occured in the namespace change.
The only BC occurred in the namespace change.

Before we used `Zend\DI\Config`, starting from 4.0, the namespace becomes `Elie\PHPDI\Config`

Expand Down
2 changes: 1 addition & 1 deletion src/Tool/AutowiresConfigDumperCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Elie\PHPDI\Config\Tool;

use Zend\Stdlib\ConsoleHelper;
use Laminas\Stdlib\ConsoleHelper;

class AutowiresConfigDumperCommand
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Tool/AutowiresConfigDumperCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

use Elie\PHPDI\Config\Tool\AutowiresConfigDumperCommand;
use ElieTest\PHPDI\Config\TestAsset\DelegatorService;
use Laminas\Stdlib\ConsoleHelper;
use org\bovigo\vfs\vfsStream;
use PHPUnit\Framework\TestCase;
use Prophecy\Argument;
use Zend\Stdlib\ConsoleHelper;

class AutowiresConfigDumperCommandTest extends TestCase
{
Expand Down

0 comments on commit e9c01cf

Please sign in to comment.