diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d0203..fca0257 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file, in reverse ### Added -- Nothing. +- [#25](https://github.com/elie29/zend-di-config/issues/25) Use Expressive Skeleton installer with PHP-DI results in error. ### Changed diff --git a/composer.json b/composer.json index cdec7a3..8496917 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ }, "require": { "php": "^7.1", + "container-interop/container-interop": "^1.2", "php-di/php-di": "^6.0", "zendframework/zend-stdlib": "^3.2" }, diff --git a/composer.lock b/composer.lock index fcf323f..d2dab61 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,39 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "270638f7b132da29828cfba1a40ec39e", + "content-hash": "a0d10d305aab82cf91f1882b0e462dd5", "packages": [ + { + "name": "container-interop/container-interop", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/container-interop/container-interop.git", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "shasum": "" + }, + "require": { + "psr/container": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Interop\\Container\\": "src/Interop/Container/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", + "homepage": "https://github.com/container-interop/container-interop", + "time": "2017-02-14T19:40:03+00:00" + }, { "name": "jeremeamia/SuperClosure", "version": "2.4.0", diff --git a/src/ContainerFactory.php b/src/ContainerFactory.php index ff490af..a8092e9 100644 --- a/src/ContainerFactory.php +++ b/src/ContainerFactory.php @@ -13,7 +13,7 @@ class ContainerFactory public function __invoke(ConfigInterface $config): ContainerInterface { - $builder = new ContainerBuilder(); + $builder = new ContainerBuilder(ContainerWrapper::class); $config->configureContainer($builder); return $builder->build(); diff --git a/src/ContainerWrapper.php b/src/ContainerWrapper.php new file mode 100644 index 0000000..f2eae2f --- /dev/null +++ b/src/ContainerWrapper.php @@ -0,0 +1,17 @@ +