From 945b4bf18b3d1a19b0a94f2e52ab0054ed428707 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Wed, 24 Jan 2018 14:37:18 -0500
Subject: [PATCH] Fixed problems with CLI controllers.
---
composer.json | 1 +
composer.lock | 224 ++++++++++++------
config/application.config.php | 5 +-
.../VuFindConsole/Controller/AbstractBase.php | 2 +-
.../Controller/RedirectController.php | 2 +-
5 files changed, 151 insertions(+), 83 deletions(-)
diff --git a/composer.json b/composer.json
index 8677567d526..c12e7f80a03 100644
--- a/composer.json
+++ b/composer.json
@@ -52,6 +52,7 @@
"zendframework/zend-mail": "2.8.0",
"zendframework/zend-modulemanager": "2.8.0",
"zendframework/zend-mvc": "3.1.1",
+ "zendframework/zend-mvc-console": "1.1.11",
"zendframework/zend-mvc-i18n": "1.0.0",
"zendframework/zend-mvc-plugin-flashmessenger": "1.0.0",
"zendframework/zend-paginator": "2.7.0",
diff --git a/composer.lock b/composer.lock
index d218532484a..615a2945d40 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": "e3a4ff19b47391a22187abacd0a2f05f",
+ "content-hash": "02731e17a7fb4c38cda830d8c18391d8",
"packages": [
{
"name": "aferrandini/phpqrcode",
@@ -2412,25 +2412,25 @@
},
{
"name": "zendframework/zend-json",
- "version": "3.0.0",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-json.git",
- "reference": "f42a1588e75c2a3e338cd94c37906231e616daab"
+ "reference": "4dd940e8e6f32f1d36ea6b0677ea57c540c7c19c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-json/zipball/f42a1588e75c2a3e338cd94c37906231e616daab",
- "reference": "f42a1588e75c2a3e338cd94c37906231e616daab",
+ "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4dd940e8e6f32f1d36ea6b0677ea57c540c7c19c",
+ "reference": "4dd940e8e6f32f1d36ea6b0677ea57c540c7c19c",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0"
+ "php": "^5.6 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "^2.3",
- "zendframework/zend-stdlib": "^2.7 || ^3.0"
+ "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+ "zendframework/zend-coding-standard": "~1.0.0",
+ "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
},
"suggest": {
"zendframework/zend-json-server": "For implementing JSON-RPC servers",
@@ -2439,8 +2439,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev",
- "dev-develop": "3.1-dev"
+ "dev-master": "3.1.x-dev",
+ "dev-develop": "3.2.x-dev"
}
},
"autoload": {
@@ -2453,12 +2453,12 @@
"BSD-3-Clause"
],
"description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
- "homepage": "https://github.com/zendframework/zend-json",
"keywords": [
+ "ZendFramework",
"json",
- "zf2"
+ "zf"
],
- "time": "2016-04-01T02:34:00+00:00"
+ "time": "2018-01-04T17:51:34+00:00"
},
{
"name": "zendframework/zend-loader",
@@ -2868,6 +2868,72 @@
],
"time": "2017-11-24T06:32:07+00:00"
},
+ {
+ "name": "zendframework/zend-mvc-console",
+ "version": "1.1.11",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/zendframework/zend-mvc-console.git",
+ "reference": "a9b5559f129c2e6cc3f3f32e54c2daa02b336301"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/zendframework/zend-mvc-console/zipball/a9b5559f129c2e6cc3f3f32e54c2daa02b336301",
+ "reference": "a9b5559f129c2e6cc3f3f32e54c2daa02b336301",
+ "shasum": ""
+ },
+ "require": {
+ "container-interop/container-interop": "^1.1",
+ "php": "^5.6 || ^7.0",
+ "zendframework/zend-console": "^2.6",
+ "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+ "zendframework/zend-modulemanager": "^2.7.1",
+ "zendframework/zend-mvc": "^3.0.3",
+ "zendframework/zend-router": "^3.0",
+ "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+ "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
+ "zendframework/zend-text": "^2.6",
+ "zendframework/zend-view": "^2.6.3"
+ },
+ "conflict": {
+ "zendframework/zend-mvc": "<3.0.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.5",
+ "squizlabs/php_codesniffer": "^2.3.1",
+ "zendframework/zend-filter": "^2.6.1",
+ "zendframework/zend-form": "^2.7"
+ },
+ "suggest": {
+ "zendframework/zend-filter": "^2.6.1, to filter rendered results"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.1-dev",
+ "dev-develop": "1.2-dev"
+ },
+ "zf": {
+ "component": "Zend\\Mvc\\Console"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Zend\\Mvc\\Console\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "homepage": "https://github.com/zendframework/zend-mvc-console",
+ "keywords": [
+ "console",
+ "mvc",
+ "zf2"
+ ],
+ "time": "2016-08-29T19:09:11+00:00"
+ },
{
"name": "zendframework/zend-mvc-i18n",
"version": "1.0.0",
@@ -4606,26 +4672,26 @@
},
{
"name": "pdepend/pdepend",
- "version": "2.5.0",
+ "version": "2.5.2",
"source": {
"type": "git",
"url": "https://github.com/pdepend/pdepend.git",
- "reference": "0c50874333149c0dad5a2877801aed148f2767ff"
+ "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pdepend/pdepend/zipball/0c50874333149c0dad5a2877801aed148f2767ff",
- "reference": "0c50874333149c0dad5a2877801aed148f2767ff",
+ "url": "https://api.github.com/repos/pdepend/pdepend/zipball/9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
+ "reference": "9daf26d0368d4a12bed1cacae1a9f3a6f0adf239",
"shasum": ""
},
"require": {
"php": ">=5.3.7",
- "symfony/config": "^2.3.0|^3",
- "symfony/dependency-injection": "^2.3.0|^3",
- "symfony/filesystem": "^2.3.0|^3"
+ "symfony/config": "^2.3.0|^3|^4",
+ "symfony/dependency-injection": "^2.3.0|^3|^4",
+ "symfony/filesystem": "^2.3.0|^3|^4"
},
"require-dev": {
- "phpunit/phpunit": "^4.4.0,<4.8",
+ "phpunit/phpunit": "^4.8|^5.7",
"squizlabs/php_codesniffer": "^2.0.0"
},
"bin": [
@@ -4642,7 +4708,7 @@
"BSD-3-Clause"
],
"description": "Official version of pdepend to be handled with Composer",
- "time": "2017-01-19T14:23:36+00:00"
+ "time": "2017-12-13T13:21:38+00:00"
},
{
"name": "php-cs-fixer/diff",
@@ -6061,16 +6127,16 @@
},
{
"name": "symfony/config",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "1de51a6c76359897ab32c309934b93d036bccb60"
+ "reference": "cfd5c972f7b4992a5df41673d25d980ab077aa5b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/1de51a6c76359897ab32c309934b93d036bccb60",
- "reference": "1de51a6c76359897ab32c309934b93d036bccb60",
+ "url": "https://api.github.com/repos/symfony/config/zipball/cfd5c972f7b4992a5df41673d25d980ab077aa5b",
+ "reference": "cfd5c972f7b4992a5df41673d25d980ab077aa5b",
"shasum": ""
},
"require": {
@@ -6119,20 +6185,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2017-11-19T20:09:36+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/console",
- "version": "v3.3.13",
+ "version": "v3.3.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805"
+ "reference": "56f07f63c80baeb43ab259abc42c6cecf6461fae"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/63cd7960a0a522c3537f6326706d7f3b8de65805",
- "reference": "63cd7960a0a522c3537f6326706d7f3b8de65805",
+ "url": "https://api.github.com/repos/symfony/console/zipball/56f07f63c80baeb43ab259abc42c6cecf6461fae",
+ "reference": "56f07f63c80baeb43ab259abc42c6cecf6461fae",
"shasum": ""
},
"require": {
@@ -6187,20 +6253,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2017-11-16T15:24:32+00:00"
+ "time": "2018-01-03T07:37:11+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "7134b93e90ea7e7881fcb2da006d21b4c5f31908"
+ "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/7134b93e90ea7e7881fcb2da006d21b4c5f31908",
- "reference": "7134b93e90ea7e7881fcb2da006d21b4c5f31908",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/e66394bc7610e69279bfdb3ab11b4fe65403f556",
+ "reference": "e66394bc7610e69279bfdb3ab11b4fe65403f556",
"shasum": ""
},
"require": {
@@ -6240,20 +6306,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2017-11-05T16:10:10+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/debug",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd"
+ "reference": "603b95dda8b00020e4e6e60dc906e7b715b1c245"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/fb2001e5d85f95d8b6ab94ae3be5d2672df128fd",
- "reference": "fb2001e5d85f95d8b6ab94ae3be5d2672df128fd",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/603b95dda8b00020e4e6e60dc906e7b715b1c245",
+ "reference": "603b95dda8b00020e4e6e60dc906e7b715b1c245",
"shasum": ""
},
"require": {
@@ -6296,20 +6362,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2017-11-21T09:01:46+00:00"
+ "time": "2018-01-03T17:14:19+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v3.3.13",
+ "version": "v3.3.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "4e84f5af2c2d51ee3dee72df40b7fc08f49b4ab8"
+ "reference": "e63cd8163d72a2a7722a40790ae80f2c0c8b50d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/4e84f5af2c2d51ee3dee72df40b7fc08f49b4ab8",
- "reference": "4e84f5af2c2d51ee3dee72df40b7fc08f49b4ab8",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e63cd8163d72a2a7722a40790ae80f2c0c8b50d1",
+ "reference": "e63cd8163d72a2a7722a40790ae80f2c0c8b50d1",
"shasum": ""
},
"require": {
@@ -6317,7 +6383,7 @@
"psr/container": "^1.0"
},
"conflict": {
- "symfony/config": "<3.3.1",
+ "symfony/config": "<3.3.7",
"symfony/finder": "<3.3",
"symfony/yaml": "<3.3"
},
@@ -6366,20 +6432,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2017-11-13T18:10:32+00:00"
+ "time": "2018-01-03T07:37:11+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4"
+ "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca20b8f9ef149f40ff656d52965f240d85f7a8e4",
- "reference": "ca20b8f9ef149f40ff656d52965f240d85f7a8e4",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/26b87b6bca8f8f797331a30b76fdae5342dc26ca",
+ "reference": "26b87b6bca8f8f797331a30b76fdae5342dc26ca",
"shasum": ""
},
"require": {
@@ -6429,20 +6495,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2017-11-09T14:14:31+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f"
+ "reference": "e078773ad6354af38169faf31c21df0f18ace03d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/de56eee71e0a128d8c54ccc1909cdefd574bad0f",
- "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/e078773ad6354af38169faf31c21df0f18ace03d",
+ "reference": "e078773ad6354af38169faf31c21df0f18ace03d",
"shasum": ""
},
"require": {
@@ -6478,20 +6544,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2017-11-19T18:59:05+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/finder",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a"
+ "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a",
- "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/613e26310776f49a1773b6737c6bd554b8bc8c6f",
+ "reference": "613e26310776f49a1773b6737c6bd554b8bc8c6f",
"shasum": ""
},
"require": {
@@ -6527,20 +6593,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2017-11-05T16:10:10+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "08748edfe6982f4d878cc42b8325b19a276fb1cf"
+ "reference": "f31f4d3ce4eaf7597abc41bd5ba53d634c2fdb0e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/08748edfe6982f4d878cc42b8325b19a276fb1cf",
- "reference": "08748edfe6982f4d878cc42b8325b19a276fb1cf",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f31f4d3ce4eaf7597abc41bd5ba53d634c2fdb0e",
+ "reference": "f31f4d3ce4eaf7597abc41bd5ba53d634c2fdb0e",
"shasum": ""
},
"require": {
@@ -6581,7 +6647,7 @@
"configuration",
"options"
],
- "time": "2017-11-05T16:10:10+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@@ -6758,16 +6824,16 @@
},
{
"name": "symfony/process",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea"
+ "reference": "ff69f110c6b33fd33cd2089ba97d6112f44ef0ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/db25e810fd5e124085e3777257d0cf4ae533d0ea",
- "reference": "db25e810fd5e124085e3777257d0cf4ae533d0ea",
+ "url": "https://api.github.com/repos/symfony/process/zipball/ff69f110c6b33fd33cd2089ba97d6112f44ef0ba",
+ "reference": "ff69f110c6b33fd33cd2089ba97d6112f44ef0ba",
"shasum": ""
},
"require": {
@@ -6803,20 +6869,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2017-11-22T12:18:49+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v3.4.0",
+ "version": "v3.4.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1"
+ "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/52510fe1aefdc1c5d2076ac6030421d387e689d1",
- "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c865551df7c17e63fc1f09f763db04387f91ae4d",
+ "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d",
"shasum": ""
},
"require": {
@@ -6852,7 +6918,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2017-11-07T14:28:09+00:00"
+ "time": "2018-01-03T07:37:34+00:00"
},
{
"name": "theseer/fdomdocument",
diff --git a/config/application.config.php b/config/application.config.php
index 04641a1c558..d72316b3f27 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -2,10 +2,11 @@
// Set up modules:
$modules = [
- 'Zend\Router', 'ZfcRbac', 'VuFindTheme', 'VuFindSearch', 'VuFind', 'VuFindAdmin',
- 'VuFindApi'
+ 'Zend\Router', 'ZfcRbac',
+ 'VuFindTheme', 'VuFindSearch', 'VuFind', 'VuFindAdmin', 'VuFindApi'
];
if (PHP_SAPI == 'cli' && !defined('VUFIND_PHPUNIT_RUNNING')) {
+ $modules[] = 'Zend\Mvc\Console';
$modules[] = 'VuFindConsole';
}
if (APPLICATION_ENV == 'development') {
diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php b/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
index d06e5f19d49..884b5f30072 100644
--- a/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/AbstractBase.php
@@ -56,7 +56,7 @@ class AbstractBase extends AbstractActionController
throw new \Exception('Access denied to command line tools.');
}
- $this->setServiceLocator($sm);
+ $this->serviceLocator = $sm;
// Switch the context back to the original working directory so that
// relative paths work as expected. (This constant is set in
diff --git a/module/VuFindConsole/src/VuFindConsole/Controller/RedirectController.php b/module/VuFindConsole/src/VuFindConsole/Controller/RedirectController.php
index 99836da790a..7cfff300af6 100644
--- a/module/VuFindConsole/src/VuFindConsole/Controller/RedirectController.php
+++ b/module/VuFindConsole/src/VuFindConsole/Controller/RedirectController.php
@@ -39,7 +39,7 @@ use Zend\Mvc\Application;
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development:plugins:controllers Wiki
*/
-class RedirectController extends \Zend\Mvc\Controller\AbstractActionController
+class RedirectController extends AbstractBase
{
/**
* Get a usage message with the help of the RouteNotFoundStrategy.
--
GitLab