From f5b6b4ccb021a3b082e578fc9a42c715985d1fae Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Fri, 31 Oct 2014 12:08:27 +1300
Subject: [PATCH] Use version 5.0.x-dev for PHP-DI
---
composer.json | 2 +-
composer.lock | 230 ++++----------------------------------------------
2 files changed, 17 insertions(+), 215 deletions(-)
diff --git a/composer.json b/composer.json
index db9e9c1537..7120659b8d 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
"mustangostang/spyc": "~0.5.0",
"piwik/device-detector": "~2.0",
"piwik/decompress": "~0.1.1",
- "mnapoli/php-di": "~4.4.0"
+ "mnapoli/php-di": "5.0.x-dev"
},
"require-dev": {
"aws/aws-sdk-php": "2.7.1",
diff --git a/composer.lock b/composer.lock
index 7dff61dc40..75ee69696e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "0d42501de65a49e2e8fb665807027443",
+ "hash": "ad793a02e67244825709eb91b2280e59",
"packages": [
{
"name": "container-interop/container-interop",
@@ -265,16 +265,16 @@
},
{
"name": "mnapoli/php-di",
- "version": "4.4.0",
+ "version": "5.0.x-dev",
"source": {
"type": "git",
"url": "https://github.com/mnapoli/PHP-DI.git",
- "reference": "556e3be63a821bbad0585a34f634080305392252"
+ "reference": "a0ecf28b1da0582f9f896cfa14b1a4a016a2b9b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/556e3be63a821bbad0585a34f634080305392252",
- "reference": "556e3be63a821bbad0585a34f634080305392252",
+ "url": "https://api.github.com/repos/mnapoli/PHP-DI/zipball/a0ecf28b1da0582f9f896cfa14b1a4a016a2b9b5",
+ "reference": "a0ecf28b1da0582f9f896cfa14b1a4a016a2b9b5",
"shasum": ""
},
"require": {
@@ -283,13 +283,21 @@
"doctrine/cache": "1.*",
"mnapoli/phpdocreader": "~1.3",
"myclabs/php-enum": "1.*",
- "ocramius/proxy-manager": "~0.3",
"php": ">=5.3.3"
},
"require-dev": {
+ "ocramius/proxy-manager": "~0.3",
"phpunit/phpunit": "~4.0"
},
+ "suggest": {
+ "ocramius/proxy-manager": "Install it if you want to use lazy injection"
+ },
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.0.x-dev"
+ }
+ },
"autoload": {
"psr-0": {
"DI\\": "src/",
@@ -311,7 +319,7 @@
"dependency injection",
"di"
],
- "time": "2014-10-14 06:13:26"
+ "time": "2014-10-30 22:52:26"
},
{
"name": "mnapoli/phpdocreader",
@@ -426,69 +434,6 @@
],
"time": "2013-11-11 18:29:08"
},
- {
- "name": "ocramius/proxy-manager",
- "version": "0.5.2",
- "source": {
- "type": "git",
- "url": "https://github.com/Ocramius/ProxyManager.git",
- "reference": "0ac0eb3e8e04c7fa75caaf1a43c5405623abf8f5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/0ac0eb3e8e04c7fa75caaf1a43c5405623abf8f5",
- "reference": "0ac0eb3e8e04c7fa75caaf1a43c5405623abf8f5",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "zendframework/zend-code": ">2.2.5,<3.0"
- },
- "require-dev": {
- "ext-phar": "*",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "1.5.*"
- },
- "suggest": {
- "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects",
- "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)",
- "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)",
- "zendframework/zend-stdlib": "To use the hydrator proxy",
- "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "0.6.x-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "ProxyManager\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Marco Pivetta",
- "email": "ocramius@gmail.com",
- "homepage": "http://ocramius.github.com/"
- }
- ],
- "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies",
- "homepage": "https://github.com/Ocramius/ProxyManager",
- "keywords": [
- "aop",
- "lazy loading",
- "proxy",
- "proxy pattern",
- "service proxies"
- ],
- "time": "2014-09-28 14:18:11"
- },
{
"name": "piwik/decompress",
"version": "0.1.1",
@@ -723,150 +668,6 @@
"templating"
],
"time": "2014-10-17 12:53:44"
- },
- {
- "name": "zendframework/zend-code",
- "version": "2.3.3",
- "target-dir": "Zend/Code",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/Component_ZendCode.git",
- "reference": "78ea301533dd05f1c1759e8928d119804900446b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/Component_ZendCode/zipball/78ea301533dd05f1c1759e8928d119804900446b",
- "reference": "78ea301533dd05f1c1759e8928d119804900446b",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.23",
- "zendframework/zend-eventmanager": "self.version"
- },
- "require-dev": {
- "doctrine/common": ">=2.1",
- "zendframework/zend-stdlib": "self.version"
- },
- "suggest": {
- "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
- "zendframework/zend-stdlib": "Zend\\Stdlib component"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Zend\\Code\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "provides facilities to generate arbitrary code using an object oriented interface",
- "homepage": "https://github.com/zendframework/zf2",
- "keywords": [
- "code",
- "zf2"
- ],
- "time": "2014-09-16 22:58:11"
- },
- {
- "name": "zendframework/zend-eventmanager",
- "version": "2.3.3",
- "target-dir": "Zend/EventManager",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/Component_ZendEventManager.git",
- "reference": "4110fe64b10616b9bb71429a206d8e9e6d99e3ba"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/Component_ZendEventManager/zipball/4110fe64b10616b9bb71429a206d8e9e6d99e3ba",
- "reference": "4110fe64b10616b9bb71429a206d8e9e6d99e3ba",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.23",
- "zendframework/zend-stdlib": "self.version"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Zend\\EventManager\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "homepage": "https://github.com/zendframework/zf2",
- "keywords": [
- "eventmanager",
- "zf2"
- ],
- "time": "2014-09-16 22:58:11"
- },
- {
- "name": "zendframework/zend-stdlib",
- "version": "2.3.3",
- "target-dir": "Zend/Stdlib",
- "source": {
- "type": "git",
- "url": "https://github.com/zendframework/Component_ZendStdlib.git",
- "reference": "fa33e6647f830d0d2a1cb451efcdfe1bb9a66c33"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/fa33e6647f830d0d2a1cb451efcdfe1bb9a66c33",
- "reference": "fa33e6647f830d0d2a1cb451efcdfe1bb9a66c33",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.23"
- },
- "require-dev": {
- "zendframework/zend-eventmanager": "self.version",
- "zendframework/zend-serializer": "self.version",
- "zendframework/zend-servicemanager": "self.version"
- },
- "suggest": {
- "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
- "zendframework/zend-serializer": "Zend\\Serializer component",
- "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev",
- "dev-develop": "2.4-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Zend\\Stdlib\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "homepage": "https://github.com/zendframework/zf2",
- "keywords": [
- "stdlib",
- "zf2"
- ],
- "time": "2014-09-16 22:58:11"
}
],
"packages-dev": [
@@ -1960,6 +1761,7 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
+ "mnapoli/php-di": 20,
"facebook/xhprof": 20
},
"prefer-stable": false,
--
GitLab