Make library PHP 7.4+ only

- Use new functionality as far as possible
- Improve project configuration

Author: iquito

.gitattributes

@@ -1,16 +1,15 @@
 /tests              export-ignore
 /examples           export-ignore
+/docker             export-ignore
+/vendor-bin         export-ignore
+/.editorconfig      export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
-/phpunit.xml.dist   export-ignore
-/phpcs.xml.dist     export-ignore
-/captainhook.json   export-ignore
 /.travis.yml        export-ignore
-/ruleset.xml        export-ignore
-/.editorconfig      export-ignore
+/captainhook.json   export-ignore
 /phpstan.neon       export-ignore
-/phpstan_base.neon  export-ignore
 /phpstan-baseline.neon export-ignore
+/phpunit.xml.dist   export-ignore
 /psalm.xml          export-ignore
 /psalm-baseline.xml export-ignore
-/vendor-bin         export-ignore
+/ruleset.xml        export-ignore

.gitignore

@@ -2,7 +2,9 @@
 /composer.lock
 /vendor
 /vendor-bin/**/vendor
-/.phpunit*
+/vendor-bin/**/composer.lock
+/.phpunit.result.cache
+/.phpcs-cache
 /tests/_output
 /tests/_reports
 /build

.travis.yml

@@ -4,13 +4,12 @@ env:
         - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
 language: php
 php:
-    - '7.2'
-    - '7.3'
     - '7.4'
 
 before_script:
     - composer self-update
-    - composer install --prefer-source --no-interaction --dev
+    - composer install --prefer-source --no-interaction
+    - composer bin all install
     - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
     - chmod +x ./cc-test-reporter
     - ./cc-test-reporter before-build

README.md

@@ -1,7 +1,7 @@
 Squirrel Strings Integration for Symfony
 ========================================
 
-[![Build Status](https://img.shields.io/travis/com/squirrelphp/strings-bundle.svg)](https://travis-ci.com/squirrelphp/strings-bundle) [![Test Coverage](https://api.codeclimate.com/v1/badges/f6e0f7b91f266787ce0c/test_coverage)](https://codeclimate.com/github/squirrelphp/strings-bundle/test_coverage) ![PHPStan](https://img.shields.io/badge/style-level%207-success.svg?style=flat-round&label=phpstan) [![Packagist Version](https://img.shields.io/packagist/v/squirrelphp/strings-bundle.svg?style=flat-round)](https://packagist.org/packages/squirrelphp/strings-bundle)  [![PHP Version](https://img.shields.io/packagist/php-v/squirrelphp/strings-bundle.svg)](https://packagist.org/packages/squirrelphp/strings-bundle) [![Software License](https://img.shields.io/badge/license-MIT-success.svg?style=flat-round)](LICENSE)
+[![Build Status](https://img.shields.io/travis/com/squirrelphp/strings-bundle.svg)](https://travis-ci.com/squirrelphp/strings-bundle) [![Test Coverage](https://api.codeclimate.com/v1/badges/f6e0f7b91f266787ce0c/test_coverage)](https://codeclimate.com/github/squirrelphp/strings-bundle/test_coverage) ![PHPStan](https://img.shields.io/badge/style-level%208-success.svg?style=flat-round&label=phpstan) [![Packagist Version](https://img.shields.io/packagist/v/squirrelphp/strings-bundle.svg?style=flat-round)](https://packagist.org/packages/squirrelphp/strings-bundle)  [![PHP Version](https://img.shields.io/packagist/php-v/squirrelphp/strings-bundle.svg)](https://packagist.org/packages/squirrelphp/strings-bundle) [![Software License](https://img.shields.io/badge/license-MIT-success.svg?style=flat-round)](LICENSE)
 
 Integration of [squirrelphp/strings](https://github.com/squirrelphp/strings) into Symfony through service tags and bundle configuration.
 
@@ -66,7 +66,7 @@ function (\Squirrel\Strings\StringFilterSelectInterface $selector) {
 
     $string = $selector->getFilter('ReplaceNewlinesWithSpaces')
         ->filter($string);
-        
+
     // Outputs "hello  thanks a lot! bye"
     echo $string;
 }
@@ -89,7 +89,7 @@ class NewsletterChangeAction
      * @StringFilter({"StreamlineInputNoNewlines","RemoveHTMLTags"})
      */
     public $firstName = '';
-    
+
     /**
      * @StringFilter("RemoveNonAlphanumeric")
      */
@@ -98,7 +98,7 @@ class NewsletterChangeAction
 ```
 
 You can run one or more string filters and use any of the default list of filters or any of [your own filters which you added](#adding-new-filters). The filters are run as an early PRE_SUBMIT form event.
-    
+
 #### Adding new filters
 
 Create a class, implement `Squirrel\Strings\StringFilterInterface` and tag the service with `squirrel.strings.filter` in a Symfony config file like this:
@@ -142,7 +142,7 @@ services:
             - '6789'
         tags:
             - { name: squirrel.strings.random, generator: MyGenerator }
-                
+
     MyOtherCustomRandomGenerator:
         class: Squirrel\Strings\Random\GeneratorUnicode
         arguments:

composer.json

@@ -20,16 +20,16 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "symfony/dependency-injection": "^4.0|^5.0",
+        "php": "^7.4",
+        "symfony/dependency-injection": "^5.0",
         "squirrelphp/strings": "^0.8.2"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.3",
-        "captainhook/plugin-composer": "^4.0|^5.0",
+        "captainhook/plugin-composer": "^5.0",
         "doctrine/annotations": "^1.5",
-        "symfony/form": "^4.0|^5.0",
-        "symfony/twig-bundle": "^4.0|^5.0"
+        "symfony/form": "^5.0",
+        "symfony/twig-bundle": "^5.0"
     },
     "suggest": {
         "squirrelphp/strings-bundle": "Symfony integration of squirrelphp/strings"
@@ -48,17 +48,17 @@
         }
     },
     "scripts": {
-        "post-install-cmd": ["@composer bin all install --ansi"],
-        "post-update-cmd": ["@composer bin all update --ansi"],
         "phpstan": "vendor/bin/phpstan analyse",
-        "phpstan_base": "vendor/bin/phpstan analyse --configuration phpstan_base.neon --error-format baselineNeon > phpstan-baseline.neon",
-        "psalm": "vendor/bin/psalm --show-info=false",
+        "phpstan_base": "vendor/bin/phpstan analyse --generate-baseline",
+        "phpstan_clear": "vendor/bin/phpstan clear-result-cache",
+        "psalm": "vendor/bin/psalm --show-info=false --diff",
+        "psalm_full": "vendor/bin/psalm --show-info=false",
         "psalm_base": "vendor/bin/psalm --set-baseline=psalm-baseline.xml",
         "phpunit": "vendor/bin/phpunit --colors=always",
         "phpunit_clover": "vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml",
-        "phpcs": "vendor/bin/phpcs --standard=ruleset.xml --extensions=php --cache src tests",
-        "phpcsfix": "vendor/bin/phpcbf --standard=ruleset.xml --extensions=php --cache src tests",
         "codecoverage": "vendor/bin/phpunit --coverage-html tests/_reports",
+        "phpcs": "vendor/bin/phpcs --standard=ruleset.xml --extensions=php --cache=.phpcs-cache --colors src tests",
+        "phpcsfix": "vendor/bin/phpcbf --standard=ruleset.xml --extensions=php --cache=.phpcs-cache src tests",
         "binupdate": "@composer bin all update --ansi",
         "bininstall": "@composer bin all install --ansi"
     }

phpstan_base.neon

@@ -2,7 +2,7 @@
 
 <phpunit
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.3/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"

phpunit.xml.dist

@@ -1,13 +1,12 @@
 <?xml version="1.0"?>
 <ruleset name="IQ">
-    <description>PSR2 with some additional useful sniffs</description>
+    <description>PSR12 with some additional useful sniffs</description>
 
-    <!-- Include the whole PSR-2 standard except for line length -->
-    <rule ref="PSR2">
+    <!-- Include the whole PSR-12 standard except for line length -->
+    <rule ref="PSR12">
         <exclude name="Generic.Files.LineLength"/>
     </rule>
 
-
     <config name="installed_paths" value="../../slevomat/coding-standard"/>
 
     <rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>

ruleset.xml

@@ -19,9 +19,9 @@
 class RandomStringGeneratorPass implements CompilerPassInterface
 {
     /**
-     * @var array
+     * @var array<string, string> $defaultGenerators
      */
-    private $defaultGenerators = [
+    private array $defaultGenerators = [
         '62Characters' => "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
         '36Characters' => "abcdefghijklmnopqrstuvwxyz0123456789",
         'ReadfriendlyUppercase' => "234579ACDEFGHKMNPQRSTUVWXYZ",

src/DependencyInjection/Compiler/RandomStringGeneratorPass.php

@@ -49,10 +49,7 @@
  */
 class StringFilterPass implements CompilerPassInterface
 {
-    /**
-     * @var array
-     */
-    private $defaultFilters = [
+    private array $defaultFilters = [
         CamelCaseToSnakeCaseFilter::class,
         DecodeAllHTMLEntitiesFilter::class,
         DecodeBasicHTMLEntitiesFilter::class,