From a07108746008fd47dab3cf720cccc64030272822 Mon Sep 17 00:00:00 2001 From: James Candan Date: Fri, 13 Sep 2019 10:17:19 -0400 Subject: [PATCH] upgrade search_api_solr to 3.x --- composer.json | 2 +- composer.lock | 498 ++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 464 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index 3761ae5b..287f1c8b 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,7 @@ "drupal/redis": "^1.1", "drupal/search_api": "^1.0", "drupal/search_api_page": "^1.0-alpha11", - "drupal/search_api_solr": "^1.2", + "drupal/search_api_solr": "^3.0", "drupal/simple_gmap": "^1.3", "drupal/swiftmailer": "1.x-dev", "drupal/taxonomy_menu": "^3", diff --git a/composer.lock b/composer.lock index 154a54c9..9f2f7503 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1977bb1cdc83e6a3ad2981c68752adcc", + "content-hash": "057c9693085c535ae8e627d22e3898e8", "packages": [ { "name": "DoersGuild/jQuery.print", @@ -15,7 +15,7 @@ "reference": "origin/master" }, "type": "drupal-library", - "time": "2018-10-02T04:51:42+00:00" + "time": "2018-11-14T16:25:33+00:00" }, { "name": "acromedia/acro_live_css", @@ -6280,46 +6280,66 @@ }, { "name": "drupal/search_api_solr", - "version": "1.2.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api_solr.git", - "reference": "8.x-1.2" + "reference": "8.x-3.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api_solr-8.x-1.2.zip", - "reference": "8.x-1.2", - "shasum": "cd77fc851d36ecfb04a0c29967c93e5c47e2d2c6" + "url": "https://ftp.drupal.org/files/projects/search_api_solr-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "1990a5e6d24bfaaab9200c646e3fd0c511d2ac46" }, "require": { - "drupal/core": "~8.0", - "drupal/search_api": "~1.3", - "solarium/solarium": "3.8.*" + "consolidation/annotated-command": "^2.12", + "drupal/core": "^8.6", + "drupal/search_api": "~1.14", + "ext-dom": "*", + "ext-json": "*", + "ext-simplexml": "*", + "maennchen/zipstream-php": "^1.1.0", + "php": "^7.1", + "solarium/solarium": "~5.0.3", + "zendframework/zend-stdlib": "^3.0.1" + }, + "conflict": { + "drupal/core": "<8.6", + "drupal/search_api_solr_multilingual": "<3.0.0" }, "require-dev": { + "drupal/devel": "*", "drupal/facets": "1.x-dev", "drupal/geofield": "1.x-dev", "drupal/search_api_autocomplete": "1.x-dev", "drupal/search_api_location": "1.x-dev", - "phayes/geophp": "dev-master" + "drupal/search_api_spellcheck": "3.x-dev", + "phayes/geophp": "^1.2" }, "suggest": { "drupal/facets": "Provides facetted search.", - "drupal/search_api_solr_multilingual": "Highly recommended if installation is multilingual or uses a language different than English." + "drupal/search_api_autocomplete": "Provides auto complete for search boxes.", + "drupal/search_api_location": "Provides location searches.", + "drupal/search_api_spellcheck": "Provides spell checking and 'Did You Mean?'." }, "type": "drupal-module", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-1.2", - "datestamp": "1549962207", + "version": "8.x-3.4", + "datestamp": "1566214087", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } + }, + "drush": { + "services": { + "drush.services.yml": "^9" + } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -6357,7 +6377,7 @@ "support": { "source": "http://git.drupal.org/project/search_api_solr.git", "issues": "https://www.drupal.org/project/issues/search_api_solr", - "irc": "irc://irc.freenode.org/drupal-search-api" + "irc": "https://drupalchat.me/channel/search" } }, { @@ -8062,6 +8082,67 @@ ], "time": "2017-02-03T11:58:58+00:00" }, + { + "name": "maennchen/zipstream-php", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/maennchen/ZipStream-PHP.git", + "reference": "6373eefe0b3274d7b702d81f2c99aa977ff97dc2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/6373eefe0b3274d7b702d81f2c99aa977ff97dc2", + "reference": "6373eefe0b3274d7b702d81f2c99aa977ff97dc2", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "myclabs/php-enum": "^1.5", + "php": ">= 7.1", + "psr/http-message": "^1.0" + }, + "require-dev": { + "ext-zip": "*", + "guzzlehttp/guzzle": ">= 6.3", + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": ">= 7.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "ZipStream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paul Duncan", + "email": "pabs@pablotron.org" + }, + { + "name": "Jesse Donat", + "email": "donatj@gmail.com" + }, + { + "name": "Jonatan Männchen", + "email": "jonatan@maennchen.ch" + }, + { + "name": "András Kolesár", + "email": "kolesar@kolesar.hu" + } + ], + "description": "ZipStream is a library for dynamically streaming dynamic zip files from PHP without writing to the disk at all on the server.", + "keywords": [ + "stream", + "zip" + ], + "time": "2019-07-17T11:01:58+00:00" + }, { "name": "masterminds/html5", "version": "2.6.0", @@ -8129,6 +8210,51 @@ ], "time": "2019-03-10T11:41:28+00:00" }, + { + "name": "myclabs/php-enum", + "version": "1.7.2", + "source": { + "type": "git", + "url": "https://github.com/myclabs/php-enum.git", + "reference": "45f01adf6922df6082bcda36619deb466e826acf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/45f01adf6922df6082bcda36619deb466e826acf", + "reference": "45f01adf6922df6082bcda36619deb466e826acf", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35|^5.7|^6.0", + "squizlabs/php_codesniffer": "1.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "MyCLabs\\Enum\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP Enum contributors", + "homepage": "https://github.com/myclabs/php-enum/graphs/contributors" + } + ], + "description": "PHP Enum implementation", + "homepage": "http://github.com/myclabs/php-enum", + "keywords": [ + "enum" + ], + "time": "2019-08-19T13:53:00+00:00" + }, { "name": "nikic/php-parser", "version": "v4.2.2", @@ -8592,6 +8718,52 @@ ], "time": "2017-09-28T19:23:19+00:00" }, + { + "name": "psr/cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "time": "2016-08-06T20:24:11+00:00" + }, { "name": "psr/container", "version": "1.0.0", @@ -9270,28 +9442,30 @@ }, { "name": "solarium/solarium", - "version": "3.8.1", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/solariumphp/solarium.git", - "reference": "c353babec89fdbe8c64054bfec8e77bcb5da6705" + "reference": "fcec6d7fa9d6704e45afed0d050ff069f3e0e86f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/solariumphp/solarium/zipball/c353babec89fdbe8c64054bfec8e77bcb5da6705", - "reference": "c353babec89fdbe8c64054bfec8e77bcb5da6705", + "url": "https://api.github.com/repos/solariumphp/solarium/zipball/fcec6d7fa9d6704e45afed0d050ff069f3e0e86f", + "reference": "fcec6d7fa9d6704e45afed0d050ff069f3e0e86f", "shasum": "" }, "require": { - "php": ">=5.3.2", - "symfony/event-dispatcher": "~2.3|~3.0" + "ext-json": "*", + "php": "^7.1", + "symfony/cache": "^3.1 || ^4.0", + "symfony/event-dispatcher": "^3.1 || ^4.0" }, "require-dev": { "guzzlehttp/guzzle": "^3.8 || ^6.2", - "phpunit/phpunit": "~3.7", - "satooshi/php-coveralls": "~1.0", - "squizlabs/php_codesniffer": "~1.4", - "zendframework/zendframework1": "~1.12" + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^8.0", + "squizlabs/php_codesniffer": "^3.4", + "zendframework/zend-http": "^2.8" }, "suggest": { "minimalcode/search": "Query builder compatible with Solarium, allows simplified solr-query handling" @@ -9299,12 +9473,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "3.3.x-dev" + "dev-master": "4.1.x-dev" } }, "autoload": { - "psr-0": { - "Solarium\\": "library/" + "psr-4": { + "Solarium\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -9324,7 +9498,7 @@ "search", "solr" ], - "time": "2017-02-02T13:32:22+00:00" + "time": "2019-07-05T14:34:48+00:00" }, { "name": "stack/builder", @@ -9533,6 +9707,142 @@ ], "time": "2017-05-09T08:10:41+00:00" }, + { + "name": "symfony/cache", + "version": "v4.3.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache.git", + "reference": "1d8f7fee990c586f275cde1a9fc883d6b1e2d43e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache/zipball/1d8f7fee990c586f275cde1a9fc883d6b1e2d43e", + "reference": "1d8f7fee990c586f275cde1a9fc883d6b1e2d43e", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/cache": "~1.0", + "psr/log": "~1.0", + "symfony/cache-contracts": "^1.1", + "symfony/service-contracts": "^1.1", + "symfony/var-exporter": "^4.2" + }, + "conflict": { + "doctrine/dbal": "<2.5", + "symfony/dependency-injection": "<3.4", + "symfony/var-dumper": "<3.4" + }, + "provide": { + "psr/cache-implementation": "1.0", + "psr/simple-cache-implementation": "1.0", + "symfony/cache-implementation": "1.0" + }, + "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/cache": "~1.6", + "doctrine/dbal": "~2.5", + "predis/predis": "~1.1", + "psr/simple-cache": "^1.0", + "symfony/config": "~4.2", + "symfony/dependency-injection": "~3.4|~4.1", + "symfony/var-dumper": "^4.1.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Cache\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Cache component with PSR-6, PSR-16, and tags", + "homepage": "https://symfony.com", + "keywords": [ + "caching", + "psr6" + ], + "time": "2019-08-26T08:26:39+00:00" + }, + { + "name": "symfony/cache-contracts", + "version": "v1.1.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/cache-contracts.git", + "reference": "ec5524b669744b5f1dc9c66d3c2b091eb7e7f0db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ec5524b669744b5f1dc9c66d3c2b091eb7e7f0db", + "reference": "ec5524b669744b5f1dc9c66d3c2b091eb7e7f0db", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/cache": "^1.0" + }, + "suggest": { + "symfony/cache-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Cache\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to caching", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-06-13T11:15:36+00:00" + }, { "name": "symfony/class-loader", "version": "v3.4.29", @@ -9964,16 +10274,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v3.4.29", + "version": "v3.4.31", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f18fdd6cc7006441865e698420cee26bac94741f" + "reference": "3e922c4c3430b9de624e8a285dada5e61e230959" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f18fdd6cc7006441865e698420cee26bac94741f", - "reference": "f18fdd6cc7006441865e698420cee26bac94741f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3e922c4c3430b9de624e8a285dada5e61e230959", + "reference": "3e922c4c3430b9de624e8a285dada5e61e230959", "shasum": "" }, "require": { @@ -10023,7 +10333,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-06-25T07:45:31+00:00" + "time": "2019-08-23T08:05:57+00:00" }, { "name": "symfony/filesystem", @@ -10826,6 +11136,64 @@ "homepage": "https://symfony.com", "time": "2019-06-14T05:50:06+00:00" }, + { + "name": "symfony/service-contracts", + "version": "v1.1.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3", + "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/container": "^1.0" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-08-20T14:44:19+00:00" + }, { "name": "symfony/translation", "version": "v3.4.29", @@ -11057,6 +11425,66 @@ ], "time": "2019-06-17T17:37:00+00:00" }, + { + "name": "symfony/var-exporter", + "version": "v4.3.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-exporter.git", + "reference": "d5b4e2d334c1d80e42876c7d489896cfd37562f2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/d5b4e2d334c1d80e42876c7d489896cfd37562f2", + "reference": "d5b4e2d334c1d80e42876c7d489896cfd37562f2", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "require-dev": { + "symfony/var-dumper": "^4.1.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A blend of var_export() + serialize() to turn any serializable data structure to plain PHP code", + "homepage": "https://symfony.com", + "keywords": [ + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "serialize" + ], + "time": "2019-08-22T07:33:08+00:00" + }, { "name": "symfony/yaml", "version": "v3.4.29",