From d368568ca5a0e0c07355bdeff999ac19da9b78bc Mon Sep 17 00:00:00 2001 From: Tomas Pilar Date: Wed, 6 Mar 2019 19:47:10 +0100 Subject: [PATCH] cleanup --- .scrutinizer.yml | 2 +- .travis.yml | 9 +------- README.md | 2 +- composer.lock | 48 +++++++++++++++++++------------------- easy-coding-standard.yml | 50 ++++++++++++++++++++-------------------- 5 files changed, 52 insertions(+), 59 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index ffc8769..3e339fa 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -10,4 +10,4 @@ tools: checks: php: - code_rating: true \ No newline at end of file + code_rating: true diff --git a/.travis.yml b/.travis.yml index cccdb62..f788e08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,6 @@ matrix: env: - PHPUNIT_FLAGS="--coverage-clover coverage.xml" - COMPOSER_FLAGS="" - - php: 7.2 - env: - - CODING_STANDARD=true - - COMPOSER_FLAGS="" - php: 7.2 env: - PHPSTAN=true @@ -32,8 +28,6 @@ install: script: - vendor/bin/phpunit $PHPUNIT_FLAGS - - # static analysis - if [[ $CODING_STANDARD != "" ]]; then vendor/bin/ecs check src tests; fi - if [[ $PHPSTAN != "" ]]; then vendor/bin/phpstan analyse src tests --level max --configuration phpstan.neon; fi @@ -45,6 +39,5 @@ after_script: php ocular.phar code-coverage:upload --format=php-clover coverage.xml fi -# do not send success notifications, they have no value notifications: - email: never \ No newline at end of file + email: never diff --git a/README.md b/README.md index b72a58c..8d3de1d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Write filter query as simple string via Filter Query Language (FQL) syntax. Filter query will be parsed into easy-to-use syntax tree. -**Simple FQL example:** +**Some FQL query example:** `q:"samsung" AND introducedAt:["2018-01-01 00:00:00" TO NOW] AND (type:tv OR type:mobile)` diff --git a/composer.lock b/composer.lock index 425112e..bf64727 100644 --- a/composer.lock +++ b/composer.lock @@ -4387,23 +4387,23 @@ }, { "name": "symplify/better-phpdoc-parser", - "version": "v5.4.15", + "version": "v5.4.16", "source": { "type": "git", "url": "https://github.com/Symplify/BetterPhpDocParser.git", - "reference": "ea39755a7d9c2ec13121a049df2a78fa4d3ed250" + "reference": "a730f69c4b19c741f13b4d05116da7bb64e3db26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Symplify/BetterPhpDocParser/zipball/ea39755a7d9c2ec13121a049df2a78fa4d3ed250", - "reference": "ea39755a7d9c2ec13121a049df2a78fa4d3ed250", + "url": "https://api.github.com/repos/Symplify/BetterPhpDocParser/zipball/a730f69c4b19c741f13b4d05116da7bb64e3db26", + "reference": "a730f69c4b19c741f13b4d05116da7bb64e3db26", "shasum": "" }, "require": { "nette/utils": "^2.5", "php": "^7.1", "phpstan/phpdoc-parser": "^0.3.1", - "symplify/package-builder": "^5.4.15" + "symplify/package-builder": "^5.4.16" }, "require-dev": { "phpunit/phpunit": "^7.5|^8.0" @@ -4426,20 +4426,20 @@ ], "description": "Slim wrapper around phpstan/phpdoc-parser with format preserving printer", "abandoned": "https://github.com/rectorphp/rector", - "time": "2019-03-05T03:13:39+00:00" + "time": "2019-03-05T23:15:04+00:00" }, { "name": "symplify/coding-standard", - "version": "v5.4.15", + "version": "v5.4.16", "source": { "type": "git", "url": "https://github.com/Symplify/CodingStandard.git", - "reference": "d306db7408ae97de02e4aeb5f679ed6122444936" + "reference": "72a3b03f21be6c978a90ad567a29bd9261df0dfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Symplify/CodingStandard/zipball/d306db7408ae97de02e4aeb5f679ed6122444936", - "reference": "d306db7408ae97de02e4aeb5f679ed6122444936", + "url": "https://api.github.com/repos/Symplify/CodingStandard/zipball/72a3b03f21be6c978a90ad567a29bd9261df0dfa", + "reference": "72a3b03f21be6c978a90ad567a29bd9261df0dfa", "shasum": "" }, "require": { @@ -4449,14 +4449,14 @@ "php": "^7.1", "slam/php-cs-fixer-extensions": "^1.17", "squizlabs/php_codesniffer": "^3.4", - "symplify/better-phpdoc-parser": "^5.4.15", - "symplify/package-builder": "^5.4.15" + "symplify/better-phpdoc-parser": "^5.4.16", + "symplify/package-builder": "^5.4.16" }, "require-dev": { "nette/application": "^2.4", "phpunit/phpunit": "^7.5|^8.0", - "symplify/easy-coding-standard-tester": "^5.4.15", - "symplify/package-builder": "^5.4.15" + "symplify/easy-coding-standard-tester": "^5.4.16", + "symplify/package-builder": "^5.4.16" }, "type": "library", "extra": { @@ -4475,20 +4475,20 @@ "MIT" ], "description": "Set of Symplify rules for PHP_CodeSniffer and PHP CS Fixer.", - "time": "2019-03-05T03:13:39+00:00" + "time": "2019-03-05T23:15:04+00:00" }, { "name": "symplify/easy-coding-standard", - "version": "v5.4.15", + "version": "v5.4.16", "source": { "type": "git", "url": "https://github.com/Symplify/EasyCodingStandard.git", - "reference": "5fdcb1ae9319ecf8eedcbf3121fe3efb73664ff9" + "reference": "66ed360e0b81881336c7339989dce3b0c14509e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Symplify/EasyCodingStandard/zipball/5fdcb1ae9319ecf8eedcbf3121fe3efb73664ff9", - "reference": "5fdcb1ae9319ecf8eedcbf3121fe3efb73664ff9", + "url": "https://api.github.com/repos/Symplify/EasyCodingStandard/zipball/66ed360e0b81881336c7339989dce3b0c14509e9", + "reference": "66ed360e0b81881336c7339989dce3b0c14509e9", "shasum": "" }, "require": { @@ -4508,12 +4508,12 @@ "symfony/finder": "^3.4|^4.1", "symfony/http-kernel": "^3.4|^4.1", "symfony/yaml": "^3.4|^4.1", - "symplify/coding-standard": "^5.4.15", - "symplify/package-builder": "^5.4.15" + "symplify/coding-standard": "^5.4.16", + "symplify/package-builder": "^5.4.16" }, "require-dev": { "phpunit/phpunit": "^7.5|^8.0", - "symplify/easy-coding-standard-tester": "^5.4.15" + "symplify/easy-coding-standard-tester": "^5.4.16" }, "bin": [ "bin/ecs" @@ -4538,11 +4538,11 @@ "MIT" ], "description": "Use Coding Standard with 0-knowledge of PHP-CS-Fixer and PHP_CodeSniffer.", - "time": "2019-03-05T03:13:39+00:00" + "time": "2019-03-05T23:15:04+00:00" }, { "name": "symplify/package-builder", - "version": "v5.4.15", + "version": "v5.4.16", "source": { "type": "git", "url": "https://github.com/Symplify/PackageBuilder.git", diff --git a/easy-coding-standard.yml b/easy-coding-standard.yml index edf8ee9..0b96453 100644 --- a/easy-coding-standard.yml +++ b/easy-coding-standard.yml @@ -34,35 +34,35 @@ services: parameters: indentation: tab - exclude_checkers: - - PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff - - Symplify\CodingStandard\Sniffs\DependencyInjection\NoClassInstantiationSniff - - Symplify\CodingStandard\Sniffs\Property\DynamicPropertySniff - - SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff - - PhpCsFixer\Fixer\Operator\NewWithBracesFixer - - PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer - - Symplify\CodingStandard\Fixer\ClassNotation\LastPropertyAndFirstMethodSeparationFixer - - PhpCsFixer\Fixer\Basic\BracesFixer - - PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer - - PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\MultiLineFunctionDeclarationSniff - - PhpCsFixer\Fixer\LanguageConstruct\DeclareEqualNormalizeFixer - - Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenStaticFunctionSniff - - PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\SuperfluousWhitespaceSniff - - Symplify\CodingStandard\Sniffs\ControlStructure\SprintfOverContactSniff - - Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenReferenceSniff - - Symplify\CodingStandard\Sniffs\CleanCode\CognitiveComplexitySniff - - PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer - - Symplify\CodingStandard\Sniffs\Architecture\ExplicitExceptionSniff - - Symplify\CodingStandard\Fixer\Naming\PropertyNameMatchingTypeFixer - - SlevomatCodingStandard\Sniffs\Classes\UnusedPrivateElementsSniff - - SlamCsFixer\FinalInternalClassFixer - - Symplify\CodingStandard\Fixer\Order\PrivateMethodOrderByUseFixer - - PhpCsFixer\Fixer\PhpUnit\PhpUnitStrictFixer - - Symplify\CodingStandard\Sniffs\Commenting\VarConstantCommentSniff skip: + PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff: + Symplify\CodingStandard\Sniffs\DependencyInjection\NoClassInstantiationSniff: + Symplify\CodingStandard\Sniffs\Property\DynamicPropertySniff: + SlevomatCodingStandard\Sniffs\TypeHints\TypeHintDeclarationSniff: + PhpCsFixer\Fixer\Operator\NewWithBracesFixer: + PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer: + Symplify\CodingStandard\Fixer\ClassNotation\LastPropertyAndFirstMethodSeparationFixer: + PhpCsFixer\Fixer\Basic\BracesFixer: + PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer: + PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\MultiLineFunctionDeclarationSniff: + PhpCsFixer\Fixer\LanguageConstruct\DeclareEqualNormalizeFixer: + Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenStaticFunctionSniff: + PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\SuperfluousWhitespaceSniff: + Symplify\CodingStandard\Sniffs\ControlStructure\SprintfOverContactSniff: + Symplify\CodingStandard\Sniffs\CleanCode\ForbiddenReferenceSniff: + Symplify\CodingStandard\Sniffs\CleanCode\CognitiveComplexitySniff: + PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer: + Symplify\CodingStandard\Sniffs\Architecture\ExplicitExceptionSniff: + Symplify\CodingStandard\Fixer\Naming\PropertyNameMatchingTypeFixer: + SlevomatCodingStandard\Sniffs\Classes\UnusedPrivateElementsSniff: + SlamCsFixer\FinalInternalClassFixer: + Symplify\CodingStandard\Fixer\Order\PrivateMethodOrderByUseFixer: + Symplify\CodingStandard\Sniffs\Commenting\VarConstantCommentSniff: + Symplify\CodingStandard\Sniffs\Architecture\DuplicatedClassShortNameSniff: PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff: - tests/Tokenizer/FullTokenizerTest.php - tests/IntegrationTest.php PhpCsFixer\Fixer\PhpUnit\PhpUnitStrictFixer: - tests/Tokenizer/FullTokenizerTest.php + - tests/Tokenizer/FullTest.php - tests/IntegrationTest.php