From fe11d7f7cc7357ed46cc9365a8948e3cd1cc655c Mon Sep 17 00:00:00 2001 From: Michael van den Eijnden Date: Mon, 2 May 2022 16:19:07 -0500 Subject: [PATCH 1/9] Index working, still needs testing for events --- composer.json | 4 +- composer.lock | 1453 ++++++++--------- config/packages/fos_elastica.yaml | 244 ++- config/services.yaml | 10 +- .../RebuildElasticsearchIndexCommand.php | 104 -- src/Event/DatasetIndexSubscriber.php | 15 +- symfony.lock | 24 +- 7 files changed, 812 insertions(+), 1042 deletions(-) delete mode 100644 src/Command/RebuildElasticsearchIndexCommand.php diff --git a/composer.json b/composer.json index 0578a7e7fa..b42d07a05e 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "doctrine/doctrine-migrations-bundle": "^2.0", "doctrine/orm": "^2.5", "easycorp/easyadmin-bundle": "^3.5", - "friendsofsymfony/elastica-bundle": "^5.1.1", + "friendsofsymfony/elastica-bundle": "^6.1.0", "friendsofsymfony/jsrouting-bundle": "^2.1", "friendsofsymfony/rest-bundle": "^2.5", "guzzlehttp/guzzle": "~6.0", @@ -72,7 +72,7 @@ }, "sort-packages": true, "platform": { - "php": "7.3.0" + "php": "7.4.29" }, "allow-plugins": { "symfony/flex": true diff --git a/composer.lock b/composer.lock index cd0c8aab28..25230f4877 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": "8d3c99d53b0fae6107b462f265a38abc", + "content-hash": "126ac88b8420449dfaaa4eca3615ee54", "packages": [ { "name": "brick/math", @@ -199,16 +199,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99.4", + "version": "1.11.99.5", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "b174585d1fe49ceed21928a945138948cb394600" + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", - "reference": "b174585d1fe49ceed21928a945138948cb394600", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", + "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", "shasum": "" }, "require": { @@ -252,7 +252,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" }, "funding": [ { @@ -268,7 +268,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T08:41:34+00:00" + "time": "2022-01-17T14:14:24+00:00" }, { "name": "doctrine/annotations", @@ -344,16 +344,16 @@ }, { "name": "doctrine/cache", - "version": "1.12.1", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8" + "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/4cf401d14df219fa6f38b671f5493449151c9ad8", - "reference": "4cf401d14df219fa6f38b671f5493449151c9ad8", + "url": "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce", + "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce", "shasum": "" }, "require": { @@ -423,7 +423,7 @@ ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.12.1" + "source": "https://github.com/doctrine/cache/tree/2.1.1" }, "funding": [ { @@ -439,7 +439,7 @@ "type": "tidelift" } ], - "time": "2021-07-17T14:39:21+00:00" + "time": "2021-07-17T14:49:29+00:00" }, { "name": "doctrine/collections", @@ -512,43 +512,32 @@ }, { "name": "doctrine/common", - "version": "2.13.3", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f" + "reference": "c824e95d4c83b7102d8bc60595445a6f7d540f96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/f3812c026e557892c34ef37f6ab808a6b567da7f", - "reference": "f3812c026e557892c34ef37f6ab808a6b567da7f", + "url": "https://api.github.com/repos/doctrine/common/zipball/c824e95d4c83b7102d8bc60595445a6f7d540f96", + "reference": "c824e95d4c83b7102d8bc60595445a6f7d540f96", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", - "doctrine/cache": "^1.0", - "doctrine/collections": "^1.0", - "doctrine/event-manager": "^1.0", - "doctrine/inflector": "^1.0", - "doctrine/lexer": "^1.0", - "doctrine/persistence": "^1.3.3", - "doctrine/reflection": "^1.0", + "doctrine/persistence": "^2.0 || ^3.0", "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^1.0", - "phpstan/phpstan": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpunit/phpunit": "^7.0", + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "^1.4.1", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.0", - "symfony/phpunit-bridge": "^4.0.5" + "symfony/phpunit-bridge": "^4.0.5", + "vimeo/psalm": "^4.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.11.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\": "lib/Doctrine/Common" @@ -584,7 +573,7 @@ "email": "ocramius@gmail.com" } ], - "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, persistence interfaces, proxies, event system and much more.", + "description": "PHP Doctrine Common project is a library that provides additional functionality that other Doctrine projects depend on such as better reflection support, proxies and much more.", "homepage": "https://www.doctrine-project.org/projects/common.html", "keywords": [ "common", @@ -593,7 +582,7 @@ ], "support": { "issues": "https://github.com/doctrine/common/issues", - "source": "https://github.com/doctrine/common/tree/2.13.x" + "source": "https://github.com/doctrine/common/tree/3.3.0" }, "funding": [ { @@ -609,37 +598,42 @@ "type": "tidelift" } ], - "time": "2020-06-05T16:46:05+00:00" + "time": "2022-02-05T18:28:51+00:00" }, { "name": "doctrine/data-fixtures", - "version": "1.5.1", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "f18adf13f6c81c67a88360dca359ad474523f8e3" + "reference": "ba37bfb776de763c5bf04a36d074cd5f5a083c42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/f18adf13f6c81c67a88360dca359ad474523f8e3", - "reference": "f18adf13f6c81c67a88360dca359ad474523f8e3", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/ba37bfb776de763c5bf04a36d074cd5f5a083c42", + "reference": "ba37bfb776de763c5bf04a36d074cd5f5a083c42", "shasum": "" }, "require": { "doctrine/common": "^2.13|^3.0", - "doctrine/persistence": "^1.3.3|^2.0", + "doctrine/persistence": "^1.3.3|^2.0|^3.0", "php": "^7.2 || ^8.0" }, "conflict": { + "doctrine/dbal": "<2.13", "doctrine/phpcr-odm": "<1.3.0" }, "require-dev": { "doctrine/coding-standard": "^9.0", - "doctrine/dbal": "^2.5.4 || ^3.0", + "doctrine/dbal": "^2.13 || ^3.0", "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", "doctrine/orm": "^2.7.0", "ext-sqlite3": "*", - "phpunit/phpunit": "^8.0" + "jangregor/phpstan-prophecy": "^1", + "phpstan/phpstan": "^1.5", + "phpunit/phpunit": "^8.5 || ^9.5", + "symfony/cache": "^5.0 || ^6.0", + "vimeo/psalm": "^4.10" }, "suggest": { "alcaeus/mongo-php-adapter": "For using MongoDB ODM 1.3 with PHP 7 (deprecated)", @@ -664,13 +658,13 @@ } ], "description": "Data Fixtures for all Doctrine Object Managers", - "homepage": "http://www.doctrine-project.org", + "homepage": "https://www.doctrine-project.org", "keywords": [ "database" ], "support": { "issues": "https://github.com/doctrine/data-fixtures/issues", - "source": "https://github.com/doctrine/data-fixtures/tree/1.5.1" + "source": "https://github.com/doctrine/data-fixtures/tree/1.5.3" }, "funding": [ { @@ -686,25 +680,25 @@ "type": "tidelift" } ], - "time": "2021-09-20T21:51:43+00:00" + "time": "2022-04-19T10:01:44+00:00" }, { "name": "doctrine/dbal", - "version": "2.13.4", + "version": "2.13.9", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "2411a55a2a628e6d8dd598388ab13474802c7b6e" + "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/2411a55a2a628e6d8dd598388ab13474802c7b6e", - "reference": "2411a55a2a628e6d8dd598388ab13474802c7b6e", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/c480849ca3ad6706a39c970cdfe6888fa8a058b8", + "reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8", "shasum": "" }, "require": { "doctrine/cache": "^1.0|^2.0", - "doctrine/deprecations": "^0.5.3", + "doctrine/deprecations": "^0.5.3|^1", "doctrine/event-manager": "^1.0", "ext-pdo": "*", "php": "^7.1 || ^8" @@ -712,13 +706,13 @@ "require-dev": { "doctrine/coding-standard": "9.0.0", "jetbrains/phpstorm-stubs": "2021.1", - "phpstan/phpstan": "0.12.99", - "phpunit/phpunit": "^7.5.20|^8.5|9.5.10", + "phpstan/phpstan": "1.4.6", + "phpunit/phpunit": "^7.5.20|^8.5|9.5.16", "psalm/plugin-phpunit": "0.16.1", - "squizlabs/php_codesniffer": "3.6.0", + "squizlabs/php_codesniffer": "3.6.2", "symfony/cache": "^4.4", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "4.10.0" + "vimeo/psalm": "4.22.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -779,7 +773,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/2.13.4" + "source": "https://github.com/doctrine/dbal/tree/2.13.9" }, "funding": [ { @@ -795,7 +789,7 @@ "type": "tidelift" } ], - "time": "2021-10-02T15:59:26+00:00" + "time": "2022-05-02T20:28:55+00:00" }, { "name": "doctrine/deprecations", @@ -1240,8 +1234,8 @@ }, "autoload": { "psr-4": { - "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector", - "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector", + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -1306,29 +1300,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" + "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", + "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", + "doctrine/coding-standard": "^9", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.22" }, "type": "library", "autoload": { @@ -1355,7 +1350,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.0" + "source": "https://github.com/doctrine/instantiator/tree/1.4.1" }, "funding": [ { @@ -1371,36 +1366,32 @@ "type": "tidelift" } ], - "time": "2020-11-10T18:47:58+00:00" + "time": "2022-03-03T08:28:38+00:00" }, { "name": "doctrine/lexer", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229", + "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "^1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.11" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" @@ -1435,7 +1426,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" + "source": "https://github.com/doctrine/lexer/tree/1.2.3" }, "funding": [ { @@ -1451,7 +1442,7 @@ "type": "tidelift" } ], - "time": "2020-05-25T17:44:05+00:00" + "time": "2022-02-28T11:07:21+00:00" }, { "name": "doctrine/migrations", @@ -1550,53 +1541,60 @@ }, { "name": "doctrine/orm", - "version": "2.7.5", + "version": "2.12.1", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "01187c9260cd085529ddd1273665217cae659640" + "reference": "2e4a8722721b934149ff53b191522a6829b6d73b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/01187c9260cd085529ddd1273665217cae659640", - "reference": "01187c9260cd085529ddd1273665217cae659640", + "url": "https://api.github.com/repos/doctrine/orm/zipball/2e4a8722721b934149ff53b191522a6829b6d73b", + "reference": "2e4a8722721b934149ff53b191522a6829b6d73b", "shasum": "" }, "require": { - "composer/package-versions-deprecated": "^1.8", - "doctrine/annotations": "^1.11.1", - "doctrine/cache": "^1.9.1", + "composer-runtime-api": "^2", + "doctrine/cache": "^1.12.1 || ^2.1.1", "doctrine/collections": "^1.5", - "doctrine/common": "^2.11 || ^3.0", - "doctrine/dbal": "^2.9.3", + "doctrine/common": "^3.0.3", + "doctrine/dbal": "^2.13.1 || ^3.2", + "doctrine/deprecations": "^0.5.3", "doctrine/event-manager": "^1.1", - "doctrine/inflector": "^1.0", + "doctrine/inflector": "^1.4 || ^2.0", "doctrine/instantiator": "^1.3", - "doctrine/lexer": "^1.0", - "doctrine/persistence": "^1.3.3 || ^2.0", - "ext-pdo": "*", - "php": "^7.1", - "symfony/console": "^3.0|^4.0|^5.0" + "doctrine/lexer": "^1.2.3", + "doctrine/persistence": "^2.4 || ^3", + "ext-ctype": "*", + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3", + "symfony/console": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/polyfill-php72": "^1.23", + "symfony/polyfill-php80": "^1.16" + }, + "conflict": { + "doctrine/annotations": "<1.13 || >= 2.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.12.18", - "phpunit/phpunit": "^8.0", - "symfony/yaml": "^3.4|^4.0|^5.0", - "vimeo/psalm": "^3.11" + "doctrine/annotations": "^1.13", + "doctrine/coding-standard": "^9.0", + "phpbench/phpbench": "^0.16.10 || ^1.0", + "phpstan/phpstan": "~1.4.10 || 1.5.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", + "psr/log": "^1 || ^2 || ^3", + "squizlabs/php_codesniffer": "3.6.2", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", + "vimeo/psalm": "4.22.0" }, "suggest": { + "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0", "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, "bin": [ "bin/doctrine" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev" - } - }, "autoload": { "psr-4": { "Doctrine\\ORM\\": "lib/Doctrine/ORM" @@ -1636,51 +1634,51 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.7.5" + "source": "https://github.com/doctrine/orm/tree/2.12.1" }, - "time": "2020-12-03T08:52:14+00:00" + "time": "2022-04-22T17:46:03+00:00" }, { "name": "doctrine/persistence", - "version": "1.3.8", + "version": "2.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "7a6eac9fb6f61bba91328f15aa7547f4806ca288" + "reference": "4276c6cbc0ca692c190f650a2678623bf04af2d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/7a6eac9fb6f61bba91328f15aa7547f4806ca288", - "reference": "7a6eac9fb6f61bba91328f15aa7547f4806ca288", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/4276c6cbc0ca692c190f650a2678623bf04af2d2", + "reference": "4276c6cbc0ca692c190f650a2678623bf04af2d2", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", - "doctrine/cache": "^1.0", + "doctrine/cache": "^1.11 || ^2.0", "doctrine/collections": "^1.0", + "doctrine/deprecations": "^0.5.3 || ^1", "doctrine/event-manager": "^1.0", - "doctrine/reflection": "^1.2", - "php": "^7.1 || ^8.0" + "php": "^7.1 || ^8.0", + "psr/cache": "^1.0 || ^2.0 || ^3.0" }, "conflict": { - "doctrine/common": "<2.10@dev" + "doctrine/annotations": "<1.0 || >=2.0", + "doctrine/common": "<2.10" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "vimeo/psalm": "^3.11" + "composer/package-versions-deprecated": "^1.11", + "doctrine/annotations": "^1.0", + "doctrine/coding-standard": "^9.0", + "doctrine/common": "^3.0", + "phpstan/phpstan": "~1.4.10 || 1.5.0", + "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "vimeo/psalm": "4.22.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common", - "Doctrine\\Persistence\\": "lib/Doctrine/Persistence" + "Doctrine\\Common\\": "src/Common", + "Doctrine\\Persistence\\": "src/Persistence" } }, "notification-url": "https://packagist.org/downloads/", @@ -1724,7 +1722,7 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/1.3.x" + "source": "https://github.com/doctrine/persistence/tree/2.5.2" }, "funding": [ { @@ -1740,90 +1738,7 @@ "type": "tidelift" } ], - "time": "2020-06-20T12:56:16+00:00" - }, - { - "name": "doctrine/reflection", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/doctrine/reflection.git", - "reference": "fa587178be682efe90d005e3a322590d6ebb59a5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/fa587178be682efe90d005e3a322590d6ebb59a5", - "reference": "fa587178be682efe90d005e3a322590d6ebb59a5", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1.0", - "ext-tokenizer": "*", - "php": "^7.1 || ^8.0" - }, - "conflict": { - "doctrine/common": "<2.9" - }, - "require-dev": { - "doctrine/coding-standard": "^6.0 || ^8.2.0", - "doctrine/common": "^2.10", - "phpstan/phpstan": "^0.11.0 || ^0.12.20", - "phpstan/phpstan-phpunit": "^0.11.0 || ^0.12.16", - "phpunit/phpunit": "^7.5 || ^9.1.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - }, - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - } - ], - "description": "The Doctrine Reflection project is a simple library used by the various Doctrine projects which adds some additional functionality on top of the reflection functionality that comes with PHP. It allows you to get the reflection information about classes, methods and properties statically.", - "homepage": "https://www.doctrine-project.org/projects/reflection.html", - "keywords": [ - "reflection", - "static" - ], - "support": { - "issues": "https://github.com/doctrine/reflection/issues", - "source": "https://github.com/doctrine/reflection/tree/1.2.2" - }, - "abandoned": "roave/better-reflection", - "time": "2020-10-27T21:46:55+00:00" + "time": "2022-05-02T17:29:02+00:00" }, { "name": "doctrine/sql-formatter", @@ -2044,33 +1959,32 @@ }, { "name": "elasticsearch/elasticsearch", - "version": "v6.7.2", + "version": "v7.17.0", "source": { "type": "git", "url": "https://github.com/elastic/elasticsearch-php.git", - "reference": "9ba89f905ebf699e72dacffa410331c7fecc8255" + "reference": "1890f9d7fde076b5a3ddcf579a802af05b2e781b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/9ba89f905ebf699e72dacffa410331c7fecc8255", - "reference": "9ba89f905ebf699e72dacffa410331c7fecc8255", + "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/1890f9d7fde076b5a3ddcf579a802af05b2e781b", + "reference": "1890f9d7fde076b5a3ddcf579a802af05b2e781b", "shasum": "" }, "require": { "ext-json": ">=1.3.7", - "guzzlehttp/ringphp": "~1.0", - "php": "^7.0", - "psr/log": "~1.0" + "ezimuel/ringphp": "^1.1.2", + "php": "^7.3 || ^8.0", + "psr/log": "^1|^2|^3" }, "require-dev": { - "cpliakas/git-wrapper": "^1.7 || ^2.1", - "doctrine/inflector": "^1.1", + "ext-yaml": "*", + "ext-zip": "*", "mockery/mockery": "^1.2", - "phpstan/phpstan-shim": "^0.9 || ^0.11", - "phpunit/phpunit": "^5.7 || ^6.5", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^9.3", "squizlabs/php_codesniffer": "^3.4", - "symfony/finder": "^2.8", - "symfony/yaml": "^2.8" + "symfony/finder": "~4.0" }, "suggest": { "ext-curl": "*", @@ -2078,13 +1992,17 @@ }, "type": "library", "autoload": { + "files": [ + "src/autoload.php" + ], "psr-4": { "Elasticsearch\\": "src/Elasticsearch/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "Apache-2.0", + "LGPL-2.1-only" ], "authors": [ { @@ -2102,9 +2020,9 @@ ], "support": { "issues": "https://github.com/elastic/elasticsearch-php/issues", - "source": "https://github.com/elastic/elasticsearch-php/tree/6.7.x" + "source": "https://github.com/elastic/elasticsearch-php/tree/v7.17.0" }, - "time": "2019-07-19T14:48:24+00:00" + "time": "2022-02-03T13:40:04+00:00" }, { "name": "exsyst/swagger", @@ -2149,18 +2067,128 @@ }, "time": "2020-11-19T17:14:18+00:00" }, + { + "name": "ezimuel/guzzlestreams", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/ezimuel/guzzlestreams.git", + "reference": "abe3791d231167f14eb80d413420d1eab91163a8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8", + "reference": "abe3791d231167f14eb80d413420d1eab91163a8", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Stream\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Fork of guzzle/streams (abandoned) to be used with elasticsearch-php", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "Guzzle", + "stream" + ], + "support": { + "source": "https://github.com/ezimuel/guzzlestreams/tree/3.0.1" + }, + "time": "2020-02-14T23:11:50+00:00" + }, + { + "name": "ezimuel/ringphp", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/ezimuel/ringphp.git", + "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/92b8161404ab1ad84059ebed41d9f757e897ce74", + "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74", + "shasum": "" + }, + "require": { + "ezimuel/guzzlestreams": "^3.0.1", + "php": ">=5.4.0", + "react/promise": "~2.0" + }, + "replace": { + "guzzlehttp/ringphp": "self.version" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~9.0" + }, + "suggest": { + "ext-curl": "Guzzle will use specific adapters if cURL is present" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Ring\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php", + "support": { + "source": "https://github.com/ezimuel/ringphp/tree/1.2.0" + }, + "time": "2021-11-16T11:51:30+00:00" + }, { "name": "friendsofphp/proxy-manager-lts", - "version": "v1.0.5", + "version": "v1.0.10", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git", - "reference": "006aa5d32f887a4db4353b13b5b5095613e0611f" + "reference": "88dda72c48633326c81a01b861c8b6a923948f56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/006aa5d32f887a4db4353b13b5b5095613e0611f", - "reference": "006aa5d32f887a4db4353b13b5b5095613e0611f", + "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/88dda72c48633326c81a01b861c8b6a923948f56", + "reference": "88dda72c48633326c81a01b861c8b6a923948f56", "shasum": "" }, "require": { @@ -2177,7 +2205,7 @@ }, "require-dev": { "ext-phar": "*", - "symfony/phpunit-bridge": "^5.2|^6.0" + "symfony/phpunit-bridge": "^5.4|^6.0" }, "type": "library", "extra": { @@ -2199,7 +2227,7 @@ { "name": "Marco Pivetta", "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.io/" + "homepage": "https://ocramius.github.io/" }, { "name": "Nicolas Grekas", @@ -2217,7 +2245,7 @@ ], "support": { "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues", - "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.5" + "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.10" }, "funding": [ { @@ -2229,56 +2257,61 @@ "type": "tidelift" } ], - "time": "2021-05-22T16:11:15+00:00" + "time": "2022-05-01T10:41:21+00:00" }, { "name": "friendsofsymfony/elastica-bundle", - "version": "v5.2.1", + "version": "v6.1.0", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSElasticaBundle.git", - "reference": "9e8903aaa0644afc0dbb697e2156e28e5a88865c" + "reference": "507196a22005b4667cc882eaa815dc202f79e6e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSElasticaBundle/zipball/9e8903aaa0644afc0dbb697e2156e28e5a88865c", - "reference": "9e8903aaa0644afc0dbb697e2156e28e5a88865c", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSElasticaBundle/zipball/507196a22005b4667cc882eaa815dc202f79e6e5", + "reference": "507196a22005b4667cc882eaa815dc202f79e6e5", "shasum": "" }, "require": { - "pagerfanta/pagerfanta": "^1.0.5|^2.0", - "php": "^7.1", - "psr/log": "^1.0", - "ruflin/elastica": "^5.3.5|^6.1.1", - "symfony/console": "^3.4|^4.3|^5", - "symfony/dependency-injection": "^3.4|^4.3|^5", - "symfony/framework-bundle": "^3.4|^4.3|^5", - "symfony/property-access": "^3.4|^4.3|^5" + "pagerfanta/pagerfanta": "^2.4 || ^3.0", + "php": "^7.4 || ^8.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "ruflin/elastica": "^7.1", + "symfony/console": "^4.4 || ^5.4 || ^6.0", + "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0", + "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/property-access": "^4.4 || ^5.4 || ^6.0" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.6|^2", - "doctrine/orm": "^2.5", - "doctrine/persistence": "^1.3.4", - "doctrine/phpcr-bundle": "^1.3|^2.0", + "doctrine/doctrine-bundle": "^2.1.1", + "doctrine/mongodb-odm": "^2.2", + "doctrine/orm": "^2.8", "doctrine/phpcr-odm": "^1.4", - "friendsofphp/php-cs-fixer": "^2.2", + "friendsofphp/php-cs-fixer": "^3.0", "jackalope/jackalope-doctrine-dbal": "^1.2", - "jms/serializer-bundle": "^2.4|^3.5", - "knplabs/knp-components": "^1.2|^2.3", - "phpunit/phpunit": "^6.5.14", - "symfony/expression-language": "^3.4|^4.3|^5", - "symfony/serializer": "^3.4|^4.3|^5", - "symfony/twig-bundle": "^3.4|^4.3|^5", - "symfony/web-profiler-bundle": "^3.4|^4.3|^5", - "symfony/yaml": "^3.4|^4.3|^5" + "jms/serializer": "^3.8", + "jms/serializer-bundle": "^3.5 || ^4.0", + "knplabs/knp-components": "^2.4 || ^3.0", + "pagerfanta/doctrine-mongodb-odm-adapter": "^2.4 || ^3.0", + "pagerfanta/doctrine-orm-adapter": "^2.4 || ^3.0", + "pagerfanta/doctrine-phpcr-odm-adapter": "^2.4 || ^3.0", + "phpunit/phpunit": "^9.5", + "symfony/expression-language": "^4.4 || ^5.4 || ^6.0", + "symfony/messenger": "^4.4 || ^5.4 || ^6.0", + "symfony/serializer": "^4.4 || ^5.4 || ^6.0", + "symfony/twig-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/web-profiler-bundle": "^4.4 || ^5.4 || ^6.0", + "symfony/yaml": "^4.4 || ^5.4 || ^6.0" }, "suggest": { - "enqueue/elastica-bundle": "The bundle adds extra features to FOSElasticaBundle bundle. Aimed to improve performance." + "enqueue/elastica-bundle": "For populating Elasticsearch indexes asynchronously and using significanly less resources. Uses Enqueue.", + "symfony/messenger": "For populating Elasticsearch indexes asynchronously and using significanly less resources." }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "5.2.x-dev" + "dev-master": "6.1.x-dev" } }, "autoload": { @@ -2319,9 +2352,9 @@ ], "support": { "issues": "https://github.com/FriendsOfSymfony/FOSElasticaBundle/issues", - "source": "https://github.com/FriendsOfSymfony/FOSElasticaBundle/tree/v5.2.1" + "source": "https://github.com/FriendsOfSymfony/FOSElasticaBundle/tree/v6.1.0" }, - "time": "2020-11-30T20:16:38+00:00" + "time": "2022-01-16T17:40:00+00:00" }, { "name": "friendsofsymfony/jsrouting-bundle", @@ -2695,156 +2728,45 @@ }, { "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com", - "homepage": "https://github.com/sagikazarmark" - }, - { - "name": "Tobias Schultze", - "email": "webmaster@tubo-world.de", - "homepage": "https://github.com/Tobion" - } - ], - "description": "PSR-7 message implementation that also provides common utility methods", - "keywords": [ - "http", - "message", - "psr-7", - "request", - "response", - "stream", - "uri", - "url" - ], - "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.5" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", - "type": "tidelift" - } - ], - "time": "2022-03-20T21:51:18+00:00" - }, - { - "name": "guzzlehttp/ringphp", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/guzzle/RingPHP.git", - "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/5e2a174052995663dd68e6b5ad838afd47dd615b", - "reference": "5e2a174052995663dd68e6b5ad838afd47dd615b", - "shasum": "" - }, - "require": { - "guzzlehttp/streams": "~3.0", - "php": ">=5.4.0", - "react/promise": "~2.0" - }, - "require-dev": { - "ext-curl": "*", - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "ext-curl": "Guzzle will use specific adapters if cURL is present" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Ring\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.", - "support": { - "issues": "https://github.com/guzzle/RingPHP/issues", - "source": "https://github.com/guzzle/RingPHP/tree/1.1.1" - }, - "abandoned": true, - "time": "2018-07-31T13:22:33+00:00" - }, - { - "name": "guzzlehttp/streams", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/streams.git", - "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/streams/zipball/47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5", - "reference": "47aaa48e27dae43d39fc1cea0ccf0d84ac1a2ba5", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Stream\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], - "description": "Provides a simple abstraction over streams of data", - "homepage": "http://guzzlephp.org/", + "description": "PSR-7 message implementation that also provides common utility methods", "keywords": [ - "Guzzle", - "stream" + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" ], "support": { - "issues": "https://github.com/guzzle/streams/issues", - "source": "https://github.com/guzzle/streams/tree/master" + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.8.5" }, - "abandoned": true, - "time": "2014-10-12T19:18:40+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2022-03-20T21:51:18+00:00" }, { "name": "hylianshield/alphabet", @@ -3180,49 +3102,39 @@ }, { "name": "laminas/laminas-code", - "version": "3.4.1", + "version": "4.5.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766" + "reference": "6fd96d4d913571a2cd056a27b123fa28cb90ac4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1cb8f203389ab1482bf89c0e70a04849bacd7766", - "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/6fd96d4d913571a2cd056a27b123fa28cb90ac4e", + "reference": "6fd96d4d913571a2cd056a27b123fa28cb90ac4e", "shasum": "" }, "require": { - "laminas/laminas-eventmanager": "^2.6 || ^3.0", - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^7.1" - }, - "conflict": { - "phpspec/prophecy": "<1.9.0" - }, - "replace": { - "zendframework/zend-code": "self.version" + "php": ">=7.4, <8.2" }, "require-dev": { - "doctrine/annotations": "^1.7", + "doctrine/annotations": "^1.13.2", "ext-phar": "*", - "laminas/laminas-coding-standard": "^1.0", - "laminas/laminas-stdlib": "^2.7 || ^3.0", - "phpunit/phpunit": "^7.5.16 || ^8.4" + "laminas/laminas-coding-standard": "^2.3.0", + "laminas/laminas-stdlib": "^3.6.1", + "phpunit/phpunit": "^9.5.10", + "psalm/plugin-phpunit": "^0.16.1", + "vimeo/psalm": "^4.13.1" }, "suggest": { "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", "laminas/laminas-stdlib": "Laminas\\Stdlib component" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4.x-dev", - "dev-develop": "3.5.x-dev", - "dev-dev-4.0": "4.0.x-dev" - } - }, "autoload": { + "files": [ + "polyfill/ReflectionEnumPolyfill.php" + ], "psr-4": { "Laminas\\Code\\": "src/" } @@ -3235,7 +3147,8 @@ "homepage": "https://laminas.dev", "keywords": [ "code", - "laminas" + "laminas", + "laminasframework" ], "support": { "chat": "https://laminas.dev/chat", @@ -3245,135 +3158,13 @@ "rss": "https://github.com/laminas/laminas-code/releases.atom", "source": "https://github.com/laminas/laminas-code" }, - "time": "2019-12-31T16:28:24+00:00" - }, - { - "name": "laminas/laminas-eventmanager", - "version": "3.4.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-eventmanager.git", - "reference": "a93fd278c97b2d41ebbce5ba048a24e3e6f580ba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/a93fd278c97b2d41ebbce5ba048a24e3e6f580ba", - "reference": "a93fd278c97b2d41ebbce5ba048a24e3e6f580ba", - "shasum": "" - }, - "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" - }, - "conflict": { - "zendframework/zend-eventmanager": "*" - }, - "require-dev": { - "container-interop/container-interop": "^1.1", - "laminas/laminas-coding-standard": "~2.2.1", - "laminas/laminas-stdlib": "^3.6", - "phpbench/phpbench": "^1.1", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^9.5.5" - }, - "suggest": { - "container-interop/container-interop": "^1.1, to use the lazy listeners feature", - "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature" - }, - "type": "library", - "autoload": { - "psr-4": { - "Laminas\\EventManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Trigger and listen to events within a PHP application", - "homepage": "https://laminas.dev", - "keywords": [ - "event", - "eventmanager", - "events", - "laminas" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-eventmanager/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-eventmanager/issues", - "rss": "https://github.com/laminas/laminas-eventmanager/releases.atom", - "source": "https://github.com/laminas/laminas-eventmanager" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2021-09-07T22:35:32+00:00" - }, - { - "name": "laminas/laminas-zendframework-bridge", - "version": "1.4.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "bf180a382393e7db5c1e8d0f2ec0c4af9c724baf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bf180a382393e7db5c1e8d0f2ec0c4af9c724baf", - "reference": "bf180a382393e7db5c1e8d0f2ec0c4af9c724baf", - "shasum": "" - }, - "require": { - "php": "^7.3 || ~8.0.0 || ~8.1.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.3", - "psalm/plugin-phpunit": "^0.15.1", - "squizlabs/php_codesniffer": "^3.5", - "vimeo/psalm": "^4.6" - }, - "type": "library", - "extra": { - "laminas": { - "module": "Laminas\\ZendFrameworkBridge" - } - }, - "autoload": { - "files": [ - "src/autoload.php" - ], - "psr-4": { - "Laminas\\ZendFrameworkBridge\\": "src//" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Alias legacy ZF class names to Laminas Project equivalents.", - "keywords": [ - "ZendFramework", - "autoloading", - "laminas", - "zf" - ], - "support": { - "forum": "https://discourse.laminas.dev/", - "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues", - "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom", - "source": "https://github.com/laminas/laminas-zendframework-bridge" - }, "funding": [ { "url": "https://funding.communitybridge.org/projects/laminas-project", "type": "community_bridge" } ], - "time": "2021-09-03T17:53:30+00:00" + "time": "2021-12-19T18:06:55+00:00" }, { "name": "league/flysystem", @@ -3894,6 +3685,67 @@ }, "time": "2021-05-03T19:11:20+00:00" }, + { + "name": "nyholm/dsn", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/Nyholm/dsn.git", + "reference": "9445621b426bac8c0ca161db8cd700da00a4e618" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nyholm/dsn/zipball/9445621b426bac8c0ca161db8cd700da00a4e618", + "reference": "9445621b426bac8c0ca161db8cd700da00a4e618", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "symfony/phpunit-bridge": "^5.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "psr-4": { + "Nyholm\\Dsn\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" + } + ], + "description": "Parse your DSN strings in a powerful and flexible way", + "homepage": "http://tnyholm.se", + "keywords": [ + "database", + "dsn", + "dsn parser", + "parser" + ], + "support": { + "issues": "https://github.com/Nyholm/dsn/issues", + "source": "https://github.com/Nyholm/dsn/tree/2.0.1" + }, + "funding": [ + { + "url": "https://github.com/Nyholm", + "type": "github" + } + ], + "time": "2021-11-18T09:23:29+00:00" + }, { "name": "oneup/flysystem-bundle", "version": "3.7.0", @@ -4054,24 +3906,32 @@ }, { "name": "pagerfanta/pagerfanta", - "version": "v2.7.1", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/BabDev/Pagerfanta.git", - "reference": "630f38d57c86b67565b644db9d270ffb6d67123f" + "reference": "845c7e820c057b24abd0f17822d4c78ed06261f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BabDev/Pagerfanta/zipball/630f38d57c86b67565b644db9d270ffb6d67123f", - "reference": "630f38d57c86b67565b644db9d270ffb6d67123f", + "url": "https://api.github.com/repos/BabDev/Pagerfanta/zipball/845c7e820c057b24abd0f17822d4c78ed06261f1", + "reference": "845c7e820c057b24abd0f17822d4c78ed06261f1", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.2 || ^8.0", - "symfony/deprecation-contracts": "^2.1" + "php": "^7.4 || ^8.0", + "symfony/deprecation-contracts": "^2.1 || ^3.0", + "symfony/polyfill-php80": "^1.15" }, "conflict": { + "doctrine/collections": "<1.6", + "doctrine/dbal": "<2.13.1 || ~3.0.0", + "doctrine/mongodb-odm": "<2.2.2", + "doctrine/orm": "<2.8", + "doctrine/phpcr-odm": "<1.5", + "ruflin/elastica": "<6.0", + "solarium/solarium": "<5.0", "twig/twig": "<1.35 || >=2.0,<2.5" }, "replace": { @@ -4086,22 +3946,23 @@ "pagerfanta/twig": "self.version" }, "require-dev": { - "dg/bypass-finals": "^1.2.2", - "doctrine/collections": "^1.4", - "doctrine/dbal": "^2.5 || ^3.0", - "doctrine/orm": "^2.5", - "doctrine/phpcr-odm": "^1.3", - "friendsofphp/php-cs-fixer": "^2.18.2", - "jackalope/jackalope-doctrine-dbal": "^1.3", - "mandango/mandango": "^1.0@dev", - "phpstan/extension-installer": "^1.0.4", - "phpstan/phpstan": "^0.12.79", - "phpstan/phpstan-phpunit": "^0.12.17", - "phpunit/phpunit": "^8.5 || ^9.0", - "propel/propel": "^2.0@dev", - "propel/propel1": "^1.7", - "ruflin/elastica": "^1.3 || ^2.0 || ^3.0 || ^5.0 || ^6.0 || ^7.0", - "solarium/solarium": "^2.3 || ^3.0 || ^4.0 || ^5.0 || ^6.0", + "dg/bypass-finals": "^1.3", + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/collections": "^1.6", + "doctrine/dbal": "^2.13.1 || ^3.1", + "doctrine/mongodb-odm": "^2.2.2", + "doctrine/orm": "^2.8", + "doctrine/phpcr-odm": "^1.5", + "friendsofphp/php-cs-fixer": "3.4.0", + "jackalope/jackalope-doctrine-dbal": "^1.6", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "1.4.10", + "phpstan/phpstan-phpunit": "1.0.0", + "phpunit/phpunit": "^9.5", + "ruflin/elastica": "^6.0 || ^7.0", + "solarium/solarium": "^5.0 || ^6.0", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "symfony/phpunit-bridge": "^5.4 || ^6.0", "twig/twig": "^1.35 || ^2.5 || ^3.0" }, "suggest": { @@ -4111,16 +3972,18 @@ "autoload": { "psr-4": { "Pagerfanta\\": "lib/Core/", - "Pagerfanta\\Adapter\\": "src/Adapter/", - "Pagerfanta\\Doctrine\\Collections\\": "lib/Adapter/Doctrine/Collections/", - "Pagerfanta\\Doctrine\\DBAL\\": "lib/Adapter/Doctrine/DBAL/", - "Pagerfanta\\Doctrine\\MongoDBODM\\": "lib/Adapter/Doctrine/MongoDBODM/", - "Pagerfanta\\Doctrine\\ORM\\": "lib/Adapter/Doctrine/ORM/", - "Pagerfanta\\Doctrine\\PHPCRODM\\": "lib/Adapter/Doctrine/PHPCRODM/", + "Pagerfanta\\Twig\\": "lib/Twig/", "Pagerfanta\\Elastica\\": "lib/Adapter/Elastica/", "Pagerfanta\\Solarium\\": "lib/Adapter/Solarium/", - "Pagerfanta\\Twig\\": "lib/Twig/" - } + "Pagerfanta\\Doctrine\\ORM\\": "lib/Adapter/Doctrine/ORM/", + "Pagerfanta\\Doctrine\\DBAL\\": "lib/Adapter/Doctrine/DBAL/", + "Pagerfanta\\Doctrine\\PHPCRODM\\": "lib/Adapter/Doctrine/PHPCRODM/", + "Pagerfanta\\Doctrine\\MongoDBODM\\": "lib/Adapter/Doctrine/MongoDBODM/", + "Pagerfanta\\Doctrine\\Collections\\": "lib/Adapter/Doctrine/Collections/" + }, + "exclude-from-classmap": [ + "lib/**/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4135,7 +3998,7 @@ ], "support": { "issues": "https://github.com/BabDev/Pagerfanta/issues", - "source": "https://github.com/BabDev/Pagerfanta/tree/v2.7.1" + "source": "https://github.com/BabDev/Pagerfanta/tree/v3.6.1" }, "funding": [ { @@ -4143,7 +4006,7 @@ "type": "github" } ], - "time": "2021-02-28T18:15:42+00:00" + "time": "2022-03-16T22:28:15+00:00" }, { "name": "phayes/geophp", @@ -5124,20 +4987,20 @@ }, { "name": "psr/container", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -5166,9 +5029,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "psr/http-client", @@ -5595,32 +5458,32 @@ }, { "name": "react/promise", - "version": "v2.8.0", + "version": "v2.9.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4" + "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4", - "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4", + "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910", + "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910", "shasum": "" }, "require": { "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { - "psr-4": { - "React\\Promise\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "React\\Promise\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5629,7 +5492,23 @@ "authors": [ { "name": "Jan Sorgalla", - "email": "jsorgalla@gmail.com" + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], "description": "A lightweight implementation of CommonJS Promises/A for PHP", @@ -5639,52 +5518,64 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.8.0" + "source": "https://github.com/reactphp/promise/tree/v2.9.0" }, - "time": "2020-05-12T15:16:56+00:00" + "funding": [ + { + "url": "https://github.com/WyriHaximus", + "type": "github" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-02-11T10:27:51+00:00" }, { "name": "ruflin/elastica", - "version": "6.1.5", + "version": "7.1.5", "source": { "type": "git", "url": "https://github.com/ruflin/Elastica.git", - "reference": "47486aed45c2aa0961b002b9afb60503bfed5b85" + "reference": "72a4598544e3f99b5dd8cacb05d009ee75c2a701" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ruflin/Elastica/zipball/47486aed45c2aa0961b002b9afb60503bfed5b85", - "reference": "47486aed45c2aa0961b002b9afb60503bfed5b85", + "url": "https://api.github.com/repos/ruflin/Elastica/zipball/72a4598544e3f99b5dd8cacb05d009ee75c2a701", + "reference": "72a4598544e3f99b5dd8cacb05d009ee75c2a701", "shasum": "" }, "require": { - "elasticsearch/elasticsearch": "^6.0", - "php": "^7.0", - "psr/log": "~1.0" - }, - "conflict": { - "elasticsearch/elasticsearch": "6.8.0 || 6.8.1" + "elasticsearch/elasticsearch": "^7.1.1", + "ext-json": "*", + "nyholm/dsn": "^2.0.0", + "php": "^7.2 || ^8.0", + "psr/log": "^1.0 || ^2.0 || ^3.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0", + "symfony/polyfill-php73": "^1.19" }, "require-dev": { - "aws/aws-sdk-php": "~3.0", - "guzzlehttp/guzzle": "~6.0", - "phpunit/phpunit": "^6.0" + "aws/aws-sdk-php": "^3.155", + "guzzlehttp/guzzle": "^6.3 || ^7.2", + "phpunit/phpunit": "^8.5.8 || ^9.4", + "symfony/phpunit-bridge": "^5.1.1" }, "suggest": { "aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service", - "egeloen/http-adapter": "Allow using httpadapter transport", - "guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport", + "egeloen/http-adapter": "Allow using httpadapter as transport", + "guzzlehttp/guzzle": "Allow using guzzle as transport", "monolog/monolog": "Logging request" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.0.x-dev" + "dev-master": "7.0.x-dev" } }, "autoload": { "psr-4": { - "Elastica\\": "lib/Elastica/" + "Elastica\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -5705,9 +5596,9 @@ ], "support": { "issues": "https://github.com/ruflin/Elastica/issues", - "source": "https://github.com/ruflin/Elastica/tree/6.1.5" + "source": "https://github.com/ruflin/Elastica/tree/7.1.5" }, - "time": "2021-03-24T11:59:44+00:00" + "time": "2022-03-29T15:37:28+00:00" }, { "name": "sensio/framework-extra-bundle", @@ -5935,16 +5826,16 @@ }, { "name": "symfony/cache", - "version": "v4.4.38", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "84a3a42d8f7a049e3a1dd363e35235426e274ddf" + "reference": "27121284fe32a7cefc225268761ec7ce1741b9ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/84a3a42d8f7a049e3a1dd363e35235426e274ddf", - "reference": "84a3a42d8f7a049e3a1dd363e35235426e274ddf", + "url": "https://api.github.com/repos/symfony/cache/zipball/27121284fe32a7cefc225268761ec7ce1741b9ac", + "reference": "27121284fe32a7cefc225268761ec7ce1741b9ac", "shasum": "" }, "require": { @@ -6010,7 +5901,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v4.4.38" + "source": "https://github.com/symfony/cache/tree/v4.4.41" }, "funding": [ { @@ -6026,20 +5917,20 @@ "type": "tidelift" } ], - "time": "2022-02-21T12:59:00+00:00" + "time": "2022-04-25T17:25:00+00:00" }, { "name": "symfony/cache-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "ac2e168102a2e06a2624f0379bde94cd5854ced2" + "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ac2e168102a2e06a2624f0379bde94cd5854ced2", - "reference": "ac2e168102a2e06a2624f0379bde94cd5854ced2", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", + "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", "shasum": "" }, "require": { @@ -6089,7 +5980,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/cache-contracts/tree/v2.5.1" }, "funding": [ { @@ -6105,20 +5996,20 @@ "type": "tidelift" } ], - "time": "2021-08-17T14:20:01+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/config", - "version": "v4.4.37", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e" + "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/e8c2d2c951ddedecb6d28954d336cb7d2e852d0e", - "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e", + "url": "https://api.github.com/repos/symfony/config/zipball/9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7", + "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7", "shasum": "" }, "require": { @@ -6167,7 +6058,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v4.4.37" + "source": "https://github.com/symfony/config/tree/v4.4.41" }, "funding": [ { @@ -6183,20 +6074,20 @@ "type": "tidelift" } ], - "time": "2022-01-03T09:46:22+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/console", - "version": "v4.4.38", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5a50085bf5460f0c0d60a50b58388c1249826b8a" + "reference": "0e1e62083b20ccb39c2431293de060f756af905c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5a50085bf5460f0c0d60a50b58388c1249826b8a", - "reference": "5a50085bf5460f0c0d60a50b58388c1249826b8a", + "url": "https://api.github.com/repos/symfony/console/zipball/0e1e62083b20ccb39c2431293de060f756af905c", + "reference": "0e1e62083b20ccb39c2431293de060f756af905c", "shasum": "" }, "require": { @@ -6257,7 +6148,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.38" + "source": "https://github.com/symfony/console/tree/v4.4.41" }, "funding": [ { @@ -6273,20 +6164,20 @@ "type": "tidelift" } ], - "time": "2022-01-30T21:23:57+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/debug", - "version": "v4.4.37", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "5de6c6e7f52b364840e53851c126be4d71e60470" + "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470", - "reference": "5de6c6e7f52b364840e53851c126be4d71e60470", + "url": "https://api.github.com/repos/symfony/debug/zipball/6637e62480b60817b9a6984154a533e8e64c6bd5", + "reference": "6637e62480b60817b9a6984154a533e8e64c6bd5", "shasum": "" }, "require": { @@ -6325,7 +6216,7 @@ "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.37" + "source": "https://github.com/symfony/debug/tree/v4.4.41" }, "funding": [ { @@ -6341,20 +6232,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.4.39", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "5d0fbcdb9317864b2bd9e49d570d88ae512cadf3" + "reference": "74c7f55de0eced4d3c9654809b1871870386a577" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5d0fbcdb9317864b2bd9e49d570d88ae512cadf3", - "reference": "5d0fbcdb9317864b2bd9e49d570d88ae512cadf3", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/74c7f55de0eced4d3c9654809b1871870386a577", + "reference": "74c7f55de0eced4d3c9654809b1871870386a577", "shasum": "" }, "require": { @@ -6411,7 +6302,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.39" + "source": "https://github.com/symfony/dependency-injection/tree/v4.4.41" }, "funding": [ { @@ -6427,20 +6318,20 @@ "type": "tidelift" } ], - "time": "2022-03-02T12:36:39+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", - "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { @@ -6478,7 +6369,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1" }, "funding": [ { @@ -6494,7 +6385,7 @@ "type": "tidelift" } ], - "time": "2021-07-12T14:48:14+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/doctrine-bridge", @@ -6677,16 +6568,16 @@ }, { "name": "symfony/error-handler", - "version": "v4.4.37", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "8d80ad881e1ce17979547873d093e3c987a6a629" + "reference": "529feb0e03133dbd5fd3707200147cc4903206da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/8d80ad881e1ce17979547873d093e3c987a6a629", - "reference": "8d80ad881e1ce17979547873d093e3c987a6a629", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/529feb0e03133dbd5fd3707200147cc4903206da", + "reference": "529feb0e03133dbd5fd3707200147cc4903206da", "shasum": "" }, "require": { @@ -6725,7 +6616,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v4.4.37" + "source": "https://github.com/symfony/error-handler/tree/v4.4.41" }, "funding": [ { @@ -6741,7 +6632,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/event-dispatcher", @@ -6829,16 +6720,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.11", + "version": "v1.1.12", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "01e9a4efac0ee33a05dfdf93b346f62e7d0e998c" + "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/01e9a4efac0ee33a05dfdf93b346f62e7d0e998c", - "reference": "01e9a4efac0ee33a05dfdf93b346f62e7d0e998c", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", + "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", "shasum": "" }, "require": { @@ -6888,7 +6779,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.11" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.12" }, "funding": [ { @@ -6904,7 +6795,7 @@ "type": "tidelift" } ], - "time": "2021-03-23T15:25:38+00:00" + "time": "2022-01-02T09:41:36+00:00" }, { "name": "symfony/expression-language", @@ -7034,16 +6925,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.37", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "b17d76d7ed179f017aad646e858c90a2771af15d" + "reference": "40790bdf293b462798882ef6da72bb49a4a6633a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/b17d76d7ed179f017aad646e858c90a2771af15d", - "reference": "b17d76d7ed179f017aad646e858c90a2771af15d", + "url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a", + "reference": "40790bdf293b462798882ef6da72bb49a4a6633a", "shasum": "" }, "require": { @@ -7076,7 +6967,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.37" + "source": "https://github.com/symfony/finder/tree/v4.4.41" }, "funding": [ { @@ -7092,7 +6983,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-04-14T15:36:10+00:00" }, { "name": "symfony/flex", @@ -7259,16 +7150,16 @@ }, { "name": "symfony/framework-bundle", - "version": "v4.4.39", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "e8dbdfcd475b7fbaa6b3531079c53a481ff8cad4" + "reference": "1ebfe9ee486d19a081fc74bb617df76f7ee1c7d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/e8dbdfcd475b7fbaa6b3531079c53a481ff8cad4", - "reference": "e8dbdfcd475b7fbaa6b3531079c53a481ff8cad4", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/1ebfe9ee486d19a081fc74bb617df76f7ee1c7d5", + "reference": "1ebfe9ee486d19a081fc74bb617df76f7ee1c7d5", "shasum": "" }, "require": { @@ -7316,7 +7207,7 @@ "require-dev": { "doctrine/annotations": "^1.10.4", "doctrine/cache": "^1.0|^2.0", - "doctrine/persistence": "^1.3|^2.0", + "doctrine/persistence": "^1.3|^2|^3", "paragonie/sodium_compat": "^1.8", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/asset": "^3.4|^4.0|^5.0", @@ -7385,7 +7276,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v4.4.39" + "source": "https://github.com/symfony/framework-bundle/tree/v4.4.41" }, "funding": [ { @@ -7401,20 +7292,20 @@ "type": "tidelift" } ], - "time": "2022-03-02T12:36:39+00:00" + "time": "2022-04-26T13:36:00+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "ec82e57b5b714dbb69300d348bd840b345e24166" + "reference": "1a4f708e4e87f335d1b1be6148060739152f0bd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ec82e57b5b714dbb69300d348bd840b345e24166", - "reference": "ec82e57b5b714dbb69300d348bd840b345e24166", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1a4f708e4e87f335d1b1be6148060739152f0bd5", + "reference": "1a4f708e4e87f335d1b1be6148060739152f0bd5", "shasum": "" }, "require": { @@ -7463,7 +7354,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.1" }, "funding": [ { @@ -7479,20 +7370,20 @@ "type": "tidelift" } ], - "time": "2021-11-03T09:24:47+00:00" + "time": "2022-03-13T20:07:29+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.4.39", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "60e8e42a4579551e5ec887d04380e2ab9e4cc314" + "reference": "27441220aebeb096b4eb8267acaaa7feb5e4266c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/60e8e42a4579551e5ec887d04380e2ab9e4cc314", - "reference": "60e8e42a4579551e5ec887d04380e2ab9e4cc314", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27441220aebeb096b4eb8267acaaa7feb5e4266c", + "reference": "27441220aebeb096b4eb8267acaaa7feb5e4266c", "shasum": "" }, "require": { @@ -7531,7 +7422,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.39" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.41" }, "funding": [ { @@ -7547,20 +7438,20 @@ "type": "tidelift" } ], - "time": "2022-03-04T07:06:13+00:00" + "time": "2022-04-21T07:22:34+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.39", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "19d1cacefe81cb448227cc4d5909fb36e2e23081" + "reference": "7f8ce5bffc3939c63b7da32de5a546c98eb67698" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/19d1cacefe81cb448227cc4d5909fb36e2e23081", - "reference": "19d1cacefe81cb448227cc4d5909fb36e2e23081", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7f8ce5bffc3939c63b7da32de5a546c98eb67698", + "reference": "7f8ce5bffc3939c63b7da32de5a546c98eb67698", "shasum": "" }, "require": { @@ -7635,7 +7526,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.39" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.41" }, "funding": [ { @@ -7651,7 +7542,7 @@ "type": "tidelift" } ], - "time": "2022-03-05T21:04:55+00:00" + "time": "2022-04-27T17:13:11+00:00" }, { "name": "symfony/inflector", @@ -8063,16 +7954,16 @@ }, { "name": "symfony/mime", - "version": "v4.4.37", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "a4fb074827e59a80bc3c5df4657fa782bac7cdab" + "reference": "5b05a62a714bb7e8ba1ce7412f7442debe67c291" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/a4fb074827e59a80bc3c5df4657fa782bac7cdab", - "reference": "a4fb074827e59a80bc3c5df4657fa782bac7cdab", + "url": "https://api.github.com/repos/symfony/mime/zipball/5b05a62a714bb7e8ba1ce7412f7442debe67c291", + "reference": "5b05a62a714bb7e8ba1ce7412f7442debe67c291", "shasum": "" }, "require": { @@ -8119,7 +8010,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v4.4.37" + "source": "https://github.com/symfony/mime/tree/v4.4.41" }, "funding": [ { @@ -8135,7 +8026,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/monolog-bridge", @@ -9188,16 +9079,16 @@ }, { "name": "symfony/property-access", - "version": "v4.4.38", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "6e3446c28ebf537be431082e5f98da19f579cbeb" + "reference": "363945473bc6ec784e75037b075cb98f85cdae36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/6e3446c28ebf537be431082e5f98da19f579cbeb", - "reference": "6e3446c28ebf537be431082e5f98da19f579cbeb", + "url": "https://api.github.com/repos/symfony/property-access/zipball/363945473bc6ec784e75037b075cb98f85cdae36", + "reference": "363945473bc6ec784e75037b075cb98f85cdae36", "shasum": "" }, "require": { @@ -9248,7 +9139,7 @@ "reflection" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v4.4.38" + "source": "https://github.com/symfony/property-access/tree/v4.4.41" }, "funding": [ { @@ -9264,20 +9155,20 @@ "type": "tidelift" } ], - "time": "2022-02-04T12:47:17+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/property-info", - "version": "v4.4.37", + "version": "v4.4.40", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "cd9a8c2e3d19d4d4b9475e9d448cb4fbaee0e495" + "reference": "cab6913f192f2f680e8afea2743d8b4f65421dde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/cd9a8c2e3d19d4d4b9475e9d448cb4fbaee0e495", - "reference": "cd9a8c2e3d19d4d4b9475e9d448cb4fbaee0e495", + "url": "https://api.github.com/repos/symfony/property-info/zipball/cab6913f192f2f680e8afea2743d8b4f65421dde", + "reference": "cab6913f192f2f680e8afea2743d8b4f65421dde", "shasum": "" }, "require": { @@ -9337,7 +9228,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v4.4.37" + "source": "https://github.com/symfony/property-info/tree/v4.4.40" }, "funding": [ { @@ -9353,20 +9244,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-03-18T06:58:32+00:00" }, { "name": "symfony/routing", - "version": "v4.4.37", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "324f7f73b89cd30012575119430ccfb1dfbc24be" + "reference": "c25e38d403c00d5ddcfc514f016f1b534abdf052" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/324f7f73b89cd30012575119430ccfb1dfbc24be", - "reference": "324f7f73b89cd30012575119430ccfb1dfbc24be", + "url": "https://api.github.com/repos/symfony/routing/zipball/c25e38d403c00d5ddcfc514f016f1b534abdf052", + "reference": "c25e38d403c00d5ddcfc514f016f1b534abdf052", "shasum": "" }, "require": { @@ -9426,7 +9317,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v4.4.37" + "source": "https://github.com/symfony/routing/tree/v4.4.41" }, "funding": [ { @@ -9442,7 +9333,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2022-04-12T15:19:55+00:00" }, { "name": "symfony/security-bundle", @@ -9940,22 +9831,22 @@ }, { "name": "symfony/service-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" + "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", - "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", "shasum": "" }, "require": { "php": ">=7.2.5", "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1" + "symfony/deprecation-contracts": "^2.1|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -10003,7 +9894,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.1" }, "funding": [ { @@ -10019,7 +9910,7 @@ "type": "tidelift" } ], - "time": "2021-11-04T16:48:04+00:00" + "time": "2022-03-13T20:07:29+00:00" }, { "name": "symfony/stopwatch", @@ -10085,16 +9976,16 @@ }, { "name": "symfony/string", - "version": "v5.4.3", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10" + "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10", - "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10", + "url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", + "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8", "shasum": "" }, "require": { @@ -10151,7 +10042,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.3" + "source": "https://github.com/symfony/string/tree/v5.4.8" }, "funding": [ { @@ -10167,7 +10058,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-04-19T10:40:37+00:00" }, { "name": "symfony/swiftmailer-bundle", @@ -10409,16 +10300,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v2.5.0", + "version": "v2.5.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e" + "reference": "1211df0afa701e45a04253110e959d4af4ef0f07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e", - "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07", + "reference": "1211df0afa701e45a04253110e959d4af4ef0f07", "shasum": "" }, "require": { @@ -10467,7 +10358,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.1" }, "funding": [ { @@ -10483,7 +10374,7 @@ "type": "tidelift" } ], - "time": "2021-08-17T14:20:01+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/twig-bridge", @@ -10872,16 +10763,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.39", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "35237c5e5dcb6593a46a860ba5b29c1d4683d80e" + "reference": "58eb36075c04aaf92a7a9f38ee9a8b97e24eb481" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/35237c5e5dcb6593a46a860ba5b29c1d4683d80e", - "reference": "35237c5e5dcb6593a46a860ba5b29c1d4683d80e", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/58eb36075c04aaf92a7a9f38ee9a8b97e24eb481", + "reference": "58eb36075c04aaf92a7a9f38ee9a8b97e24eb481", "shasum": "" }, "require": { @@ -10941,7 +10832,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.39" + "source": "https://github.com/symfony/var-dumper/tree/v4.4.41" }, "funding": [ { @@ -10957,20 +10848,20 @@ "type": "tidelift" } ], - "time": "2022-02-25T10:38:15+00:00" + "time": "2022-04-25T21:15:06+00:00" }, { "name": "symfony/var-exporter", - "version": "v4.4.39", + "version": "v4.4.41", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "c4bfc55f8ccde7a3fc4beea78c36dbd334c60932" + "reference": "bc5f57ae61b5e492b3f6f21be6e503dcc7b898b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/c4bfc55f8ccde7a3fc4beea78c36dbd334c60932", - "reference": "c4bfc55f8ccde7a3fc4beea78c36dbd334c60932", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/bc5f57ae61b5e492b3f6f21be6e503dcc7b898b7", + "reference": "bc5f57ae61b5e492b3f6f21be6e503dcc7b898b7", "shasum": "" }, "require": { @@ -11014,7 +10905,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v4.4.39" + "source": "https://github.com/symfony/var-exporter/tree/v4.4.41" }, "funding": [ { @@ -11030,7 +10921,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T10:38:15+00:00" + "time": "2022-04-25T17:40:48+00:00" }, { "name": "symfony/webpack-encore-bundle", @@ -11314,16 +11205,16 @@ }, { "name": "twig/twig", - "version": "v2.14.11", + "version": "v2.14.13", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727" + "reference": "66856cd0459df3dc97d32077a98454dc2a0ee75a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/66856cd0459df3dc97d32077a98454dc2a0ee75a", + "reference": "66856cd0459df3dc97d32077a98454dc2a0ee75a", "shasum": "" }, "require": { @@ -11378,7 +11269,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.14.11" + "source": "https://github.com/twigphp/Twig/tree/v2.14.13" }, "funding": [ { @@ -11390,7 +11281,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T06:57:25+00:00" + "time": "2022-04-06T06:45:17+00:00" }, { "name": "webmozart/assert", @@ -12489,7 +12380,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.3.0" + "php": "7.4.29" }, - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.3.0" } diff --git a/config/packages/fos_elastica.yaml b/config/packages/fos_elastica.yaml index d60acb0a60..535d998b14 100644 --- a/config/packages/fos_elastica.yaml +++ b/config/packages/fos_elastica.yaml @@ -6,149 +6,145 @@ fos_elastica: pelagos: client: default index_name: "%env(DISCOVERY_INDEX)%" - types: - dataset: - indexable_callback: [ '\App\Util\FundingOrgFilter', 'canIndex'] + indexable_callback: ['\App\Util\FundingOrgFilter', 'canIndex'] + persistence: + driver: orm + model: App\Entity\Dataset + provider: + query_builder_method: createSortedQueryBuilder + listener: + logger: true + finder: ~ + properties: + udi: ~ + title: { boost: 3 } + abstract: ~ + availabilityStatus: ~ + identifiedStatus: ~ + researchGroup: + type: 'nested' properties: - udi: ~ - title: { boost: 3 } - abstract: ~ - availabilityStatus: ~ - identifiedStatus: ~ - researchGroup: + id: ~ + name: ~ + fundingCycle: type: 'nested' properties: id: ~ - name: ~ - fundingCycle: + fundingOrganization: type: 'nested' properties: id: ~ - fundingOrganization: - type: 'nested' - properties: - id: ~ - name: ~ - datasetSubmission: - type: 'nested' - properties: - authors: ~ - datasetFileTransferStatus: ~ - datasetFileSize: ~ - restrictions: ~ - placeKeywords: { boost: 3 } - themeKeywords: { boost: 3 } - doi: - type: 'nested' - properties: - doi: { boost: 3 } - publications: - type: 'nested' - properties: - doi: { boost: 3 } - geometry: - type: 'text' - property_path: false - simpleGeometry: - type: 'geo_shape' - ignore_malformed: true - property_path: false - year: - property_path: false - estimatedStartDate: - property_path: false - estimatedEndDate: - property_path: false - updatedDateTime: - type: 'date' - format: 'basic_date_time_no_millis' - property_path: false - persistence: - driver: orm - model: App\Entity\Dataset - provider: - query_builder_method: createSortedQueryBuilder - listener: - logger: true - finder: ~ + name: ~ + datasetSubmission: + type: 'nested' + properties: + authors: ~ + datasetFileTransferStatus: ~ + datasetFileSize: ~ + restrictions: ~ + placeKeywords: { boost: 3 } + themeKeywords: { boost: 3 } + doi: + type: 'nested' + properties: + doi: { boost: 3 } + publications: + type: 'nested' + properties: + doi: { boost: 3 } + geometry: + type: 'text' + property_path: false + simpleGeometry: + type: 'geo_shape' + ignore_malformed: true + property_path: false + year: + property_path: false + estimatedStartDate: + property_path: false + estimatedEndDate: + property_path: false + updatedDateTime: + type: 'date' + format: 'basic_date_time_no_millis' + property_path: false search_pelagos: client: default index_name: "%env(SEARCH_TOOL_INDEX)%" - types: - dataset: - indexable_callback: [ '\App\Util\FundingOrgFilter', 'canIndex'] + indexable_callback: ['\App\Util\FundingOrgFilter', 'canIndex'] + persistence: + driver: orm + model: App\Entity\Dataset + provider: + query_builder_method: createSortedQueryBuilder + listener: + logger: true + finder: ~ + properties: + udi: + type: 'text' + title: + type: 'text' + abstract: + type: 'text' + researchGroup: + type: 'nested' properties: - udi: - type: 'text' - title: + id: + type: 'keyword' + name: type: 'text' - abstract: - type: 'text' - researchGroup: + fundingCycle: type: 'nested' properties: id: type: 'keyword' - name: - type: 'text' - fundingCycle: + fundingOrganization: type: 'nested' properties: id: type: 'keyword' - fundingOrganization: - type: 'nested' - properties: - id: - type: 'keyword' - datasetSubmission: - type: 'nested' - include_in_parent: true - properties: - authors: - type: 'text' - themeKeywords: - type: 'text' - availabilityStatus: - type: 'integer' - collectionStartDate: - property_path: false - type: 'date' - format: 'yyyy-MM-dd HH:mm:ss' - collectionEndDate: - property_path: false - type: 'date' - format: 'yyyy-MM-dd HH:mm:ss' + datasetSubmission: + type: 'nested' + include_in_parent: true + properties: + authors: + type: 'text' + themeKeywords: + type: 'text' + availabilityStatus: + type: 'integer' + collectionStartDate: + property_path: false + type: 'date' + format: 'yyyy-MM-dd HH:mm:ss' + collectionEndDate: + property_path: false + type: 'date' + format: 'yyyy-MM-dd HH:mm:ss' + doi: + type: 'nested' + properties: doi: - type: 'nested' - properties: - doi: - type: 'text' - identifiedStatus: - type: 'integer' - coldStorage: - property_path: false - type: 'boolean' - publications: - type: 'nested' - properties: - doi: - type: 'text' - projectDirectors: - type: 'nested' - properties: - id: - type: 'keyword' - sortingDateForDisplay: - property_path: false - type: 'date' - format: 'yyyy-MM-dd' - persistence: - driver: orm - model: App\Entity\Dataset - provider: - query_builder_method: createSortedQueryBuilder - listener: - logger: true - finder: ~ + type: 'text' + identifiedStatus: + type: 'integer' + coldStorage: + property_path: false + type: 'boolean' + publications: + type: 'nested' + properties: + doi: + type: 'text' + projectDirectors: + type: 'nested' + properties: + id: + type: 'keyword' + sortingDateForDisplay: + property_path: false + type: 'date' + format: 'yyyy-MM-dd' diff --git a/config/services.yaml b/config/services.yaml index 7c511ff3a4..95253065a9 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -123,7 +123,7 @@ services: App\Util\DatasetIndex: autowire: false - arguments: ["@fos_elastica.index.pelagos.dataset"] + arguments: ["@fos_elastica.index.pelagos"] App\Handler\UploadHandler: bind: @@ -135,13 +135,9 @@ services: string $passwordExpiryWarn: "%env(ACCOUNT_PASSWORD_EXPIRATION_WARN)%" string $hostName: "%env(HOSTNAME)%" - App\Command\RebuildElasticsearchIndexCommand: - bind: - FOS\ElasticaBundle\Persister\ObjectPersister $pelagosDatasetIndexPersister: "@fos_elastica.object_persister.pelagos.dataset" - App\Util\Search: bind: - FOS\ElasticaBundle\Finder\TransformedFinder $finder: "@fos_elastica.finder.search_pelagos.dataset" + FOS\ElasticaBundle\Finder\TransformedFinder $finder: "@fos_elastica.finder.search_pelagos" App\Event\MaintenanceModeListener: bind: @@ -175,7 +171,7 @@ services: App\Controller\Api\DatasetPublicationController: bind: - FOS\ElasticaBundle\Persister\ObjectPersister $objectPersister: "@fos_elastica.object_persister.pelagos.dataset" + FOS\ElasticaBundle\Persister\ObjectPersister $objectPersister: "@fos_elastica.object_persister.pelagos" App\Util\MailerLoggerUtil: tags: diff --git a/src/Command/RebuildElasticsearchIndexCommand.php b/src/Command/RebuildElasticsearchIndexCommand.php deleted file mode 100644 index d91f03716b..0000000000 --- a/src/Command/RebuildElasticsearchIndexCommand.php +++ /dev/null @@ -1,104 +0,0 @@ -entityManager = $entityManager; - $this->pelagosDatasetIndexPersister = $pelagosDatasetIndexPersister; - parent::__construct(); - } - - /** - * Configures the current command. - * - * @return void - */ - protected function configure() - { - $this - ->setDescription('Description: re-indexes datasets into elasticsearch') - ->addArgument( - 'UDI', - InputArgument::OPTIONAL, - 'Optional UDI to individually index - defaults to all if unspecified' - ); - } - - /** - * Executes the current command. - * - * @param InputInterface $input An InputInterface instance. - * @param OutputInterface $output An OutputInterface instance. - * - * @return integer Return code. - */ - protected function execute(InputInterface $input, OutputInterface $output) - { - - - $udi = $input->getArgument('UDI'); - if (null !== $udi) { - $allDatasets = $this->entityManager->getRepository(Dataset::class)->findBy(array('udi' => $udi)); - } else { - $allDatasets = $this->entityManager->getRepository(Dataset::class)->findAll(); - } - $count = count($allDatasets); - $counter = 0; - $output->writeln($count . ' datasets found.'); - foreach ($allDatasets as $dataset) { - $counter++; - $output->writeln('indexing ' . $dataset->getUdi()); - $startTime = new \DateTime; - $this->pelagosDatasetIndexPersister->insertOne($dataset); - $elapsedTime = date_diff($startTime, new \DateTime); - $elapsedTimeSeconds = $elapsedTime->format('%s'); - $output->writeln(' ' . $dataset->getUdi() . " indexed. ($counter/$count $elapsedTimeSeconds sec)"); - } - - return 0; - } -} diff --git a/src/Event/DatasetIndexSubscriber.php b/src/Event/DatasetIndexSubscriber.php index fbf8c37992..d487878716 100644 --- a/src/Event/DatasetIndexSubscriber.php +++ b/src/Event/DatasetIndexSubscriber.php @@ -2,15 +2,12 @@ namespace App\Event; -use App\Twig\Extensions as TwigExtentions; -use FOS\ElasticaBundle\Event\TransformEvent; - -use Symfony\Component\EventDispatcher\EventSubscriberInterface; - use App\Entity\Dataset; -use App\Util\Geometry; - use App\Exception\InvalidGmlException; +use App\Twig\Extensions as TwigExtentions; +use App\Util\Geometry; +use FOS\ElasticaBundle\Event\PostTransformEvent; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; /** * An event subscriber for events related to the dataset index. @@ -41,7 +38,7 @@ public function __construct(Geometry $geometryUtil) * * @return void */ - public function populateCalculatedFields(TransformEvent $event) + public function populateCalculatedFields(PostTransformEvent $event) { $dataset = $event->getObject(); @@ -137,7 +134,7 @@ public function populateCalculatedFields(TransformEvent $event) public static function getSubscribedEvents() { return array( - TransformEvent::POST_TRANSFORM => 'populateCalculatedFields', + PostTransformEvent::class => 'populateCalculatedFields', ); } } diff --git a/symfony.lock b/symfony.lock index e45dde1a74..eb6e084b09 100644 --- a/symfony.lock +++ b/symfony.lock @@ -103,9 +103,6 @@ "doctrine/persistence": { "version": "1.3.6" }, - "doctrine/reflection": { - "version": "v1.1.0" - }, "doctrine/sql-formatter": { "version": "1.1.1" }, @@ -127,6 +124,12 @@ "exsyst/swagger": { "version": "v0.4.1" }, + "ezimuel/guzzlestreams": { + "version": "3.0.1" + }, + "ezimuel/ringphp": { + "version": "1.2.0" + }, "friendsofphp/proxy-manager-lts": { "version": "v1.0.5" }, @@ -175,12 +178,6 @@ "guzzlehttp/psr7": { "version": "1.6.1" }, - "guzzlehttp/ringphp": { - "version": "1.1.1" - }, - "guzzlehttp/streams": { - "version": "3.0.0" - }, "hamcrest/hamcrest-php": { "version": "v2.0.0" }, @@ -213,12 +210,6 @@ "laminas/laminas-code": { "version": "3.4.1" }, - "laminas/laminas-eventmanager": { - "version": "3.4.0" - }, - "laminas/laminas-zendframework-bridge": { - "version": "1.4.0" - }, "league/flysystem": { "version": "1.1.3" }, @@ -256,6 +247,9 @@ "nikic/php-parser": { "version": "v4.3.0" }, + "nyholm/dsn": { + "version": "2.0.1" + }, "oneup/flysystem-bundle": { "version": "3.0", "recipe": { From 01d85eb178110b0b72846aa6b9dabafb07a6e249 Mon Sep 17 00:00:00 2001 From: Michael van den Eijnden Date: Mon, 2 May 2022 16:29:09 -0500 Subject: [PATCH 2/9] These classed were deprecated. --- src/Event/DoctrineDatasetListener.php | 2 +- src/Event/InformationProductListener.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Event/DoctrineDatasetListener.php b/src/Event/DoctrineDatasetListener.php index 597e7d691a..29f053cdaf 100644 --- a/src/Event/DoctrineDatasetListener.php +++ b/src/Event/DoctrineDatasetListener.php @@ -3,7 +3,7 @@ namespace App\Event; use App\Message\DoiMessage; -use Doctrine\Common\Persistence\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Event\OnFlushEventArgs; diff --git a/src/Event/InformationProductListener.php b/src/Event/InformationProductListener.php index b89b0143bf..31ae8ec3b1 100644 --- a/src/Event/InformationProductListener.php +++ b/src/Event/InformationProductListener.php @@ -7,7 +7,7 @@ use App\Entity\ProductTypeDescriptor; use App\Repository\InformationProductRepository; use Doctrine\ORM\EntityManagerInterface; -use Doctrine\Persistence\Event\LifecycleEventArgs; +use Doctrine\ORM\Event\LifecycleEventArgs; /** * Listener class for Information Product and Types related events. From db9ea83088f0179fb5e427dbc9dcc4cbb916bdf9 Mon Sep 17 00:00:00 2001 From: Praneeth Pondicherry Ravendernath Date: Wed, 4 May 2022 14:32:40 -0500 Subject: [PATCH 3/9] Fixed facet filter queries with new upgrade --- src/Util/Search.php | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/Util/Search.php b/src/Util/Search.php index 8d97787bcc..c4aafdcbe1 100644 --- a/src/Util/Search.php +++ b/src/Util/Search.php @@ -371,7 +371,7 @@ private function getStatusInfo(array $aggregations): array // Remove any element with a count of 0. foreach ($statusInfo as $key => $value) { - if (0 === $statusInfo[$key]['count']) { + if (0 === $value['count']) { unset($statusInfo[$key]); } } @@ -583,9 +583,8 @@ private function getAggregationsQuery(array $requestTerms): Aggregation\Nested $fundOrgFilter = new Aggregation\Filter('fundOrgFilter'); $fundOrgNestedQuery = new Query\Nested(); $fundOrgNestedQuery->setPath('researchGroup.fundingCycle.fundingOrganization'); - $fundOrgTerm = new Query\Terms(); + $fundOrgTerm = new Query\Terms('researchGroup.fundingCycle.fundingOrganization.id'); $fundOrgTerm->setTerms( - 'researchGroup.fundingCycle.fundingOrganization.id', explode(',', $requestTerms['options']['funOrgId']) ); $fundOrgNestedQuery->setQuery($fundOrgTerm); @@ -598,9 +597,8 @@ private function getAggregationsQuery(array $requestTerms): Aggregation\Nested $fundingCycleFilter = new Aggregation\Filter('fundingCycleFilter'); $fundingCycleNestedQuery = new Query\Nested(); $fundingCycleNestedQuery->setPath('researchGroup.fundingCycle'); - $fundingCycleTerms = new Query\Terms(); + $fundingCycleTerms = new Query\Terms('researchGroup.fundingCycle.id'); $fundingCycleTerms->setTerms( - 'researchGroup.fundingCycle.id', explode(',', $requestTerms['options']['fundingCycleId']) ); $fundingCycleNestedQuery->setQuery($fundingCycleTerms); @@ -689,8 +687,8 @@ private function getFiltersQuery(array $requestTerms): Query\BoolQuery $researchGroupNameQuery = new Query\Nested(); $researchGroupNameQuery->setPath('researchGroup'); - $rgNameQuery = new Query\Terms(); - $rgNameQuery->setTerms('researchGroup.id', explode(',', $requestTerms['options']['rgId'])); + $rgNameQuery = new Query\Terms('researchGroup.id'); + $rgNameQuery->setTerms(explode(',', $requestTerms['options']['rgId'])); $researchGroupNameQuery->setQuery($rgNameQuery); $postFilterBoolQuery->addMust($researchGroupNameQuery); @@ -702,9 +700,8 @@ private function getFiltersQuery(array $requestTerms): Query\BoolQuery $nestedFoQuery->setPath('researchGroup.fundingCycle.fundingOrganization'); // Add funding Org id field to the aggregation - $fundingOrgIdQuery = new Query\Terms(); + $fundingOrgIdQuery = new Query\Terms('researchGroup.fundingCycle.fundingOrganization.id'); $fundingOrgIdQuery->setTerms( - 'researchGroup.fundingCycle.fundingOrganization.id', explode(',', $requestTerms['options']['funOrgId']) ); @@ -718,9 +715,8 @@ private function getFiltersQuery(array $requestTerms): Query\BoolQuery $statuses[$key] = self::AVAILABILITY_STATUSES[$value]; } - $availabilityStatusQuery = new Query\Terms(); + $availabilityStatusQuery = new Query\Terms('availabilityStatus'); $availabilityStatusQuery->setTerms( - 'availabilityStatus', array_reduce($statuses, 'array_merge', array()) ); $postFilterBoolQuery->addMust($availabilityStatusQuery); @@ -732,9 +728,8 @@ private function getFiltersQuery(array $requestTerms): Query\BoolQuery $fundingCycNestedQuery->setPath('researchGroup.fundingCycle'); // Add funding cycle id field to the aggregation - $fundingCycleTerms = new Query\Terms(); + $fundingCycleTerms = new Query\Terms('researchGroup.fundingCycle.id'); $fundingCycleTerms->setTerms( - 'researchGroup.fundingCycle.id', explode(',', $requestTerms['options']['fundingCycleId']) ); @@ -748,9 +743,8 @@ private function getFiltersQuery(array $requestTerms): Query\BoolQuery $projectDirectorNestedQuery->setPath('projectDirectors'); // Add project director id field to the aggregation - $projectDirectorTermsQuery = new Query\Terms(); + $projectDirectorTermsQuery = new Query\Terms('projectDirectors.id'); $projectDirectorTermsQuery->setTerms( - 'projectDirectors.id', explode(',', $requestTerms['options']['projectDirectorId']) ); From 11b5bb52f05bed77a8b03f99c5f7342cca2c62e2 Mon Sep 17 00:00:00 2001 From: Michael Scott Williamson Date: Wed, 4 May 2022 16:12:40 -0500 Subject: [PATCH 4/9] Now at least doesn't break in old search. --- src/Util/DatasetIndex.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Util/DatasetIndex.php b/src/Util/DatasetIndex.php index 5df4cbe976..5ac814ac80 100644 --- a/src/Util/DatasetIndex.php +++ b/src/Util/DatasetIndex.php @@ -3,7 +3,7 @@ namespace App\Util; use Elastica\Query; -use Elastica\Type; +use Elastica\Index; /** * A utility class for searching the Dataset index. @@ -22,7 +22,7 @@ class DatasetIndex * * @param Type $datasetType The Datatset elastic type. */ - public function __construct(Type $datasetType) + public function __construct(Index $datasetType) { $this->datasetType = $datasetType; } From 58ef8e24c90023b16272f82b76c138c9cdc2ee33 Mon Sep 17 00:00:00 2001 From: Praneeth Pondicherry Ravendernath Date: Thu, 5 May 2022 09:48:20 -0500 Subject: [PATCH 5/9] Added additional check if object is empty --- assets/js/vue/components/search/DatasetRow.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/js/vue/components/search/DatasetRow.vue b/assets/js/vue/components/search/DatasetRow.vue index c246eba0fc..a020281cbb 100644 --- a/assets/js/vue/components/search/DatasetRow.vue +++ b/assets/js/vue/components/search/DatasetRow.vue @@ -10,7 +10,7 @@ {{ datasetRowData.title }} -
+
Authors: {{ datasetRowData.datasetSubmission.authors }}
@@ -22,7 +22,7 @@
-
+
DOI: {{ datasetRowData.doi.doi }}
From cf0da402c30873536d4bec077237448a850be0db Mon Sep 17 00:00:00 2001 From: Michael van den Eijnden Date: Wed, 11 May 2022 08:26:28 -0500 Subject: [PATCH 6/9] Update Flex --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b42d07a05e..691fcba920 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "symfony/asset": "4.4.*", "symfony/console": "4.4.*", "symfony/dotenv": "4.4.*", - "symfony/flex": "^1.6", + "symfony/flex": "^1.17", "symfony/form": "4.4.*", "symfony/framework-bundle": "4.4.*", "symfony/ldap": "4.4.*", From 4f0ac83902b4aef35534dca48a9a13741fb6d6dc Mon Sep 17 00:00:00 2001 From: Michael van den Eijnden Date: Wed, 11 May 2022 08:49:57 -0500 Subject: [PATCH 7/9] Changed from type to index --- src/Util/DatasetIndex.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Util/DatasetIndex.php b/src/Util/DatasetIndex.php index 5ac814ac80..a01c221bfc 100644 --- a/src/Util/DatasetIndex.php +++ b/src/Util/DatasetIndex.php @@ -11,20 +11,20 @@ class DatasetIndex { /** - * The Dataset elastic type. + * The Dataset elastic index. * - * @var Type + * @var Index */ - protected $datasetType; + protected $datasetIndex; /** * Constructor. * - * @param Type $datasetType The Datatset elastic type. + * @param Type $datasetIndex The Datatset elastic index. */ - public function __construct(Index $datasetType) + public function __construct(Index $datasetIndex) { - $this->datasetType = $datasetType; + $this->datasetIndex = $datasetIndex; } /** @@ -42,7 +42,7 @@ public function search(array $termsFilters = array(), string $text = null, strin if (empty(trim($text))) { $query->addSort(array('updatedDateTime' => array('order' => 'desc'))); } - return $this->datasetType->search($query); + return $this->datasetIndex->search($query); } /** @@ -57,7 +57,7 @@ public function search(array $termsFilters = array(), string $text = null, strin public function count(array $termsFilters = array(), string $text = null, string $geoFilter = null) { $query = $this->buildQuery($termsFilters, $text, $geoFilter); - return $this->datasetType->count($query); + return $this->datasetIndex->count($query); } /** From bd8a3f27a86c1d58319c56aa23e9b4f631d0115c Mon Sep 17 00:00:00 2001 From: Michael van den Eijnden Date: Wed, 11 May 2022 10:38:01 -0500 Subject: [PATCH 8/9] Going back This has to be a separate commit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 691fcba920..b42d07a05e 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "symfony/asset": "4.4.*", "symfony/console": "4.4.*", "symfony/dotenv": "4.4.*", - "symfony/flex": "^1.17", + "symfony/flex": "^1.6", "symfony/form": "4.4.*", "symfony/framework-bundle": "4.4.*", "symfony/ldap": "4.4.*", From 9fde53fb13de48ee8cd33ac0aca7db3e31f44e6e Mon Sep 17 00:00:00 2001 From: Michael van den Eijnden Date: Tue, 17 May 2022 09:23:02 -0500 Subject: [PATCH 9/9] fix use statements --- src/Controller/UI/DataDiscoveryController.php | 11 ++++------- src/Util/DatasetIndex.php | 5 +++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Controller/UI/DataDiscoveryController.php b/src/Controller/UI/DataDiscoveryController.php index 781a073e58..1d58f24379 100644 --- a/src/Controller/UI/DataDiscoveryController.php +++ b/src/Controller/UI/DataDiscoveryController.php @@ -2,21 +2,18 @@ namespace App\Controller\UI; +use App\Entity\Account; +use App\Entity\DatasetSubmission; +use App\Entity\DIF; +use App\Event\LogActionItemEventDispatcher; use App\Util\DatasetIndex; use Elastica\ResultSet; - use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; - -use App\Entity\DatasetSubmission; -use App\Entity\DIF; -use App\Event\LogActionItemEventDispatcher; - /** * The Data Discovery controller. */ diff --git a/src/Util/DatasetIndex.php b/src/Util/DatasetIndex.php index a01c221bfc..23aaf5e616 100644 --- a/src/Util/DatasetIndex.php +++ b/src/Util/DatasetIndex.php @@ -2,8 +2,9 @@ namespace App\Util; -use Elastica\Query; use Elastica\Index; +use Elastica\ResultSet; +use Elastica\Query; /** * A utility class for searching the Dataset index. @@ -34,7 +35,7 @@ public function __construct(Index $datasetIndex) * @param string $text Textual searh string. * @param string $geoFilter WKT string representing polygon to filter with. * - * @return array + * @return ResultSet */ public function search(array $termsFilters = array(), string $text = null, string $geoFilter = null) {