Update packges

.gitignore

@@ -2,3 +2,4 @@
 phpunit.xml
 composer.lock
 .php_cs.cache
+.phpunit.result.cache

.php_cs

@@ -22,6 +22,7 @@ return PhpCsFixer\Config::create()
         'blank_line_after_opening_tag' => false,
         'phpdoc_to_comment' => false,
         'phpdoc_no_empty_return' => false,
+        'no_superfluous_phpdoc_tags' => false,
         'strict_param' => true,
         'doctrine_annotation_indentation' => true,
         'mb_str_functions' => true,

.travis.yml

@@ -2,8 +2,7 @@ language: php
 sudo: false
 
 php:
-  - 7.1
-  - 7.2
+  - 7.4
 
 before_script:
   - composer self-update

Annotation/FilterAnnotation.php

@@ -18,14 +18,14 @@ final class FilterAnnotation implements Annotation
     private $filter;
 
     /**
-     * @var mixed[] Options
+     * @var array<mixed> Options
      */
     private $options;
 
     /**
      * Constructor
      *
-     * @param mixed[] $parameters Filter parameters
+     * @param array<mixed> $parameters Filter parameters
      */
     public function __construct(array $parameters)
     {
@@ -79,15 +79,15 @@ public function setFilter($filter): FilterAnnotation
     }
 
     /**
-     * @return mixed[]|null
+     * @return array<mixed>|null
      */
     public function getOptions(): ?array
     {
         return $this->options;
     }
 
     /**
-     * @param mixed[]|null $options
+     * @param array<mixed>|null $options
      *
      * @return FilterAnnotation
      */

Form/EventListener/FilterListener.php

@@ -28,7 +28,7 @@ public function __construct(Filter $filterService)
     }
 
     /**
-     * @return string[]
+     * @return array<string>
      */
     public static function getSubscribedEvents(): array
     {

Form/Extension/FormTypeExtension.php

@@ -46,7 +46,7 @@ public function getExtendedType()
     /**
      * {@inheritdoc}
      */
-    public static function getExtendedTypes()
+    public static function getExtendedTypes(): iterable
     {
         return [FormType::class];
     }

Service/Filter.php

@@ -60,8 +60,8 @@ public function filterEntity($object): void
     }
 
     /**
-     * @param string       $class
-     * @param mixed[]|null $options
+     * @param string            $class
+     * @param array<mixed>|null $options
      *
      * @return \Zend\Filter\FilterInterface
      */

Tests/Annotation/FilterTest.php

@@ -38,51 +38,50 @@ public function testAllOptions(): void
 
     /**
      * Test annotation without any option
-     *
-     * @expectedException \LogicException
      */
     public function testAnnotationWithoutOptions(): void
     {
+        $this->expectException(\LogicException::class);
         new FilterAnnotation([]);
     }
 
     /**
      * Test annotation with wrong type for `filter` option
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testWrongTypeForFilterOption(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         new FilterAnnotation(['filter' => 123]);
     }
 
     /**
      * Test annotation with wrong zend filter class for `filter` option
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testWrongFilterClassForFilterOption(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         new FilterAnnotation(['filter' => 'test']);
     }
 
     /**
      * Test annotation with wrong type for `value` option
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testWrongTypeForValueOption(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         new FilterAnnotation(['value' => 123]);
     }
 
     /**
      * Test annotation with wrong type for `options` option
-     *
-     * @expectedException \TypeError
      */
     public function testWrongTypeForOptionsOption(): void
     {
+        $this->expectException(\TypeError::class);
+
         new FilterAnnotation(['filter' => 'StringTrim', 'options' => 123]);
     }
 }

Tests/DependencyInjection/Bukashk0zzzFilterExtensionTest.php

@@ -22,9 +22,9 @@ class Bukashk0zzzFilterExtensionTest extends TestCase
     private $container;
 
     /**
-     * {@inheritdoc}
+     * Setup
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->extension = new Bukashk0zzzFilterExtension();
         $this->container = new ContainerBuilder();

Tests/EventListener/FilterSubscriberTest.php

@@ -8,6 +8,8 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\ORM\Event\LifecycleEventArgs;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -26,7 +28,7 @@ public function testPersist(): void
         $lifeCycleEvent = $this->mockEvent('LifecycleEventArgs');
         $lifeCycleEvent->expects(static::once())->method('getEntity')->willReturn($user);
 
-        /** @var \Doctrine\ORM\Event\LifecycleEventArgs $lifeCycleEvent */
+        /** @var LifecycleEventArgs $lifeCycleEvent */
         $subscriber = new FilterSubscriber($filter);
         $subscriber->prePersist($lifeCycleEvent);
     }
@@ -42,7 +44,7 @@ public function testUpdate(): void
         $lifeCycleEvent = $this->mockEvent('LifecycleEventArgs');
         $lifeCycleEvent->expects(static::once())->method('getEntity')->willReturn($user);
 
-        /** @var \Doctrine\ORM\Event\LifecycleEventArgs $lifeCycleEvent */
+        /** @var LifecycleEventArgs $lifeCycleEvent */
         $subscriber = new FilterSubscriber($filter);
         $subscriber->preUpdate($lifeCycleEvent);
     }
@@ -65,13 +67,13 @@ public function testSubscription(): void
      *
      * @param string $eventType
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
-    private function mockEvent(string $eventType): \PHPUnit_Framework_MockObject_MockObject
+    private function mockEvent(string $eventType): MockObject
     {
         return $this->createPartialMock(
             '\Doctrine\ORM\Event\\'.$eventType,
-            ['getEntityManager', 'getEntity', 'getEntityChangeSet']
+            ['getEntityManager', 'getEntity']
         );
     }
 }

Tests/Form/AbstractFormTypeExtension.php

@@ -19,9 +19,9 @@ abstract class AbstractFormTypeExtension extends TypeTestCase
     protected $autoFilter = true;
 
     /**
-     * {@inheritdoc}
+     * @return array<mixed>
      */
-    protected function getExtensions()
+    protected function getExtensions(): array
     {
         return \array_merge(parent::getExtensions(), [
             new FilterExtension(new Filter(new CachedReader(new AnnotationReader(), new ArrayCache())), $this->autoFilter),

Tests/Form/FormTypeExtensionBadTest.php

@@ -12,11 +12,11 @@ class FormTypeExtensionBadTest extends AbstractFormTypeExtension
 {
     /**
      * Test annotation with wrong zend filter class for `filter` option
-     *
-     * @expectedException \InvalidArgumentException
      */
     public function testWrongFilterClassForFilterOption(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $user = new BadUser();
         $form = $this->factory->create(UserType::class, $user, ['data_class' => BadUser::class]);
         $form->submit([

Tests/Form/FormTypeExtensionWithoutFilterTest.php

@@ -11,9 +11,9 @@
 class FormTypeExtensionWithoutFilterTest extends AbstractFormTypeExtension
 {
     /**
-     * {@inheritdoc}
+     * Setup
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->autoFilter = false;
         parent::setUp();

Tests/Service/FilterTest.php

@@ -19,9 +19,9 @@ class FilterTest extends TestCase
     protected $filter;
 
     /**
-     * {@inheritdoc}
+     * Setup
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->filter = new Filter(new CachedReader(new AnnotationReader(), new ArrayCache()));
     }

composer.json

@@ -17,20 +17,20 @@
         "issues": "https://github.com/bukashk0zzz/FilterBundle/issues"
     },
     "require": {
-        "php": ">=7.1.0",
-        "symfony/dependency-injection": "^3.3|^4.0",
-        "symfony/config": "^3.3|^4.0",
-        "symfony/http-kernel": "^3.3|^4.0",
-        "symfony/form": "^3.3|^4.0",
-        "symfony/yaml": "^3.3|^4.0",
+        "php": ">=7.2.0",
+        "symfony/dependency-injection": "^4.0|^5.0",
+        "symfony/config": "^4.0|^5.0",
+        "symfony/http-kernel": "^4.0|^5.0",
+        "symfony/form": "^4.0|^5.0",
+        "symfony/yaml": "^4.0|^5.0",
         "doctrine/orm": "^2.5",
         "zendframework/zend-filter": "^2.6"
     },
     "require-dev": {
         "escapestudios/symfony2-coding-standard": "^3.0",
-        "slevomat/coding-standard": "^4.0",
+        "slevomat/coding-standard": "^5.0",
         "friendsofphp/php-cs-fixer": "^2.3",
-        "phpunit/phpunit": "^6.2"
+        "phpunit/phpunit": "^8.4"
     },
     "autoload": {
         "psr-4": {

ruleset.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<ruleset name="Bukashk0zzz">
-    <description>Bukashk0zzz coding standard.</description>
+<ruleset name="Coding standard">
+    <description>Coding standard.</description>
 
     <rule ref="./vendor/escapestudios/symfony2-coding-standard/Symfony"/>
     <rule ref="./vendor/slevomat/coding-standard/SlevomatCodingStandard/ruleset.xml" />
@@ -24,21 +24,20 @@
         <exclude name="SlevomatCodingStandard.Commenting.DocCommentSpacing.IncorrectLinesCountBetweenDifferentAnnotationsTypes"/>
         <exclude name="SlevomatCodingStandard.Commenting.RequireOneLinePropertyDocComment.MultiLinePropertyComment"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>
+        <exclude name="SlevomatCodingStandard.ControlStructures.NewWithoutParentheses.UselessParentheses"/>
         <exclude name="SlevomatCodingStandard.ControlStructures.DisallowShortTernaryOperator.DisallowedShortTernaryOperator"/>
         <exclude name="SlevomatCodingStandard.Operators.DisallowIncrementAndDecrementOperators.DisallowedPreIncrementOperator"/>
-        <exclude name="SlevomatCodingStandard.ControlStructures.NewWithoutParentheses.UselessParentheses"/>
-        <exclude name="SlevomatCodingStandard.Classes.TraitUseSpacing.IncorrectLinesCountBeforeFirstUse"/>
         <exclude name="SlevomatCodingStandard.Functions.UnusedParameter.UnusedParameter"/>
+        <exclude name="SlevomatCodingStandard.Classes.TraitUseSpacing.IncorrectLinesCountBeforeFirstUse"/>
+        <exclude name="SlevomatCodingStandard.Classes.EmptyLinesAroundClassBraces.NoEmptyLineAfterOpeningBrace"/>
+        <exclude name="SlevomatCodingStandard.Classes.EmptyLinesAroundClassBraces.NoEmptyLineBeforeClosingBrace"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.DisallowMixedTypeHint.DisallowedMixedTypeHint"/>
+        <exclude name="SlevomatCodingStandard.Classes.SuperfluousTraitNaming.SuperfluousSuffix"/>
+        <exclude name="SlevomatCodingStandard.ControlStructures.UselessTernaryOperator.UselessTernaryOperator"/>
+        <exclude name="SlevomatCodingStandard.Functions.TrailingCommaInCall.MissingTrailingComma"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix"/>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.Types.EmptyLinesAroundTypeBraces">
-        <properties>
-            <property name="linesCountAfterOpeningBrace" value="0"/>
-            <property name="linesCountBeforeClosingBrace" value="0"/>
-        </properties>
-    </rule>
-
     <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly">
         <properties>
             <property name="allowFullyQualifiedExceptions" value="true"/>
@@ -69,10 +68,6 @@
         <severity>0</severity>
     </rule>
 
-    <rule ref="Zend.NamingConventions.ValidVariableName.MemberVarContainsNumbers">
-        <severity>0</severity>
-    </rule>
-
     <arg name="colors"/>
     <arg name="encoding" value="utf-8"/>
     <arg name="extensions" value="php"/>