Merge pull request #70 from MortalFlesh/feature/use-php-74

Require php 7.4 and update dependencies

Author: MortalFlesh

.coveralls.yml

@@ -12,10 +12,10 @@ jobs:
 
         strategy:
             matrix:
-                php-version: ['7.3']
+                php-version: ['7.4']
                 dependencies: ['']
                 include:
-                    - { php-version: '7.3', dependencies: '--prefer-lowest --prefer-stable' }
+                    - { php-version: '7.4', dependencies: '--prefer-lowest --prefer-stable' }
 
         name: Unit tests - PHP ${{ matrix.dependencies }}
 
@@ -65,7 +65,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '7.3'
+                  php-version: '7.4'
                   extensions: mbstring, intl
 
             - name: Install dependencies

.github/workflows/tests.yaml

@@ -2,4 +2,5 @@
 /vendor/
 composer.lock
 
+.phpunit.result.cache
 /reports/

.gitignore

@@ -4,6 +4,7 @@
 <!-- There should always be "Unreleased" section at the beginning. -->
 
 ## Unreleased
+- Require php 7.4 and update dependencies
 
 ## 2.1.0 - 2020-11-11
 - Add **Filter**

.travis.yml

@@ -4,23 +4,22 @@
     "description": "Parser/builder for filters from API query parameters.",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.4",
         "ext-mbstring": "*",
-        "beberlei/assert": "^2.9 || ^3.0",
-        "mf/collections-php": "^4.0"
+        "beberlei/assert": "^3.0",
+        "mf/collections-php": "^5.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.7",
         "ergebnis/composer-normalize": "^2.5",
-        "lmc/coding-standard": "^2.0",
-        "mockery/mockery": "^1.3",
-        "php-coveralls/php-coveralls": "^2.2",
+        "lmc/coding-standard": "^3.0",
+        "mockery/mockery": "^1.4",
         "php-parallel-lint/php-parallel-lint": "^1.2",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12.23",
         "phpstan/phpstan-beberlei-assert": "^0.12.2",
         "phpstan/phpstan-mockery": "^0.12.5",
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^9.5"
     },
     "suggest": {
         "doctrine/orm": "To allow applying filters directly to QueryBuilder"
@@ -48,9 +47,9 @@
             "@cs",
             "@phpstan"
         ],
-        "cs": "vendor/bin/ecs check --ansi src/ tests/",
+        "cs": "vendor/bin/ecs check --ansi src/ tests/ ecs.php",
         "fix": [
-            "vendor/bin/ecs check --ansi --clear-cache --fix src/ tests/",
+            "vendor/bin/ecs check --ansi --clear-cache --fix src/ tests/ ecs.php",
             "@composer normalize"
         ],
         "lint": [

CHANGELOG.md

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+use Lmc\CodingStandard\Sniffs\Naming\ClassNameSuffixByParentSniff;
+use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
+use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestAnnotationFixer;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+use Symplify\EasyCodingStandard\ValueObject\Option;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+
+    $parameters->set(
+        Option::SKIP,
+        ['SlevomatCodingStandard\Sniffs\Exceptions\ReferenceThrowableOnlySniff.ReferencedGeneralException' => ['tests/Exception/*.php']]
+    );
+
+    $containerConfigurator->import(__DIR__ . '/vendor/lmc/coding-standard/ecs.php');
+
+    $services = $containerConfigurator->services();
+
+    $services->set(PhpUnitTestAnnotationFixer::class)
+        ->call('configure', [['style' => 'annotation']]);
+
+    $services->set(ClassNameSuffixByParentSniff::class)
+        ->property('extraParentTypesToSuffixes', ['*ApplicatorInterface' => 'Applicator']);
+
+    $services->set(NoSuperfluousPhpdocTagsFixer::class)
+        ->call('configure', [['allow_mixed' => true]]);
+};

composer.json

@@ -4,3 +4,6 @@ parameters:
     paths:
         - src/
         - tests/
+
+    ignoreErrors:
+        - '#Parameter \#1 \$expected of method PHPUnit\\Framework\\Assert::assertInstanceOf\(\) expects class\-string<object>, string given.#'

easy-coding-standard.yaml

@@ -6,6 +6,17 @@
          colors="true"
          bootstrap="vendor/autoload.php"
 >
+
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <report>
+            <clover outputFile="./reports/clover.xml"/>
+            <html outputDirectory="./reports" highLowerBound="90"/>
+        </report>
+    </coverage>
+
     <php>
         <!-- E_ALL = 30719 -->
         <ini name="error_reporting" value="30719"/>
@@ -17,15 +28,7 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
-
     <logging>
-        <log type="coverage-html" target="./reports" highLowerBound="90"/>
-        <log type="coverage-clover" target="./reports/clover.xml"/>
-        <log type="junit" target="./reports/junit.xml"/>
+        <junit outputFile="./reports/junit.xml"/>
     </logging>
 </phpunit>

ecs.php

@@ -21,14 +21,10 @@
 
 class ApiFilter
 {
-    /** @var Functions */
-    private $functions;
-    /** @var QueryParametersParser */
-    private $parser;
-    /** @var FilterApplicator */
-    private $applicator;
-    /** @var FunctionCreator */
-    private $functionCreator;
+    private Functions $functions;
+    private QueryParametersParser $parser;
+    private FilterApplicator $applicator;
+    private FunctionCreator $functionCreator;
 
     public function __construct()
     {

phpstan.neon

@@ -8,14 +8,10 @@
 
 class ParameterDefinition
 {
-    /** @var string */
-    private $name;
-    /** @var string */
-    private $filter;
-    /** @var string */
-    private $column;
-    /** @var ?Value */
-    private $defaultValue;
+    private string $name;
+    private string $filter;
+    private string $column;
+    private ?Value $defaultValue;
 
     /**
      * Shortcut for creating parameter with just a name and a default value

phpunit.xml.dist

@@ -6,12 +6,10 @@
 
 class InvalidArgumentException extends \InvalidArgumentException implements ApiFilterExceptionInterface, AssertionFailedException
 {
-    /** @var null|string */
-    private $propertyPath;
+    private ?string $propertyPath;
     /** @var mixed */
     private $value;
-    /** @var array */
-    private $constraints;
+    private array $constraints;
 
     /**
      * @param mixed $value

src/ApiFilter.php

@@ -7,14 +7,10 @@
 
 abstract class AbstractFilter implements FilterInterface
 {
-    /** @var string */
-    private $title;
-    /** @var string */
-    private $column;
-    /** @var Value */
-    private $value;
-    /** @var ?string */
-    private $fullTitle;
+    private string $title;
+    private string $column;
+    private Value $value;
+    private ?string $fullTitle = null;
 
     public function __construct(string $title, string $column, Value $value)
     {

src/Entity/ParameterDefinition.php

@@ -6,8 +6,7 @@
 
 class FilterWithOperator extends AbstractFilter
 {
-    /** @var string */
-    private $operator;
+    private string $operator;
 
     public function __construct(string $column, Value $value, string $operator, string $title)
     {

src/Exception/InvalidArgumentException.php

@@ -16,7 +16,7 @@
 class Filters implements FiltersInterface
 {
     /** @var IList<FilterInterface> */
-    private $filters;
+    private IList $filters;
 
     /** @param FilterInterface[] $filters */
     public static function from(array $filters): FiltersInterface

src/Filter/AbstractFilter.php

@@ -18,11 +18,9 @@
 class FilterApplicator
 {
     /** @var PrioritizedCollection|ApplicatorInterface[] */
-    private $applicators;
-    /** @var Functions */
-    private $functions;
-    /** @var FiltersInterface */
-    private $filters;
+    private PrioritizedCollection $applicators;
+    private Functions $functions;
+    private ?FiltersInterface $filters = null;
 
     public function __construct(Functions $functions)
     {

src/Filter/FilterWithOperator.php

@@ -14,8 +14,7 @@
 
 class FunctionCreator
 {
-    /** @var FilterFactory */
-    private $filterFactory;
+    private FilterFactory $filterFactory;
 
     public function __construct(FilterFactory $filterFactory)
     {

src/Filters/Filters.php

@@ -15,13 +15,13 @@ class Functions
     private const FUNCTION_NAME_TYPE = 'string';
 
     /** @var IMap<string, callable> */
-    private $functions;
+    private IMap $functions;
     /** @var IMap<string, array> */
-    private $functionParameters;
+    private IMap $functionParameters;
     /** @var IMap<string, array<ParameterDefinition>> */
-    private $parameterDefinitions;
+    private IMap $parameterDefinitions;
     /** @var array<string, string> parameterName => functionName */
-    private $registeredParameters;
+    private array $registeredParameters;
 
     public function __construct()
     {

src/Service/FilterApplicator.php

@@ -9,8 +9,7 @@
 
 abstract class AbstractParser implements ParserInterface
 {
-    /** @var FilterFactory */
-    private $filterFactory;
+    private FilterFactory $filterFactory;
 
     public function __construct(FilterFactory $filterFactory)
     {

src/Service/FunctionCreator.php

@@ -18,7 +18,7 @@
 class FunctionParser extends AbstractParser
 {
     /** @var PrioritizedCollection|FunctionParserInterface[] */
-    private $parsers;
+    private PrioritizedCollection $parsers;
 
     public function __construct(FilterFactory $filterFactory, Functions $functions)
     {

src/Service/Functions.php

@@ -14,14 +14,12 @@ abstract class AbstractFunctionParser extends AbstractParser implements Function
     private const ERROR_MULTIPLE_FUNCTION_CALL = 'It is not allowed to call one function multiple times.';
     protected const ERROR_FUNCTION_DEFINITION_BY_TUPLE_WITHOUT_TUPLE_VALUES = 'Function definition by a tuple must have a tuple value.';
 
-    /** @var Functions */
-    protected $functions;
-    /** @var ?array */
-    private $queryParameters;
+    protected Functions $functions;
+    private ?array $queryParameters = null;
     /** @var IMap<string,bool>|IMap|null */
-    private $alreadyParsedFunctions;
+    private ?IMap $alreadyParsedFunctions;
     /** @var IMap<string,bool>|IMap|null */
-    private $alreadyParsedColumns;
+    private ?IMap $alreadyParsedColumns;
 
     public function __construct(FilterFactory $filterFactory, Functions $functions)
     {

src/Service/Parser/AbstractParser.php

@@ -6,8 +6,7 @@
 
 class ImplicitFunctionDefinitionByValueParser extends AbstractFunctionParser
 {
-    /** @var ?bool */
-    private $isAllImplicitFunctionDefinitionsChecked;
+    private ?bool $isAllImplicitFunctionDefinitionsChecked;
 
     public function setCommonValues(
         array $queryParameters,