From b11f36b9b716b2d61c941d42944129c91afd584b Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 19 Oct 2017 16:02:34 -0400
Subject: [PATCH] Upgrade zend-config.
---
composer.json | 2 +-
composer.lock | 44 ++++++++++++++++++++++++--------------------
2 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/composer.json b/composer.json
index 0e041d9df16..0212b3ff35e 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
"zendframework/zend-cache": "2.7.2",
"zendframework/zend-captcha": "2.7.1",
"zendframework/zend-code": "2.6.3",
- "zendframework/zend-config": "2.6.0",
+ "zendframework/zend-config": "3.1.0",
"zendframework/zend-console": "2.6.0",
"zendframework/zend-crypt": "3.2.1",
"zendframework/zend-db": "2.8.2",
diff --git a/composer.lock b/composer.lock
index e960b771d4b..91017d234a2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "09ddb222f98fe5a2f4931447df9bb845",
+ "content-hash": "116701a4cd326d6a60a88702ad77dfe4",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -1858,41 +1858,45 @@
},
{
"name": "zendframework/zend-config",
- "version": "2.6.0",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-config.git",
- "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d"
+ "reference": "a12e4a592bf66d9629b84960e268f3752e53abe4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
- "reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
+ "url": "https://api.github.com/repos/zendframework/zend-config/zipball/a12e4a592bf66d9629b84960e268f3752e53abe4",
+ "reference": "a12e4a592bf66d9629b84960e268f3752e53abe4",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "ext-json": "*",
+ "php": "^5.6 || ^7.0",
+ "psr/container": "^1.0",
+ "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+ },
+ "conflict": {
+ "container-interop/container-interop": "<1.2.0"
},
"require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0",
- "zendframework/zend-filter": "^2.6",
- "zendframework/zend-i18n": "^2.5",
- "zendframework/zend-json": "^2.6.1",
- "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+ "malukenho/docheader": "^0.1.5",
+ "phpunit/phpunit": "^5.7 || ^6.0",
+ "zendframework/zend-coding-standard": "~1.0.0",
+ "zendframework/zend-filter": "^2.7.1",
+ "zendframework/zend-i18n": "^2.7.3",
+ "zendframework/zend-servicemanager": "^2.7.8 || ^3.2.1"
},
"suggest": {
- "zendframework/zend-filter": "Zend\\Filter component",
- "zendframework/zend-i18n": "Zend\\I18n component",
- "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
- "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+ "zendframework/zend-filter": "^2.7.1; install if you want to use the Filter processor",
+ "zendframework/zend-i18n": "^2.7.3; install if you want to use the Translator processor",
+ "zendframework/zend-servicemanager": "^2.7.8 || ^3.2.1; if you need an extensible plugin manager for use with the Config Factory"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev",
- "dev-develop": "2.7-dev"
+ "dev-master": "3.1-dev",
+ "dev-develop": "3.2-dev"
}
},
"autoload": {
@@ -1910,7 +1914,7 @@
"config",
"zf2"
],
- "time": "2016-02-04T23:01:10+00:00"
+ "time": "2017-02-22T14:31:10+00:00"
},
{
"name": "zendframework/zend-console",
--
GitLab