From 971a9bf755cdbaf8366be1036befdb61d8255fd4 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 7 Jan 2019 16:08:56 -0500
Subject: [PATCH] Upgrade php-cs-fixer.
---
composer.json | 2 +-
composer.lock | 371 ++++++++++--------
.../VuFind/ChannelProvider/AlphaBrowse.php | 1 -
.../VuFind/ChannelProvider/SimilarItems.php | 1 -
.../src/VuFindTest/Auth/ShibbolethTest.php | 1 -
.../src/VuFindTest/Auth/MultiAuthTest.php | 1 -
.../RecordDriver/EDS/result-list.phtml | 2 +-
7 files changed, 209 insertions(+), 170 deletions(-)
diff --git a/composer.json b/composer.json
index 451af859ac8..8c0f2ca8e78 100644
--- a/composer.json
+++ b/composer.json
@@ -76,7 +76,7 @@
"require-dev": {
"behat/mink": "1.7.1",
"behat/mink-selenium2-driver": "1.3.1",
- "friendsofphp/php-cs-fixer": "2.11.1",
+ "friendsofphp/php-cs-fixer": "2.14.0",
"phploc/phploc": "4.0.1",
"phpmd/phpmd": "2.6.0",
"phpunit/phpunit": "6.5.8",
diff --git a/composer.lock b/composer.lock
index 2a65085e97b..f29e8a93289 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
{
"_readme": [
"This file locks the dependencies of your project to a known state",
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+ "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": "c59d12f52cd1f4a58583837989e7291a",
+ "content-hash": "fd6810272e920bf36183fa286bb0ccdd",
"packages": [
{
"name": "ahand/mobileesp",
@@ -526,16 +526,16 @@
},
{
"name": "matthiasmullie/path-converter",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/matthiasmullie/path-converter.git",
- "reference": "3082a6838be02b930239a97d38b5c9da4d693aca"
+ "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/3082a6838be02b930239a97d38b5c9da4d693aca",
- "reference": "3082a6838be02b930239a97d38b5c9da4d693aca",
+ "url": "https://api.github.com/repos/matthiasmullie/path-converter/zipball/5e4b121c8b9f97c80835c1d878b0812ba1d607c9",
+ "reference": "5e4b121c8b9f97c80835c1d878b0812ba1d607c9",
"shasum": ""
},
"require": {
@@ -571,20 +571,20 @@
"paths",
"relative"
],
- "time": "2018-02-02T11:30:10+00:00"
+ "time": "2018-10-25T15:19:41+00:00"
},
{
"name": "myclabs/php-enum",
- "version": "1.6.2",
+ "version": "1.6.4",
"source": {
"type": "git",
"url": "https://github.com/myclabs/php-enum.git",
- "reference": "ca2f4090a7ecae6f0c67fc9bd07cfb51cdf04219"
+ "reference": "550d2334d77f91b0816a5cbd6965272fe20146b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/php-enum/zipball/ca2f4090a7ecae6f0c67fc9bd07cfb51cdf04219",
- "reference": "ca2f4090a7ecae6f0c67fc9bd07cfb51cdf04219",
+ "url": "https://api.github.com/repos/myclabs/php-enum/zipball/550d2334d77f91b0816a5cbd6965272fe20146b8",
+ "reference": "550d2334d77f91b0816a5cbd6965272fe20146b8",
"shasum": ""
},
"require": {
@@ -615,7 +615,7 @@
"keywords": [
"enum"
],
- "time": "2018-08-01T21:05:54+00:00"
+ "time": "2018-10-30T14:36:18+00:00"
},
{
"name": "ocramius/package-versions",
@@ -795,33 +795,29 @@
},
{
"name": "paragonie/random_compat",
- "version": "v2.0.17",
+ "version": "v9.99.99",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
- "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
- "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+ "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
"shasum": ""
},
"require": {
- "php": ">=5.2.0"
+ "php": "^7"
},
"require-dev": {
- "phpunit/phpunit": "4.*|5.*"
+ "phpunit/phpunit": "4.*|5.*",
+ "vimeo/psalm": "^1"
},
"suggest": {
"ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
"type": "library",
- "autoload": {
- "files": [
- "lib/random.php"
- ]
- },
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
@@ -840,20 +836,20 @@
"pseudorandom",
"random"
],
- "time": "2018-07-04T16:31:37+00:00"
+ "time": "2018-07-02T15:55:56+00:00"
},
{
"name": "pear/archive_tar",
- "version": "1.4.3",
+ "version": "1.4.5",
"source": {
"type": "git",
"url": "https://github.com/pear/Archive_Tar.git",
- "reference": "43455c960da70e655c6bdf8ea2bc8cc1a6034afb"
+ "reference": "ff716ca697c5e9e8593212cb785ffd03ee11b01f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/43455c960da70e655c6bdf8ea2bc8cc1a6034afb",
- "reference": "43455c960da70e655c6bdf8ea2bc8cc1a6034afb",
+ "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/ff716ca697c5e9e8593212cb785ffd03ee11b01f",
+ "reference": "ff716ca697c5e9e8593212cb785ffd03ee11b01f",
"shasum": ""
},
"require": {
@@ -864,8 +860,8 @@
"phpunit/phpunit": "*"
},
"suggest": {
- "ext-bz2": "bz2 compression support.",
- "ext-xz": "lzma2 compression support.",
+ "ext-bz2": "Bz2 compression support.",
+ "ext-xz": "Lzma2 compression support.",
"ext-zlib": "Gzip compression support."
},
"type": "library",
@@ -900,13 +896,13 @@
"email": "mrook@php.net"
}
],
- "description": "Tar file management class",
+ "description": "Tar file management class with compression support (gzip, bzip2, lzma2)",
"homepage": "https://github.com/pear/Archive_Tar",
"keywords": [
"archive",
"tar"
],
- "time": "2017-06-11T17:28:11+00:00"
+ "time": "2019-01-02T21:45:13+00:00"
},
{
"name": "pear/console_getopt",
@@ -1127,20 +1123,20 @@
},
{
"name": "pear/pear-core-minimal",
- "version": "v1.10.6",
+ "version": "v1.10.7",
"source": {
"type": "git",
"url": "https://github.com/pear/pear-core-minimal.git",
- "reference": "052868b244d31f822796e7e9981f62557eb256d4"
+ "reference": "19a3e0fcd50492c4357372f623f55f1b144346da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/052868b244d31f822796e7e9981f62557eb256d4",
- "reference": "052868b244d31f822796e7e9981f62557eb256d4",
+ "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/19a3e0fcd50492c4357372f623f55f1b144346da",
+ "reference": "19a3e0fcd50492c4357372f623f55f1b144346da",
"shasum": ""
},
"require": {
- "pear/console_getopt": "~1.3",
+ "pear/console_getopt": "~1.4",
"pear/pear_exception": "~1.0"
},
"replace": {
@@ -1167,7 +1163,7 @@
}
],
"description": "Minimal set of PEAR core files to be used as composer dependency",
- "time": "2018-08-22T19:28:09+00:00"
+ "time": "2018-12-05T20:03:52+00:00"
},
{
"name": "pear/pear_exception",
@@ -1533,16 +1529,16 @@
},
{
"name": "psr/log",
- "version": "1.0.2",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
- "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+ "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
+ "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
@@ -1576,7 +1572,7 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2018-11-20T15:27:04+00:00"
},
{
"name": "psr/simple-cache",
@@ -1702,16 +1698,16 @@
},
{
"name": "symfony/inflector",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/inflector.git",
- "reference": "129ac0c59e516f5fe210efe51a44f79ab9925c16"
+ "reference": "71ea67b4843bc668c17302ac79fa6f61437487bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/inflector/zipball/129ac0c59e516f5fe210efe51a44f79ab9925c16",
- "reference": "129ac0c59e516f5fe210efe51a44f79ab9925c16",
+ "url": "https://api.github.com/repos/symfony/inflector/zipball/71ea67b4843bc668c17302ac79fa6f61437487bb",
+ "reference": "71ea67b4843bc668c17302ac79fa6f61437487bb",
"shasum": ""
},
"require": {
@@ -1756,20 +1752,20 @@
"symfony",
"words"
],
- "time": "2018-07-26T08:45:46+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "1cf7d8e704a9cc4164c92e430f2dfa3e6983661d"
+ "reference": "8a10e36ffd04c0c551051594952304d34ecece71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/1cf7d8e704a9cc4164c92e430f2dfa3e6983661d",
- "reference": "1cf7d8e704a9cc4164c92e430f2dfa3e6983661d",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/8a10e36ffd04c0c551051594952304d34ecece71",
+ "reference": "8a10e36ffd04c0c551051594952304d34ecece71",
"shasum": ""
},
"require": {
@@ -1810,11 +1806,11 @@
"configuration",
"options"
],
- "time": "2018-09-17T17:29:18+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1872,16 +1868,16 @@
},
{
"name": "symfony/polyfill-php70",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
- "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934"
+ "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
- "reference": "1e24b0c4a56d55aaf368763a06c6d1c7d3194934",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
+ "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
"shasum": ""
},
"require": {
@@ -1927,20 +1923,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T06:26:08+00:00"
},
{
"name": "symfony/property-access",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
- "reference": "a62b882330f24b43f4409e50a0692aa433947460"
+ "reference": "2d14c17d63ede1f23bb8a591a3255e63ecfef85f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/property-access/zipball/a62b882330f24b43f4409e50a0692aa433947460",
- "reference": "a62b882330f24b43f4409e50a0692aa433947460",
+ "url": "https://api.github.com/repos/symfony/property-access/zipball/2d14c17d63ede1f23bb8a591a3255e63ecfef85f",
+ "reference": "2d14c17d63ede1f23bb8a591a3255e63ecfef85f",
"shasum": ""
},
"require": {
@@ -1995,7 +1991,7 @@
"property path",
"reflection"
],
- "time": "2018-10-02T12:28:39+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/yaml",
@@ -3111,16 +3107,16 @@
},
{
"name": "zendframework/zend-hydrator",
- "version": "2.4.0",
+ "version": "2.4.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-hydrator.git",
- "reference": "bd48bc3bc046df007a94125f868dd1aa1b73a813"
+ "reference": "70b02f4d8676e64af932625751750b5ca72fff3a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/bd48bc3bc046df007a94125f868dd1aa1b73a813",
- "reference": "bd48bc3bc046df007a94125f868dd1aa1b73a813",
+ "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/70b02f4d8676e64af932625751750b5ca72fff3a",
+ "reference": "70b02f4d8676e64af932625751750b5ca72fff3a",
"shasum": ""
},
"require": {
@@ -3170,7 +3166,7 @@
"hydrator",
"zf"
],
- "time": "2018-04-30T21:22:14+00:00"
+ "time": "2018-11-19T19:16:10+00:00"
},
{
"name": "zendframework/zend-i18n",
@@ -3242,16 +3238,16 @@
},
{
"name": "zendframework/zend-inputfilter",
- "version": "2.8.2",
+ "version": "2.8.3",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-inputfilter.git",
- "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8"
+ "reference": "799ad48ed1666d3c62126fec73dd20453b3a9e4d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/3f02179e014d9ef0faccda2ad6c65d38adc338d8",
- "reference": "3f02179e014d9ef0faccda2ad6c65d38adc338d8",
+ "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/799ad48ed1666d3c62126fec73dd20453b3a9e4d",
+ "reference": "799ad48ed1666d3c62126fec73dd20453b3a9e4d",
"shasum": ""
},
"require": {
@@ -3291,7 +3287,7 @@
"inputfilter",
"zf"
],
- "time": "2018-05-14T17:38:03+00:00"
+ "time": "2018-12-13T22:51:54+00:00"
},
{
"name": "zendframework/zend-json",
@@ -3523,21 +3519,21 @@
},
{
"name": "zendframework/zend-math",
- "version": "3.1.1",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-math.git",
- "reference": "0aa5ec1b3132dd7d749d4673d7bdc7ab6b2d202a"
+ "reference": "07e43d87fd5c7edc4f54121b9a4625eb10e4b726"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-math/zipball/0aa5ec1b3132dd7d749d4673d7bdc7ab6b2d202a",
- "reference": "0aa5ec1b3132dd7d749d4673d7bdc7ab6b2d202a",
+ "url": "https://api.github.com/repos/zendframework/zend-math/zipball/07e43d87fd5c7edc4f54121b9a4625eb10e4b726",
+ "reference": "07e43d87fd5c7edc4f54121b9a4625eb10e4b726",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
- "paragonie/random_compat": "^2.0.11",
+ "paragonie/random_compat": "^2.0.11 || 9.99.99",
"php": "^5.6 || ^7.0"
},
"require-dev": {
@@ -3551,8 +3547,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1.x-dev",
- "dev-develop": "3.2.x-dev"
+ "dev-master": "3.2.x-dev",
+ "dev-develop": "3.3.x-dev"
}
},
"autoload": {
@@ -3570,7 +3566,7 @@
"math",
"zf"
],
- "time": "2018-07-10T19:00:33+00:00"
+ "time": "2018-12-04T15:45:09+00:00"
},
{
"name": "zendframework/zend-mime",
@@ -5168,6 +5164,50 @@
],
"time": "2016-08-30T16:08:34+00:00"
},
+ {
+ "name": "composer/xdebug-handler",
+ "version": "1.3.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/composer/xdebug-handler.git",
+ "reference": "dc523135366eb68f22268d069ea7749486458562"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/dc523135366eb68f22268d069ea7749486458562",
+ "reference": "dc523135366eb68f22268d069ea7749486458562",
+ "shasum": ""
+ },
+ "require": {
+ "php": "^5.3.2 || ^7.0",
+ "psr/log": "^1.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Composer\\XdebugHandler\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "John Stevenson",
+ "email": "john-stevenson@blueyonder.co.uk"
+ }
+ ],
+ "description": "Restarts a process without xdebug.",
+ "keywords": [
+ "Xdebug",
+ "performance"
+ ],
+ "time": "2018-11-29T10:59:02+00:00"
+ },
{
"name": "doctrine/annotations",
"version": "v1.4.0",
@@ -5346,26 +5386,27 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.11.1",
+ "version": "v2.14.0",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "ad94441c17b8ef096e517acccdbf3238af8a2da8"
+ "reference": "b788ea0af899cedc8114dca7db119c93b6685da2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ad94441c17b8ef096e517acccdbf3238af8a2da8",
- "reference": "ad94441c17b8ef096e517acccdbf3238af8a2da8",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/b788ea0af899cedc8114dca7db119c93b6685da2",
+ "reference": "b788ea0af899cedc8114dca7db119c93b6685da2",
"shasum": ""
},
"require": {
"composer/semver": "^1.4",
+ "composer/xdebug-handler": "^1.2",
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
- "php": "^5.6 || >=7.0 <7.3",
+ "php": "^5.6 || ^7.0",
"php-cs-fixer/diff": "^1.3",
- "symfony/console": "^3.2 || ^4.0",
+ "symfony/console": "^3.4.17 || ^4.1.6",
"symfony/event-dispatcher": "^3.0 || ^4.0",
"symfony/filesystem": "^3.0 || ^4.0",
"symfony/finder": "^3.0 || ^4.0",
@@ -5381,16 +5422,20 @@
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",
- "keradus/cli-executor": "^1.0",
+ "keradus/cli-executor": "^1.2",
"mikey179/vfsstream": "^1.6",
- "php-coveralls/php-coveralls": "^2.0",
+ "php-coveralls/php-coveralls": "^2.1",
"php-cs-fixer/accessible-object": "^1.0",
- "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
- "phpunitgoodpractices/traits": "^1.3.1",
- "symfony/phpunit-bridge": "^3.2.2 || ^4.0"
+ "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.0.1",
+ "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.0.1",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
+ "phpunitgoodpractices/traits": "^1.5.1",
+ "symfony/phpunit-bridge": "^4.0"
},
"suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+ "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
+ "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
},
"bin": [
@@ -5399,7 +5444,7 @@
"type": "application",
"extra": {
"branch-alias": {
- "dev-master": "2.11-dev"
+ "dev-master": "2.14-dev"
}
},
"autoload": {
@@ -5411,9 +5456,6 @@
"tests/Test/AbstractIntegrationCaseFactory.php",
"tests/Test/AbstractIntegrationTestCase.php",
"tests/Test/Assert/AssertTokensTrait.php",
- "tests/Test/Constraint/SameStringsConstraint.php",
- "tests/Test/Constraint/SameStringsConstraintForV5.php",
- "tests/Test/Constraint/SameStringsConstraintForV7.php",
"tests/Test/IntegrationCase.php",
"tests/Test/IntegrationCaseFactory.php",
"tests/Test/IntegrationCaseFactoryInterface.php",
@@ -5436,7 +5478,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2018-03-21T17:41:26+00:00"
+ "time": "2019-01-04T18:29:47+00:00"
},
{
"name": "instaclick/php-webdriver",
@@ -7158,16 +7200,16 @@
},
{
"name": "symfony/config",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "e5389132dc6320682de3643091121c048ff796b3"
+ "reference": "17c5d8941eb75a03d19bc76a43757738632d87b3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/e5389132dc6320682de3643091121c048ff796b3",
- "reference": "e5389132dc6320682de3643091121c048ff796b3",
+ "url": "https://api.github.com/repos/symfony/config/zipball/17c5d8941eb75a03d19bc76a43757738632d87b3",
+ "reference": "17c5d8941eb75a03d19bc76a43757738632d87b3",
"shasum": ""
},
"require": {
@@ -7218,20 +7260,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2018-09-08T13:15:14+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/console",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b"
+ "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
- "reference": "3b2b415d4c48fbefca7dc742aa0a0171bfae4e0b",
+ "url": "https://api.github.com/repos/symfony/console/zipball/a700b874d3692bc8342199adfb6d3b99f62cc61a",
+ "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a",
"shasum": ""
},
"require": {
@@ -7287,20 +7329,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T16:33:53+00:00"
+ "time": "2019-01-04T04:42:43+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb"
+ "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/3503415d4aafabc31cd08c3a4ebac7f43fde8feb",
- "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/12f86295c46c36af9896cf21db6b6b8a1465315d",
+ "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d",
"shasum": ""
},
"require": {
@@ -7340,20 +7382,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T16:33:53+00:00"
+ "time": "2019-01-02T09:30:52+00:00"
},
{
"name": "symfony/debug",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6"
+ "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
- "reference": "0a612e9dfbd2ccce03eb174365f31ecdca930ff6",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186",
+ "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186",
"shasum": ""
},
"require": {
@@ -7396,20 +7438,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T16:33:53+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "aea20fef4e92396928b5db175788b90234c0270d"
+ "reference": "928a38b18bd632d67acbca74d0b2eed09915e83e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/aea20fef4e92396928b5db175788b90234c0270d",
- "reference": "aea20fef4e92396928b5db175788b90234c0270d",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/928a38b18bd632d67acbca74d0b2eed09915e83e",
+ "reference": "928a38b18bd632d67acbca74d0b2eed09915e83e",
"shasum": ""
},
"require": {
@@ -7467,20 +7509,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:28:39+00:00"
+ "time": "2019-01-05T12:26:58+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb"
+ "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
- "reference": "b2e1f19280c09a42dc64c0b72b80fe44dd6e88fb",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2",
+ "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2",
"shasum": ""
},
"require": {
@@ -7530,20 +7572,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2018-07-26T09:06:28+00:00"
+ "time": "2019-01-01T18:08:36+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "d69930fc337d767607267d57c20a7403d0a822a4"
+ "reference": "c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/d69930fc337d767607267d57c20a7403d0a822a4",
- "reference": "d69930fc337d767607267d57c20a7403d0a822a4",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde",
+ "reference": "c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde",
"shasum": ""
},
"require": {
@@ -7580,20 +7622,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:28:39+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/finder",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d"
+ "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/54ba444dddc5bd5708a34bd095ea67c6eb54644d",
- "reference": "54ba444dddc5bd5708a34bd095ea67c6eb54644d",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e",
+ "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e",
"shasum": ""
},
"require": {
@@ -7629,20 +7671,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2018-10-03T08:46:40+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
- "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
- "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
+ "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
"shasum": ""
},
"require": {
@@ -7688,20 +7730,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.9.0",
+ "version": "v1.10.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae"
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae",
- "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+ "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
"shasum": ""
},
"require": {
@@ -7743,20 +7785,20 @@
"portable",
"shim"
],
- "time": "2018-08-06T14:22:27+00:00"
+ "time": "2018-09-21T13:07:52+00:00"
},
{
"name": "symfony/process",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "1dc2977afa7d70f90f3fefbcd84152813558910e"
+ "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/1dc2977afa7d70f90f3fefbcd84152813558910e",
- "reference": "1dc2977afa7d70f90f3fefbcd84152813558910e",
+ "url": "https://api.github.com/repos/symfony/process/zipball/0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c",
+ "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c",
"shasum": ""
},
"require": {
@@ -7792,20 +7834,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:28:39+00:00"
+ "time": "2019-01-02T21:24:08+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v3.4.17",
+ "version": "v3.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "05e52a39de52ba690aebaed462b2bc8a9649f0a4"
+ "reference": "af55d31cb58c5452d2c160655fa1968b872a8084"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/05e52a39de52ba690aebaed462b2bc8a9649f0a4",
- "reference": "05e52a39de52ba690aebaed462b2bc8a9649f0a4",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/af55d31cb58c5452d2c160655fa1968b872a8084",
+ "reference": "af55d31cb58c5452d2c160655fa1968b872a8084",
"shasum": ""
},
"require": {
@@ -7841,7 +7883,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2018-10-02T12:28:39+00:00"
+ "time": "2019-01-01T13:45:19+00:00"
},
{
"name": "theseer/fdomdocument",
@@ -7925,20 +7967,21 @@
},
{
"name": "webmozart/assert",
- "version": "1.3.0",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
- "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+ "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
+ "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
"shasum": ""
},
"require": {
- "php": "^5.3.3 || ^7.0"
+ "php": "^5.3.3 || ^7.0",
+ "symfony/polyfill-ctype": "^1.8"
},
"require-dev": {
"phpunit/phpunit": "^4.6",
@@ -7971,7 +8014,7 @@
"check",
"validate"
],
- "time": "2018-01-29T19:49:41+00:00"
+ "time": "2018-12-25T11:19:39+00:00"
}
],
"aliases": [],
diff --git a/module/VuFind/src/VuFind/ChannelProvider/AlphaBrowse.php b/module/VuFind/src/VuFind/ChannelProvider/AlphaBrowse.php
index 0527d8d6bd1..91d25c794ba 100644
--- a/module/VuFind/src/VuFind/ChannelProvider/AlphaBrowse.php
+++ b/module/VuFind/src/VuFind/ChannelProvider/AlphaBrowse.php
@@ -30,7 +30,6 @@ namespace VuFind\ChannelProvider;
use VuFind\I18n\Translator\TranslatorAwareInterface;
use VuFind\Record\Router as RecordRouter;
use VuFind\RecordDriver\AbstractBase as RecordDriver;
-use VuFind\Search\Base\Params;
use VuFind\Search\Base\Results;
use VuFindSearch\Backend\Solr\Backend;
use VuFindSearch\ParamBag;
diff --git a/module/VuFind/src/VuFind/ChannelProvider/SimilarItems.php b/module/VuFind/src/VuFind/ChannelProvider/SimilarItems.php
index 9c01d2ca719..a69a6126615 100644
--- a/module/VuFind/src/VuFind/ChannelProvider/SimilarItems.php
+++ b/module/VuFind/src/VuFind/ChannelProvider/SimilarItems.php
@@ -30,7 +30,6 @@ namespace VuFind\ChannelProvider;
use VuFind\I18n\Translator\TranslatorAwareInterface;
use VuFind\Record\Router as RecordRouter;
use VuFind\RecordDriver\AbstractBase as RecordDriver;
-use VuFind\Search\Base\Params;
use VuFind\Search\Base\Results;
use Zend\Mvc\Controller\Plugin\Url;
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ShibbolethTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ShibbolethTest.php
index 6e9e72d2529..cd5f254522c 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ShibbolethTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Auth/ShibbolethTest.php
@@ -28,7 +28,6 @@
namespace VuFindTest\Auth;
use VuFind\Auth\Shibboleth;
-use VuFind\Db\Table\User;
use Zend\Config\Config;
/**
diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/MultiAuthTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/MultiAuthTest.php
index 9742ad92698..24d3f1a26c4 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/MultiAuthTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/Auth/MultiAuthTest.php
@@ -27,7 +27,6 @@
*/
namespace VuFindTest\Auth;
-use VuFind\Auth\MultiAuth;
use Zend\Config\Config;
/**
diff --git a/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml b/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
index a8855831777..2eaabf714ee 100644
--- a/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
+++ b/themes/bootstrap3/templates/RecordDriver/EDS/result-list.phtml
@@ -61,7 +61,7 @@
<?php $customLinks = array_merge($this->driver->getFTCustomLinks(), $this->driver->getCustomLinks());
if (!empty($customLinks)): ?>
<?php foreach ($customLinks as $customLink): ?>
- <?php
+ <?php
$url = $customLink['Url'] ?? '';
$mot = $customLink['MouseOverText'] ?? '';
$icon = $customLink['Icon'] ?? '';
--
GitLab