From bf1c7acac649966cc1bdc453efbe40968429ef41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=93=D0=BE=D0=BD?= =?UTF-8?q?=D1=87=D0=B0=D1=80?= Date: Mon, 6 Dec 2021 05:59:25 +0300 Subject: [PATCH 1/3] php 8.1 --- .idea/.gitignore | 8 ++ .idea/ElasticsearchBundle.iml | 103 +++++++++++++++ .idea/inspectionProfiles/Project_Default.xml | 128 +++++++++++++++++++ .idea/modules.xml | 9 ++ .idea/php.xml | 98 ++++++++++++++ .idea/vcs.xml | 6 + .idea/yii2settings.xml | 32 +++++ composer.json | 83 ++++++------ 8 files changed, 428 insertions(+), 39 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/ElasticsearchBundle.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/yii2settings.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/ElasticsearchBundle.iml b/.idea/ElasticsearchBundle.iml new file mode 100644 index 00000000..d4845dcd --- /dev/null +++ b/.idea/ElasticsearchBundle.iml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..a021bc01 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,128 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..91ff8d99 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 00000000..93c3dd0c --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/yii2settings.xml b/.idea/yii2settings.xml new file mode 100644 index 00000000..0d04ffa4 --- /dev/null +++ b/.idea/yii2settings.xml @@ -0,0 +1,32 @@ + + + + + + + \ No newline at end of file diff --git a/composer.json b/composer.json index 12c90413..eeb25bc8 100644 --- a/composer.json +++ b/composer.json @@ -1,47 +1,17 @@ { - "name": "ongr/elasticsearch-bundle", - "description": "Elasticsearch bundle for Symfony.", - "type": "symfony-bundle", - "homepage": "http://ongr.io", - "license": "MIT", "authors": [ { "name": "ONGR team", "homepage": "http://www.ongr.io" } ], - "require": { - "php": "^7.1", - "symfony/framework-bundle": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/console": "^4.4|^5.0", - "symfony/stopwatch": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/serializer": "^4.4|^5.0", - "symfony/cache": "^4.4|^5.0", - "symfony/property-access": "^4.4|^5.0", - "doctrine/annotations": "^1.6", - "doctrine/cache": "^1.7", - "doctrine/inflector": "^1.3", - "doctrine/collections": "^1.5", - "monolog/monolog": "^1.24", - "elasticsearch/elasticsearch": "^7.0", - "ongr/elasticsearch-dsl": "^7.0" - }, - "require-dev": { - "mikey179/vfsstream": "~1.6", - "phpunit/phpunit": "^7.0", - "squizlabs/php_codesniffer": "^3.0", - "symfony/browser-kit" : "^4.4|^5.0", - "symfony/expression-language" : "^4.4|^5.0", - "symfony/twig-bundle": "^4.4|^5.0", - "symfony/yaml": "^4.4|^5.0", - "symfony/validator": "^4.4|^5.0", - "symfony/options-resolver": "^4.4|^5.0" - }, "autoload": { - "psr-4": { "ONGR\\ElasticsearchBundle\\": "" }, - "exclude-from-classmap": ["/Tests/"] + "psr-4": { + "ONGR\\ElasticsearchBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "autoload-dev": { "files": [ @@ -51,10 +21,45 @@ "ONGR\\App\\": "\\Tests\\app\\src\\" } }, - "minimum-stability": "dev", + "description": "Elasticsearch bundle for Symfony.", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "8.0-dev" } - } + }, + "homepage": "http://ongr.io", + "license": "MIT", + "minimum-stability": "dev", + "name": "ongr/elasticsearch-bundle", + "require": { + "php": "^8.0|^8.1", + "symfony/framework-bundle": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/serializer": "^4.4|^5.0|^6.0", + "symfony/cache": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4|^5.0|^6.0", + "doctrine/annotations": "^1.6", + "doctrine/cache": "^1.7|^2", + "doctrine/inflector": "^1.3|^2.0", + "doctrine/collections": "^1.5|^2.0", + "monolog/monolog": "^1.24|^2.0", + "elasticsearch/elasticsearch": "^7.0|^8.0", + "ongr/elasticsearch-dsl": "^7.0|^8.0" + }, + "require-dev": { + "roave/security-advisories": "dev-latest", + "mikey179/vfsstream": "~v1.6.10", + "phpunit/phpunit": "^7.0|^8.0|^9.0", + "squizlabs/php_codesniffer": "^3.0", + "symfony/browser-kit": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/twig-bundle": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4|^5.0|^6.0", + "symfony/validator": "^4.4|^5.0|^6.0", + "symfony/options-resolver": "^4.4|^5.0|^6.0" + }, + "type": "symfony-bundle" } From f72256e57df279d6512e5c6dd5e0e53fd7f4526f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=93=D0=BE=D0=BD?= =?UTF-8?q?=D1=87=D0=B0=D1=80?= Date: Mon, 6 Dec 2021 07:43:33 +0300 Subject: [PATCH 2/3] rm .idea --- .idea/.gitignore | 8 -- .idea/ElasticsearchBundle.iml | 103 --------------- .idea/inspectionProfiles/Project_Default.xml | 128 ------------------- .idea/modules.xml | 9 -- .idea/php.xml | 98 -------------- .idea/vcs.xml | 6 - .idea/yii2settings.xml | 32 ----- 7 files changed, 384 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/ElasticsearchBundle.iml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/php.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/yii2settings.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/ElasticsearchBundle.iml b/.idea/ElasticsearchBundle.iml deleted file mode 100644 index d4845dcd..00000000 --- a/.idea/ElasticsearchBundle.iml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index a021bc01..00000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,128 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 91ff8d99..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml deleted file mode 100644 index 93c3dd0c..00000000 --- a/.idea/php.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/yii2settings.xml b/.idea/yii2settings.xml deleted file mode 100644 index 0d04ffa4..00000000 --- a/.idea/yii2settings.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - \ No newline at end of file From f727c1b43d6097d331c6a507c47b550ecd729c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=93=D0=BE=D0=BD?= =?UTF-8?q?=D1=87=D0=B0=D1=80?= Date: Mon, 6 Dec 2021 08:34:39 +0300 Subject: [PATCH 3/3] fix CollectionHandler: add type hints void --- Profiler/Handler/CollectionHandler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Profiler/Handler/CollectionHandler.php b/Profiler/Handler/CollectionHandler.php index 65636ad0..2cefc854 100644 --- a/Profiler/Handler/CollectionHandler.php +++ b/Profiler/Handler/CollectionHandler.php @@ -21,12 +21,12 @@ class CollectionHandler extends AbstractProcessingHandler /** * @var array */ - private $records = []; + private array $records = []; /** * {@inheritdoc} */ - protected function write(array $record) + protected function write(array $record): void { $this->records[] = $record; } @@ -36,7 +36,7 @@ protected function write(array $record) * * @return array */ - public function getRecords() + public function getRecords(): array { return $this->records; } @@ -44,7 +44,7 @@ public function getRecords() /** * Clears recorded data. */ - public function clearRecords() + public function clearRecords(): void { $this->records = []; }