Update build tools

nucleos · Apr 26, 2023 · 80d6f1c · 80d6f1c
1 parent 14e5292
commit 80d6f1c
Show file tree

Hide file tree

Showing 9 changed files with 668 additions and 716 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
 .php-cs-fixer.cache
 .php-cs-fixer.php
-.phpunit.result.cache
 coverage
 composer.lock
 phpunit.xml
+/.phpunit.cache/
 /build/
 /vendor/
 !/vendor-bin/tools/composer.lock

diff --git a/composer.json b/composer.json
@@ -38,22 +38,22 @@
         "php": "^8.1",
         "ext-pcre": "*",
         "sonata-project/datagrid-bundle": "^2.3 || ^3.0",
-        "symfony/routing": "^5.4 || ^6.0",
+        "symfony/routing": "^5.4 || ^6.2",
         "symfony/translation-contracts": "^1.1 || ^2.0 || ^3.0",
         "twig/twig": "^2.4 || ^3.0"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.5.1",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/expression-language": "^5.4 || ^6.0",
+        "symfony/browser-kit": "^5.4 || ^6.2",
+        "symfony/config": "^5.4 || ^6.2",
+        "symfony/dependency-injection": "^5.4 || ^6.2",
+        "symfony/expression-language": "^5.4 || ^6.2",
         "symfony/framework-bundle": "^5.4.19 || ^6.2.5",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0",
+        "symfony/http-kernel": "^5.4 || ^6.2",
+        "symfony/intl": "^5.4 || ^6.2",
         "symfony/polyfill-intl-icu": "^1.13",
-        "symfony/twig-bridge": "^5.4 || ^6.0",
-        "symfony/twig-bundle": "^5.4 || ^6.0"
+        "symfony/twig-bridge": "^5.4 || ^6.2",
+        "symfony/twig-bundle": "^5.4 || ^6.2"
     },
     "conflict": {
         "symfony/framework-bundle": "<5.4"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">./src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage/>
   <php>
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
   </php>
@@ -13,7 +9,9 @@
       <directory>./tests/</directory>
     </testsuite>
   </testsuites>
-  <listeners>
-    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-  </listeners>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Twig/Extension/RouterTwigExtensionTest.php b/tests/Twig/Extension/RouterTwigExtensionTest.php
@@ -142,7 +142,7 @@ public function testSplitTag(string $input, string $tag, array $output): void
         static::assertSame($output, $this->extension->splitTag($input, $tag));
     }
 
-    public function getSplitList(): iterable
+    public static function getSplitList(): iterable
     {
         return [
             ['<h1>Foo</h1><p>Bar</p><h1>Baz</h1>Bar', 'h1', ['<h1>Foo</h1><p>Bar</p>', '<h1>Baz</h1>Bar']],

diff --git a/tests/Twig/Extension/StringTwigExtensionTest.php b/tests/Twig/Extension/StringTwigExtensionTest.php
@@ -70,7 +70,7 @@ public function testFormatBytesBase2(string $expected, $bits): void
     /**
      * @return int[][]|string[][]
      */
-    public function getBase10(): iterable
+    public static function getBase10(): iterable
     {
         return [
             ['500,0 B', 500],
@@ -88,7 +88,7 @@ public function getBase10(): iterable
     /**
      * @return int[][]|string[][]
      */
-    public function getBase2(): iterable
+    public static function getBase2(): iterable
     {
         return [
             ['512,0 B', 512],

diff --git a/tests/Twig/Extension/UrlAutoConverterTwigExtensionTest.php b/tests/Twig/Extension/UrlAutoConverterTwigExtensionTest.php
@@ -68,7 +68,7 @@ public function testConvertLinksWithOptions(string $input, string $output): void
         static::assertSame($output, $extension->convertLinks($input, ['target' => '_blank']));
     }
 
-    public function getLinkText(): iterable
+    public static function getLinkText(): iterable
     {
         // @noinspection JSUnusedLocalSymbols
         return [
@@ -102,7 +102,7 @@ public function getLinkText(): iterable
     /**
      * @return string[][]
      */
-    public function getLinkTargetText(): iterable
+    public static function getLinkTargetText(): iterable
     {
         // @noinspection JSUnusedLocalSymbols
         return [
@@ -124,7 +124,7 @@ public function getLinkTargetText(): iterable
     /**
      * @return string[][]
      */
-    public function getMailText(): iterable
+    public static function getMailText(): iterable
     {
         // @noinspection JSUnusedLocalSymbols
         return [

diff --git a/tests/Util/StringUtilsTest.php b/tests/Util/StringUtilsTest.php
@@ -24,7 +24,7 @@ public function testObfuscate(string $input, int $start, int $end, string $repla
         static::assertSame($output, StringUtils::obfuscate($input, $start, $end, $replacement));
     }
 
-    public function getObfuscatedStrings(): iterable
+    public static function getObfuscatedStrings(): iterable
     {
         return [
             ['Foo Bar Baz', 'start' => -3, 'end' => 1, 'replacement' => ' ', 'Foo Bar   z'],

diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -3,20 +3,20 @@
     "description": "Development tools that do not conflict the project dependencies",
     "type": "project",
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.3",
-        "maglnet/composer-require-checker": "^4.0",
+        "friendsofphp/php-cs-fixer": "^3.16",
+        "maglnet/composer-require-checker": "^4.6",
         "matthiasnoback/symfony-dependency-injection-test": "^4.3",
-        "phpmd/phpmd": "^2.10",
-        "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-strict-rules": "^1.0",
-        "phpstan/phpstan-symfony": "^1.0",
-        "phpunit/phpunit": "^9.5",
-        "psalm/plugin-phpunit": "^0.18",
-        "psalm/plugin-symfony": "^5.0",
-        "symfony/phpunit-bridge": "^6.0",
-        "vimeo/psalm": "^5.0"
+        "phpmd/phpmd": "^2.13",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "^1.10.14",
+        "phpstan/phpstan-phpunit": "^1.3.11",
+        "phpstan/phpstan-strict-rules": "^1.5.1",
+        "phpstan/phpstan-symfony": "^1.3.1",
+        "phpunit/phpunit": "^10.1.2",
+        "psalm/plugin-phpunit": "^0.18.4",
+        "psalm/plugin-symfony": "^5.0.3",
+        "symfony/phpunit-bridge": "^6.2.7",
+        "vimeo/psalm": "^5.9"
     },
     "config": {
         "allow-plugins": {