From 820c4f31657c8bfb747a8e9001775f3a3a0f8c02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 19:47:15 +0000 Subject: [PATCH 1/2] Bump symfony/http-kernel from 4.4.7 to 4.4.13 Bumps [symfony/http-kernel](https://github.com/symfony/http-kernel) from 4.4.7 to 4.4.13. - [Release notes](https://github.com/symfony/http-kernel/releases) - [Changelog](https://github.com/symfony/http-kernel/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/http-kernel/compare/v4.4.7...v4.4.13) Signed-off-by: dependabot[bot] --- composer.lock | 434 +++++++++++++++++++++++--------------------------- 1 file changed, 199 insertions(+), 235 deletions(-) diff --git a/composer.lock b/composer.lock index a254c81..6ccf68d 100644 --- a/composer.lock +++ b/composer.lock @@ -1592,21 +1592,22 @@ }, { "name": "symfony/debug", - "version": "v4.4.7", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "346636d2cae417992ecfd761979b2ab98b339a45" + "reference": "aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/346636d2cae417992ecfd761979b2ab98b339a45", - "reference": "346636d2cae417992ecfd761979b2ab98b339a45", + "url": "https://api.github.com/repos/symfony/debug/zipball/aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e", + "reference": "aeb73aca16a8f1fe958230fe44e6cf4c84cbb85e", "shasum": "" }, "require": { - "php": "^7.1.3", - "psr/log": "~1.0" + "php": ">=7.1.3", + "psr/log": "~1.0", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "symfony/http-kernel": "<3.4" @@ -1658,7 +1659,7 @@ "type": "tidelift" } ], - "time": "2020-03-27T16:54:36+00:00" + "time": "2020-08-10T07:47:39+00:00" }, { "name": "symfony/dependency-injection", @@ -1747,24 +1748,89 @@ ], "time": "2020-03-30T11:42:42+00:00" }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14", + "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:49:21+00:00" + }, { "name": "symfony/error-handler", - "version": "v4.4.7", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358" + "reference": "2434fb32851f252e4f27691eee0b77c16198db62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/7e9828fc98aa1cf27b422fe478a84f5b0abb7358", - "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/2434fb32851f252e4f27691eee0b77c16198db62", + "reference": "2434fb32851f252e4f27691eee0b77c16198db62", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": ">=7.1.3", "psr/log": "~1.0", "symfony/debug": "^4.4.5", + "symfony/polyfill-php80": "^1.15", "symfony/var-dumper": "^4.4|^5.0" }, "require-dev": { @@ -1815,24 +1881,24 @@ "type": "tidelift" } ], - "time": "2020-03-30T14:07:33+00:00" + "time": "2020-08-17T09:56:45+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.7", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed" + "reference": "3e8ea5ccddd00556b86d69d42f99f1061a704030" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed", - "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3e8ea5ccddd00556b86d69d42f99f1061a704030", + "reference": "3e8ea5ccddd00556b86d69d42f99f1061a704030", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": ">=7.1.3", "symfony/event-dispatcher-contracts": "^1.1" }, "conflict": { @@ -1899,24 +1965,24 @@ "type": "tidelift" } ], - "time": "2020-03-27T16:54:36+00:00" + "time": "2020-08-13T14:18:44+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.7", + "version": "v1.1.9", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18" + "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18", - "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7", + "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=7.1.3" }, "suggest": { "psr/event-dispatcher": "", @@ -1926,6 +1992,10 @@ "extra": { "branch-alias": { "dev-master": "1.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -1957,7 +2027,21 @@ "interoperability", "standards" ], - "time": "2019-09-17T09:54:03+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-07-06T13:19:58+00:00" }, { "name": "symfony/filesystem", @@ -2233,31 +2317,37 @@ }, { "name": "symfony/http-foundation", - "version": "v5.0.7", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "26fb006a2c7b6cdd23d52157b05f8414ffa417b6" + "reference": "41a4647f12870e9d41d9a7d72ff0614a27208558" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/26fb006a2c7b6cdd23d52157b05f8414ffa417b6", - "reference": "26fb006a2c7b6cdd23d52157b05f8414ffa417b6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/41a4647f12870e9d41d9a7d72ff0614a27208558", + "reference": "41a4647f12870e9d41d9a7d72ff0614a27208558", "shasum": "" }, "require": { - "php": "^7.2.5", - "symfony/mime": "^4.4|^5.0", - "symfony/polyfill-mbstring": "~1.1" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php80": "^1.15" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "^4.4|^5.0" + "symfony/cache": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/mime": "^4.4|^5.0" + }, + "suggest": { + "symfony/mime": "To use the file extension guesser" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -2298,30 +2388,31 @@ "type": "tidelift" } ], - "time": "2020-03-30T14:14:32+00:00" + "time": "2020-08-17T07:48:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.7", + "version": "v4.4.13", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "f356a489e51856b99908005eb7f2c51a1dfc95dc" + "reference": "2bb7b90ecdc79813c0bf237b7ff20e79062b5188" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f356a489e51856b99908005eb7f2c51a1dfc95dc", - "reference": "f356a489e51856b99908005eb7f2c51a1dfc95dc", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2bb7b90ecdc79813c0bf237b7ff20e79062b5188", + "reference": "2bb7b90ecdc79813c0bf237b7ff20e79062b5188", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": ">=7.1.3", "psr/log": "~1.0", "symfony/error-handler": "^4.4", "symfony/event-dispatcher": "^4.4", "symfony/http-foundation": "^4.4|^5.0", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-php73": "^1.9" + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "symfony/browser-kit": "<4.3", @@ -2402,96 +2493,20 @@ "type": "tidelift" } ], - "time": "2020-03-30T14:59:15+00:00" - }, - { - "name": "symfony/mime", - "version": "v5.0.7", - "source": { - "type": "git", - "url": "https://github.com/symfony/mime.git", - "reference": "481b7d6da88922fb1e0d86a943987722b08f3955" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/481b7d6da88922fb1e0d86a943987722b08f3955", - "reference": "481b7d6da88922fb1e0d86a943987722b08f3955", - "shasum": "" - }, - "require": { - "php": "^7.2.5", - "symfony/polyfill-intl-idn": "^1.10", - "symfony/polyfill-mbstring": "^1.0" - }, - "conflict": { - "symfony/mailer": "<4.4" - }, - "require-dev": { - "egulias/email-validator": "^2.1.10", - "symfony/dependency-injection": "^4.4|^5.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Mime\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A library to manipulate MIME messages", - "homepage": "https://symfony.com", - "keywords": [ - "mime", - "mime-type" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-09-02T08:09:29+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.15.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", - "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", "shasum": "" }, "require": { @@ -2503,7 +2518,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -2550,96 +2569,20 @@ "type": "tidelift" } ], - "time": "2020-02-27T09:26:54+00:00" - }, - { - "name": "symfony/polyfill-intl-idn", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", - "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.10" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.15-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Laurent Bassin", - "email": "laurent@bassin.info" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "idn", - "intl", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-03-09T19:04:49+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.15.0", + "version": "v1.18.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", - "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", "shasum": "" }, "require": { @@ -2651,7 +2594,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -2699,20 +2646,20 @@ "type": "tidelift" } ], - "time": "2020-03-09T19:04:49+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { - "name": "symfony/polyfill-php72", - "version": "v1.15.0", + "name": "symfony/polyfill-php73", + "version": "v1.18.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "37b0976c78b94856543260ce09b460a7bc852747" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", - "reference": "37b0976c78b94856543260ce09b460a7bc852747", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca", + "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca", "shasum": "" }, "require": { @@ -2721,15 +2668,22 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" + "Symfony\\Polyfill\\Php73\\": "" }, "files": [ "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2746,7 +2700,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -2768,34 +2722,38 @@ "type": "tidelift" } ], - "time": "2020-02-27T09:26:54+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { - "name": "symfony/polyfill-php73", - "version": "v1.15.0", + "name": "symfony/polyfill-php80", + "version": "v1.18.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", - "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981", + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" + "Symfony\\Polyfill\\Php80\\": "" }, "files": [ "bootstrap.php" @@ -2809,6 +2767,10 @@ "MIT" ], "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -2818,7 +2780,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -2840,7 +2802,7 @@ "type": "tidelift" } ], - "time": "2020-02-27T09:26:54+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/routing", @@ -2992,21 +2954,22 @@ }, { "name": "symfony/var-dumper", - "version": "v5.0.7", + "version": "v5.1.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "f74a126acd701392eef2492a17228d42552c86b5" + "reference": "b43a3905262bcf97b2510f0621f859ca4f5287be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f74a126acd701392eef2492a17228d42552c86b5", - "reference": "f74a126acd701392eef2492a17228d42552c86b5", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b43a3905262bcf97b2510f0621f859ca4f5287be", + "reference": "b43a3905262bcf97b2510f0621f859ca4f5287be", "shasum": "" }, "require": { - "php": "^7.2.5", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=7.2.5", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.15" }, "conflict": { "phpunit/phpunit": "<5.4.3", @@ -3029,7 +2992,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -3077,7 +3040,7 @@ "type": "tidelift" } ], - "time": "2020-03-27T16:56:45+00:00" + "time": "2020-08-17T07:42:30+00:00" }, { "name": "symfony/var-exporter", @@ -3664,6 +3627,7 @@ "keywords": [ "tokenizer" ], + "abandoned": true, "time": "2017-11-27T05:48:46+00:00" }, { From 58b191d6183ea0cea57cfc331267696d51779f1a Mon Sep 17 00:00:00 2001 From: mgiraud <11818237+mgiraud@users.noreply.github.com> Date: Wed, 2 Sep 2020 21:47:29 +0200 Subject: [PATCH 2/2] Apply fixes from StyleCI (#19) --- DataGrid/Expression/ComparisonExpression.php | 10 ----- DataGrid/Expression/CompositeExpression.php | 5 --- DataGrid/Expression/EmptyExpression.php | 2 - DataGrid/Expression/Visitable.php | 2 - .../AbstractExpressionVisitor.php | 7 +--- .../DoctrineExpressionVisitor.php | 35 ++++------------ DataGrid/Parser/SearchQueryParser.php | 42 ++++--------------- DataGrid/QueryHandler/DoctrineQueryConfig.php | 21 +--------- .../QueryHandler/DoctrineQueryHandler.php | 26 +----------- DataGrid/Search/SearchGroup.php | 3 -- DataGrid/Search/SearchQuery.php | 19 +-------- DataGrid/Search/SearchQueryBuilder.php | 18 -------- DataGrid/Search/SearchSort.php | 3 -- 13 files changed, 22 insertions(+), 171 deletions(-) diff --git a/DataGrid/Expression/ComparisonExpression.php b/DataGrid/Expression/ComparisonExpression.php index d9a556a..c023071 100644 --- a/DataGrid/Expression/ComparisonExpression.php +++ b/DataGrid/Expression/ComparisonExpression.php @@ -30,17 +30,11 @@ class ComparisonExpression implements Visitable */ protected $operator; - /** - * @return string - */ public function getField(): string { return $this->field; } - /** - * @return string - */ public function getOperator(): string { return $this->operator; @@ -62,8 +56,6 @@ public function getValue() /** * ComparisonExpression constructor. * - * @param string $field - * @param string $operator * @param $value */ public function __construct(string $field, string $operator, $value) @@ -74,8 +66,6 @@ public function __construct(string $field, string $operator, $value) } /** - * @param AbstractExpressionVisitor $visitor - * * @return mixed */ public function visit(AbstractExpressionVisitor $visitor) diff --git a/DataGrid/Expression/CompositeExpression.php b/DataGrid/Expression/CompositeExpression.php index 46055c1..9e0f5d3 100644 --- a/DataGrid/Expression/CompositeExpression.php +++ b/DataGrid/Expression/CompositeExpression.php @@ -46,8 +46,6 @@ public function getExpressions(): array } /** - * @param Visitable $expression - * * @return $this */ public function addExpression(Visitable $expression) @@ -57,9 +55,6 @@ public function addExpression(Visitable $expression) return $this; } - /** - * @return string - */ public function getType(): string { return $this->type; diff --git a/DataGrid/Expression/EmptyExpression.php b/DataGrid/Expression/EmptyExpression.php index d89659e..0bda291 100644 --- a/DataGrid/Expression/EmptyExpression.php +++ b/DataGrid/Expression/EmptyExpression.php @@ -10,8 +10,6 @@ class EmptyExpression implements Visitable { /** - * @param AbstractExpressionVisitor $visitor - * * @return mixed */ public function visit(AbstractExpressionVisitor $visitor) diff --git a/DataGrid/Expression/Visitable.php b/DataGrid/Expression/Visitable.php index e170564..01c09c8 100644 --- a/DataGrid/Expression/Visitable.php +++ b/DataGrid/Expression/Visitable.php @@ -10,8 +10,6 @@ interface Visitable { /** - * @param AbstractExpressionVisitor $visitor - * * @return mixed */ public function visit(AbstractExpressionVisitor $visitor); diff --git a/DataGrid/ExpressionVisitor/AbstractExpressionVisitor.php b/DataGrid/ExpressionVisitor/AbstractExpressionVisitor.php index b080f7d..6fec008 100644 --- a/DataGrid/ExpressionVisitor/AbstractExpressionVisitor.php +++ b/DataGrid/ExpressionVisitor/AbstractExpressionVisitor.php @@ -12,23 +12,18 @@ abstract class AbstractExpressionVisitor { /** - * @param ComparisonExpression $comparison - * * @return mixed */ abstract public function visitComparison(ComparisonExpression $comparison); /** * @param $type - * @param array $expressions * * @return mixed */ abstract public function visitProcessedCompositeExpression(string $type, array $expressions); /** - * @param CompositeExpression $compositeExpression - * * @return mixed */ public function visitCompositeExpression(CompositeExpression $compositeExpression) @@ -37,7 +32,7 @@ public function visitCompositeExpression(CompositeExpression $compositeExpressio return $expr->visit($this); }); $expressions = \Functional\filter($expressions, function ($expr) { - return $expr !== null; + return null !== $expr; }); return $this->visitProcessedCompositeExpression($compositeExpression->getType(), $expressions); diff --git a/DataGrid/ExpressionVisitor/DoctrineExpressionVisitor.php b/DataGrid/ExpressionVisitor/DoctrineExpressionVisitor.php index 73a0a1e..b8d4282 100644 --- a/DataGrid/ExpressionVisitor/DoctrineExpressionVisitor.php +++ b/DataGrid/ExpressionVisitor/DoctrineExpressionVisitor.php @@ -53,8 +53,6 @@ class DoctrineExpressionVisitor extends AbstractExpressionVisitor /** * DoctrineExpressionVisitor constructor. - * - * @param DoctrineQueryHandler $queryHandler */ public function __construct(DoctrineQueryHandler $queryHandler) { @@ -75,8 +73,6 @@ protected function convertOperator($operator) } /** - * @param ComparisonExpression $comparison - * * @return mixed|string */ protected function visitValue(ComparisonExpression $comparison) @@ -88,14 +84,14 @@ protected function visitValue(ComparisonExpression $comparison) ) { return $date->setTimezone(new \DateTimezone(date_default_timezone_get())); } else { - $value = $comparison->getValue() !== null ? $this->queryHandler->transformValueCase($comparison->getValue()) : null; - if ($comparison->getOperator() === ComparisonExpression::CONTAINS || $comparison->getOperator( - ) === ComparisonExpression::NOTCONTAINS + $value = null !== $comparison->getValue() ? $this->queryHandler->transformValueCase($comparison->getValue()) : null; + if (ComparisonExpression::CONTAINS === $comparison->getOperator() || ComparisonExpression::NOTCONTAINS === $comparison->getOperator( + ) ) { return '%'.$value.'%'; - } elseif ($comparison->getOperator() === ComparisonExpression::STARTSWITH) { + } elseif (ComparisonExpression::STARTSWITH === $comparison->getOperator()) { return $value.'%'; - } elseif ($comparison->getOperator() === ComparisonExpression::ENDSWITH) { + } elseif (ComparisonExpression::ENDSWITH === $comparison->getOperator()) { return '%'.$value; } else { return $value; @@ -103,11 +99,6 @@ protected function visitValue(ComparisonExpression $comparison) } } - /** - * @param ComparisonExpression $comparisonExpression - * - * @return string - */ protected function visitField(ComparisonExpression $comparisonExpression, $visitedValue): string { $field = $comparisonExpression->getField(); @@ -119,9 +110,7 @@ protected function visitField(ComparisonExpression $comparisonExpression, $visit } /** - * @param ComparisonExpression $comparison - * @param string $fieldName - * @param mixed $value + * @param mixed $value * * @return DoctrineComparison */ @@ -156,9 +145,6 @@ protected function visitComparisonWithNotNullValue(ComparisonExpression $compari } /** - * @param ComparisonExpression $comparison - * @param string $fieldName - * * @return string */ protected function visitComparisonWithNullValue(ComparisonExpression $comparison, string $fieldName) @@ -174,8 +160,6 @@ protected function visitComparisonWithNullValue(ComparisonExpression $comparison } /** - * @param ComparisonExpression $comparison - * * @return DoctrineComparison */ public function visitComparison(ComparisonExpression $comparison) @@ -183,7 +167,7 @@ public function visitComparison(ComparisonExpression $comparison) $value = $this->visitValue($comparison); $fieldName = $this->visitField($comparison, $value); - if ($value !== null) { + if (null !== $value) { return $this->visitComparisonWithNotNullValue($comparison, $fieldName, $value); } else { return $this->visitComparisonWithNullValue($comparison, $fieldName); @@ -191,9 +175,6 @@ public function visitComparison(ComparisonExpression $comparison) } /** - * @param string $type - * @param array $expressions - * * @return Andx|Orx|Func */ public function visitProcessedCompositeExpression(string $type, array $expressions) @@ -204,7 +185,7 @@ public function visitProcessedCompositeExpression(string $type, array $expressio case CompositeExpression::TYPE_OR: return new Orx($expressions); case CompositeExpression::TYPE_NOT: - return new Func("not", $expressions); + return new Func('not', $expressions); default: throw new UnknownCompositeException($type); } diff --git a/DataGrid/Parser/SearchQueryParser.php b/DataGrid/Parser/SearchQueryParser.php index 97a70a2..b63c264 100644 --- a/DataGrid/Parser/SearchQueryParser.php +++ b/DataGrid/Parser/SearchQueryParser.php @@ -28,19 +28,11 @@ public function __construct() $this->builder = new SearchQueryBuilder(); } - /** - * @return SearchQueryBuilder - */ public function getBuilder(): SearchQueryBuilder { return $this->builder; } - /** - * @param \stdClass $data - * - * @return SearchQuery - */ public function parse(\stdClass $data): SearchQuery { if (isset($data->take)) { @@ -60,8 +52,6 @@ public function parse(\stdClass $data): SearchQuery } /** - * @param \stdClass $data - * * @throws NotNumericException */ public function parseStartIndex(\stdClass $data) @@ -74,8 +64,6 @@ public function parseStartIndex(\stdClass $data) } /** - * @param \stdClass $data - * * @throws NotNumericException */ public function parseMaxResults(\stdClass $data) @@ -88,8 +76,6 @@ public function parseMaxResults(\stdClass $data) } /** - * @param \stdClass $data - * * @throws NotArrayException */ public function parseSort(\stdClass $data) @@ -106,28 +92,18 @@ function (\stdClass $sort) { } } - /** - * @param array $filter - * - * @return ComparisonExpression - */ public function parseComparison(array $filter): ComparisonExpression { return new ComparisonExpression($filter[0], $filter[1], $filter[2]); } /** - * @param array $filter - * @param CompositeExpression|null $parent - * - * @return Visitable - * * @throws \Exception */ public function parseDisjunction(array $filter, CompositeExpression $parent = null): Visitable { - if (count($filter) == 1) { - if ($parent === null) { + if (1 == count($filter)) { + if (null === $parent) { return $this->parseComparison(array_shift($filter)); } else { $parent->addExpression($this->parseDisjunction(array_shift($filter))); @@ -137,14 +113,14 @@ public function parseDisjunction(array $filter, CompositeExpression $parent = nu } elseif (count($filter) >= 3) { $first = array_shift($filter); $second = array_shift($filter); - if ($second === 'and' || $second === 'or') { - if ($second === 'and') { + if ('and' === $second || 'or' === $second) { + if ('and' === $second) { $newComposite = new CompositeExpression(CompositeExpression::TYPE_AND, []); } else { $newComposite = new CompositeExpression(CompositeExpression::TYPE_OR, []); } - if ($parent !== null) { - if (count($filter[0]) > 1 && count($parent->getExpressions()) === 0) { + if (null !== $parent) { + if (count($filter[0]) > 1 && 0 === count($parent->getExpressions())) { $newComposite->addExpression($this->parseDisjunction($first, $newComposite)); return $this->parseDisjunction($filter, $newComposite); @@ -161,11 +137,11 @@ public function parseDisjunction(array $filter, CompositeExpression $parent = nu } else { return $this->parseComparison([$first, $second, $filter[0]]); } - } else if (count($filter) == 2) { + } elseif (2 == count($filter)) { $first = array_shift($filter); $second = array_shift($filter); - if($first === '!') { + if ('!' === $first) { $newComposite = new CompositeExpression(CompositeExpression::TYPE_NOT, []); $newComposite->addExpression($this->parseDisjunction($second, $newComposite)); @@ -178,8 +154,6 @@ public function parseDisjunction(array $filter, CompositeExpression $parent = nu } /** - * @param \stdClass $data - * * @throws NotArrayException */ public function parseFilter(\stdClass $data) diff --git a/DataGrid/QueryHandler/DoctrineQueryConfig.php b/DataGrid/QueryHandler/DoctrineQueryConfig.php index 73d3545..f34c827 100644 --- a/DataGrid/QueryHandler/DoctrineQueryConfig.php +++ b/DataGrid/QueryHandler/DoctrineQueryConfig.php @@ -27,9 +27,7 @@ class DoctrineQueryConfig /** * DoctrineQueryConfig constructor. * - * @param array $fieldMapping - * @param array $defaultFilters - * @param bool $caseSensitive + * @param bool $caseSensitive */ public function __construct(array $fieldMapping = [], array $defaultFilters = [], $caseSensitive = false) { @@ -46,33 +44,22 @@ public function getDefaultFilters(): array return $this->defaultFilters; } - /** - * @param array $defaultFilters - */ public function setDefaultFilters(array $defaultFilters) { $this->defaultFilters = $defaultFilters; } - /** - * @return array - */ public function getFieldMapping(): array { return $this->fieldMapping; } - /** - * @param array $fieldMapping - */ public function setFieldMapping(array $fieldMapping) { $this->fieldMapping = $fieldMapping; } /** - * @param string $field - * * @return string */ public function mapField(string $field) @@ -84,17 +71,11 @@ public function mapField(string $field) return $field; } - /** - * @return bool - */ public function isCaseSensitive(): bool { return $this->caseSensitive; } - /** - * @param bool $caseSensitive - */ public function setCaseSensitive(bool $caseSensitive) { $this->caseSensitive = $caseSensitive; diff --git a/DataGrid/QueryHandler/DoctrineQueryHandler.php b/DataGrid/QueryHandler/DoctrineQueryHandler.php index 0f2c52b..931d11c 100644 --- a/DataGrid/QueryHandler/DoctrineQueryHandler.php +++ b/DataGrid/QueryHandler/DoctrineQueryHandler.php @@ -31,10 +31,6 @@ class DoctrineQueryHandler /** * DoctrineQueryHandler constructor. - * - * @param DoctrineQueryConfig $queryConfig - * @param QueryBuilder $queryBuilder - * @param SearchQuery $searchQuery */ public function __construct(DoctrineQueryConfig $queryConfig, QueryBuilder $queryBuilder, SearchQuery $searchQuery) { @@ -44,8 +40,6 @@ public function __construct(DoctrineQueryConfig $queryConfig, QueryBuilder $quer } /** - * @param string $field - * * @return string */ public function transformField(string $field) @@ -54,10 +48,7 @@ public function transformField(string $field) } /** - * @param string $field * @param $visitedValue - * - * @return string */ public function transformFieldCase(string $field, $visitedValue): string { @@ -68,11 +59,6 @@ public function transformFieldCase(string $field, $visitedValue): string return $field; } - /** - * @param string $value - * - * @return string - */ public function transformValueCase(string $value): string { if ($this->queryConfig->isCaseSensitive()) { @@ -98,15 +84,13 @@ public function addAllModifiers($noDefaultFilter = false) /** * @param bool $noDefaultFilter - * - * @return DoctrineQueryHandler */ public function addFilters($noDefaultFilter = false): DoctrineQueryHandler { $visitor = new DoctrineExpressionVisitor($this); $filters = $this->searchQuery->getFilter()->visit($visitor); - if ($filters !== null) { + if (null !== $filters) { $this->queryBuilder->andWhere($filters); } @@ -129,9 +113,6 @@ function (Parameter $parameter) { return $this; } - /** - * @return DoctrineQueryHandler - */ public function addSorting(): DoctrineQueryHandler { \Functional\each( @@ -147,13 +128,10 @@ function (SearchSort $sort) { return $this; } - /** - * @return QueryBuilder - */ public function addPagination(): QueryBuilder { $this->queryBuilder->setFirstResult($this->searchQuery->getStartIndex()); - if (($maxResults = $this->searchQuery->getMaxResults()) !== null) { + if (null !== ($maxResults = $this->searchQuery->getMaxResults())) { $this->queryBuilder->setMaxResults($maxResults); } diff --git a/DataGrid/Search/SearchGroup.php b/DataGrid/Search/SearchGroup.php index 086991e..f3686a7 100644 --- a/DataGrid/Search/SearchGroup.php +++ b/DataGrid/Search/SearchGroup.php @@ -16,9 +16,6 @@ class SearchGroup /** * SearchGroup constructor. - * - * @param string $field - * @param bool $desc */ public function __construct(string $field, bool $desc) { diff --git a/DataGrid/Search/SearchQuery.php b/DataGrid/Search/SearchQuery.php index 02dd4bc..abe9cd4 100644 --- a/DataGrid/Search/SearchQuery.php +++ b/DataGrid/Search/SearchQuery.php @@ -41,25 +41,19 @@ public function __construct($filter, $sort, $startIndex, $maxResults) { $this->filter = $filter; $this->sort = $sort; - if ($this->startIndex !== null) { + if (null !== $this->startIndex) { $this->startIndex = (int) $startIndex; } - if ($maxResults !== null) { + if (null !== $maxResults) { $this->maxResults = (int) $maxResults; } } - /** - * @return Visitable - */ public function getFilter(): Visitable { return $this->filter; } - /** - * @param Visitable $filter - */ public function setFilter(Visitable $filter) { $this->filter = $filter; @@ -73,25 +67,16 @@ public function getSort(): array return $this->sort; } - /** - * @param array $sort - */ public function setSort(array $sort) { $this->sort = $sort; } - /** - * @return int - */ public function getStartIndex(): int { return $this->startIndex; } - /** - * @param int $startIndex - */ public function setStartIndex(int $startIndex) { $this->startIndex = $startIndex; diff --git a/DataGrid/Search/SearchQueryBuilder.php b/DataGrid/Search/SearchQueryBuilder.php index b7319e4..39277ff 100644 --- a/DataGrid/Search/SearchQueryBuilder.php +++ b/DataGrid/Search/SearchQueryBuilder.php @@ -52,17 +52,11 @@ public function build() return new SearchQuery($filters, $this->sortings, $this->startIndex, $this->maxResults); } - /** - * @return array - */ public function getFilters(): array { return $this->filters; } - /** - * @return int - */ public function getStartIndex(): int { return $this->startIndex; @@ -74,8 +68,6 @@ public function getMaxResults() } /** - * @param array $filters - * * @return $this */ public function setFilters(array $filters) @@ -85,17 +77,12 @@ public function setFilters(array $filters) return $this; } - /** - * @return array - */ public function getSortings(): array { return $this->sortings; } /** - * @param int $startIndex - * * @return $this */ public function setStartIndex(int $startIndex) @@ -118,9 +105,6 @@ public function setMaxResults($maxResults) } /** - * @param string $field - * @param bool $desc - * * @return $this */ public function sort(string $field, bool $desc) @@ -131,8 +115,6 @@ public function sort(string $field, bool $desc) } /** - * @param Visitable $expression - * * @return $this */ public function filter(Visitable $expression) diff --git a/DataGrid/Search/SearchSort.php b/DataGrid/Search/SearchSort.php index 2c61c2b..aed1711 100644 --- a/DataGrid/Search/SearchSort.php +++ b/DataGrid/Search/SearchSort.php @@ -19,9 +19,6 @@ class SearchSort /** * SearchSort constructor. - * - * @param string $field - * @param bool $desc */ public function __construct(string $field, bool $desc) {