Set minim PHP version to PHP8

- Adapt to new Attribute directory instead of the
  previous Annotation directory from underlying
  strings library (BC break)
- Cover tests with Psalm

.travis.yml

@@ -5,7 +5,6 @@ env:
         - XDEBUG_MODE=coverage
 language: php
 php:
-    - '7.4'
     - '8.0'
 
 before_script:
@@ -18,8 +17,8 @@ before_script:
 
 script:
     - composer phpunit_clover
-    - if [ "${TRAVIS_PHP_VERSION:0:1}" == "8" ]; then composer phpstan; fi
-    - if [ "${TRAVIS_PHP_VERSION:0:1}" == "8" ]; then composer psalm; fi
+    - composer phpstan
+    - composer psalm
     - composer phpcs
     - if [ "$TRAVIS_PULL_REQUEST" == "false" -a "${TRAVIS_PHP_VERSION:0:1}" == "8" ]; then ./cc-test-reporter after-build  -t clover --exit-code $TRAVIS_TEST_RESULT; fi
 

composer.json

@@ -20,9 +20,9 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "symfony/dependency-injection": "^5.0",
-        "squirrelphp/strings": "^0.9.3"
+        "squirrelphp/strings": "^0.10"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.3",

psalm-baseline.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.7.3@38c452ae584467e939d55377aaf83b5a26f19dd1"/>

psalm.xml

@@ -4,11 +4,18 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src" />
+        <directory name="tests" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+
+    <plugins>
+        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
+        <pluginClass class="Psalm\MockeryPlugin\Plugin"/>
+    </plugins>
 </psalm>

ruleset.xml

@@ -37,4 +37,26 @@
         </properties>
     </rule>
     <rule ref="SlevomatCodingStandard.Commenting.EmptyComment"/>
+    <rule ref="SlevomatCodingStandard.Arrays.DisallowImplicitArrayCreation"/>
+    <rule ref="SlevomatCodingStandard.Functions.StrictCall"/>
+    <rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
+    <rule ref="SlevomatCodingStandard.PHP.DisallowReference"/>
+    <rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
+    <rule ref="SlevomatCodingStandard.Variables.DisallowSuperGlobalVariable"/>
+    <rule ref="SlevomatCodingStandard.ControlStructures.NewWithParentheses"/>
+    <rule ref="SlevomatCodingStandard.Functions.DisallowEmptyFunction"/>
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall"/>
+    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat"/>
+    <rule ref="SlevomatCodingStandard.PHP.ShortList"/>
+    <rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
+    <rule ref="SlevomatCodingStandard.Classes.ClassConstantVisibility"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHintSpacing"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.MultipleUsesPerLine"/>
+    <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash"/>
+    <rule ref="SlevomatCodingStandard.Classes.DisallowLateStaticBindingForConstants"/>
+    <rule ref="SlevomatCodingStandard.Classes.UselessLateStaticBinding"/>
 </ruleset>

src/DependencyInjection/Compiler/ExtensionPass.php

@@ -2,8 +2,8 @@
 
 namespace Squirrel\StringsBundle\DependencyInjection\Compiler;
 
-use Squirrel\Strings\Annotation\StringFilterExtension;
-use Squirrel\Strings\Annotation\StringFilterProcessor;
+use Squirrel\Strings\Attribute\StringFilterExtension;
+use Squirrel\Strings\Attribute\StringFilterProcessor;
 use Squirrel\Strings\RandomStringGeneratorSelectInterface;
 use Squirrel\Strings\StringFilterSelectInterface;
 use Squirrel\Strings\Twig\StringExtension;
@@ -22,7 +22,6 @@ class ExtensionPass implements CompilerPassInterface
     public function process(ContainerBuilder $container): void
     {
         $container->setDefinition(StringFilterProcessor::class, new Definition(StringFilterProcessor::class, [
-            new Reference('annotation_reader'),
             new Reference(StringFilterSelectInterface::class),
         ]));
 

src/DependencyInjection/Compiler/RandomStringGeneratorPass.php

@@ -41,7 +41,7 @@ public function process(ContainerBuilder $container): void
 
         // Get all random string generator services and create constructor argument for Selector
         $taggedServicesWithNames = $this->createGeneratorDefinitionList(
-            $container->findTaggedServiceIds('squirrel.strings.random')
+            $container->findTaggedServiceIds('squirrel.strings.random'),
         );
 
         // Add generators to Selector class

src/DependencyInjection/Compiler/StringFilterPass.php

@@ -108,7 +108,7 @@ public function process(ContainerBuilder $container): void
 
         // Get all string filter services and create constructor argument for Selector
         $taggedServicesWithNames = $this->createFilterDefinitionList(
-            $container->findTaggedServiceIds('squirrel.strings.filter')
+            $container->findTaggedServiceIds('squirrel.strings.filter'),
         );
 
         // Add filters to Selector class

tests/ExtensionPassTest.php

@@ -2,8 +2,8 @@
 
 namespace Squirrel\StringsBundle\Tests;
 
-use Squirrel\Strings\Annotation\StringFilterExtension;
-use Squirrel\Strings\Annotation\StringFilterProcessor;
+use Squirrel\Strings\Attribute\StringFilterExtension;
+use Squirrel\Strings\Attribute\StringFilterProcessor;
 use Squirrel\Strings\Filter\TrimFilter;
 use Squirrel\Strings\StringFilterSelectInterface;
 use Squirrel\Strings\Twig\StringExtension;
@@ -15,7 +15,7 @@
 
 class ExtensionPassTest extends \PHPUnit\Framework\TestCase
 {
-    public function testNoFormNoTwig()
+    public function testNoFormNoTwig(): void
     {
         $container = new ContainerBuilder();
 
@@ -32,7 +32,7 @@ public function testNoFormNoTwig()
         $container->compile();
     }
 
-    public function testFormAndTwig()
+    public function testFormAndTwig(): void
     {
         $container = new ContainerBuilder();
 
@@ -54,7 +54,7 @@ public function testFormAndTwig()
         $container->compile();
     }
 
-    protected function processCompilerPass(ContainerBuilder $container)
+    protected function processCompilerPass(ContainerBuilder $container): void
     {
         (new StringFilterPass())->process($container);
         (new RandomStringGeneratorPass())->process($container);

tests/RandomStringGeneratorPassTest.php

@@ -11,7 +11,7 @@
 
 class RandomStringGeneratorPassTest extends \PHPUnit\Framework\TestCase
 {
-    public function testDefault()
+    public function testDefault(): void
     {
         $container = new ContainerBuilder();
 
@@ -34,7 +34,7 @@ public function testDefault()
         $container->compile();
     }
 
-    public function testNoGeneratorName()
+    public function testNoGeneratorName(): void
     {
         $this->expectException(StringException::class);
 
@@ -50,7 +50,7 @@ public function testNoGeneratorName()
         $this->processCompilerPass($container);
     }
 
-    public function testDuplicateGeneratorName()
+    public function testDuplicateGeneratorName(): void
     {
         $this->expectException(StringException::class);
 
@@ -66,7 +66,7 @@ public function testDuplicateGeneratorName()
         $this->processCompilerPass($container);
     }
 
-    protected function processCompilerPass(ContainerBuilder $container)
+    protected function processCompilerPass(ContainerBuilder $container): void
     {
         (new RandomStringGeneratorPass())->process($container);
     }

tests/StringFilterPassTest.php

@@ -13,7 +13,7 @@
 
 class StringFilterPassTest extends \PHPUnit\Framework\TestCase
 {
-    public function testDefault()
+    public function testDefault(): void
     {
         $container = new ContainerBuilder();
 
@@ -36,7 +36,7 @@ public function testDefault()
         $container->compile();
     }
 
-    public function testNoFilterName()
+    public function testNoFilterName(): void
     {
         $this->expectException(StringException::class);
 
@@ -53,7 +53,7 @@ public function testNoFilterName()
         $this->processCompilerPass($container);
     }
 
-    public function testDuplicateFilterName()
+    public function testDuplicateFilterName(): void
     {
         $this->expectException(StringException::class);
 
@@ -70,7 +70,7 @@ public function testDuplicateFilterName()
         $this->processCompilerPass($container);
     }
 
-    protected function processCompilerPass(ContainerBuilder $container)
+    protected function processCompilerPass(ContainerBuilder $container): void
     {
         (new StringFilterPass())->process($container);
     }

tests/StringTesterPassTest.php

@@ -9,7 +9,7 @@
 
 class StringTesterPassTest extends \PHPUnit\Framework\TestCase
 {
-    public function testDefault()
+    public function testDefault(): void
     {
         $container = new ContainerBuilder();
 
@@ -25,7 +25,7 @@ public function testDefault()
         $container->compile();
     }
 
-    protected function processCompilerPass(ContainerBuilder $container)
+    protected function processCompilerPass(ContainerBuilder $container): void
     {
         (new StringTesterPass())->process($container);
     }

vendor-bin/phpcs/composer.json

@@ -1,6 +1,6 @@
 {
     "require": {
         "squizlabs/php_codesniffer": "^3.5",
-        "slevomat/coding-standard": "^6.0"
+        "slevomat/coding-standard": "^7.0"
     }
 }

vendor-bin/psalm/composer.json

@@ -1,5 +1,7 @@
 {
     "require": {
-        "vimeo/psalm": "^4.0"
+        "vimeo/psalm": "^4.0",
+        "psalm/plugin-phpunit": "^0.16",
+        "psalm/plugin-mockery": "^0.7"
     }
 }