Bump all dependencies (#15)

derrabus · Mar 20, 2023 · f262a05 · f262a05
1 parent bd19913
commit f262a05
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 /.php-cs-fixer.php
 /.php-cs-fixer.cache
-/.phpunit.result.cache
+/.phpunit.cache
 /composer.lock
 /tests/temp
 /vendor
diff --git a/composer.json b/composer.json
@@ -12,19 +12,18 @@
     "require": {
         "php": ">= 8.1",
         "composer-runtime-api": "^2.1",
-        "fortawesome/font-awesome": "^6.1",
-        "symfony/dependency-injection": "^6",
-        "symfony/http-kernel": "^6",
-        "twig/twig": "^3.3.3"
+        "fortawesome/font-awesome": "^6.3",
+        "symfony/dependency-injection": "^6.2",
+        "symfony/http-kernel": "^6.2",
+        "twig/twig": "^3.5"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.12",
-        "phpstan/phpstan": "^1.8.10",
-        "phpunit/phpunit": "^9.5.25",
-        "symfony/filesystem": "^6",
-        "symfony/framework-bundle": "^6",
-        "symfony/phpunit-bridge": "^6.1",
-        "symfony/twig-bundle": "^6"
+        "friendsofphp/php-cs-fixer": "^3.15.1",
+        "phpstan/phpstan": "^1.10.7",
+        "phpunit/phpunit": "^10.0.16",
+        "symfony/filesystem": "^6.2",
+        "symfony/framework-bundle": "^6.2",
+        "symfony/twig-bundle": "^6.2"
     },
     "config": {
         "sort-packages": true

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
          failOnRisky="true"
          failOnWarning="true"
->
+         cacheDirectory=".phpunit.cache">
     <php>
         <ini name="error_reporting" value="-1" />
     </php>
@@ -18,7 +18,4 @@
         </testsuite>
     </testsuites>
 
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
 </phpunit>
diff --git a/src/IconLocator.php b/src/IconLocator.php
@@ -7,8 +7,6 @@
 use Rabus\TwigAwesomeBundle\Exception\InvalidArgumentException;
 use Rabus\TwigAwesomeBundle\Exception\RuntimeException;
 
-use const DIRECTORY_SEPARATOR;
-
 final class IconLocator
 {
     public function __construct(
@@ -18,7 +16,7 @@ public function __construct(
 
     public function getSvg(string $collection, string $id): string
     {
-        $fileName = implode(DIRECTORY_SEPARATOR, [
+        $fileName = implode(\DIRECTORY_SEPARATOR, [
             $this->fontAwesomePath,
              'svgs',
             $collection,

diff --git a/tests/TwigAwesomeTest.php b/tests/TwigAwesomeTest.php
@@ -48,7 +48,11 @@ public function registerBundles(): iterable
             public function registerContainerConfiguration(LoaderInterface $loader): void
             {
                 $loader->load(static function (ContainerBuilder $container): void {
-                    $container->loadFromExtension('framework', ['secret' => 'foo', 'http_method_override' => false]);
+                    $container->loadFromExtension('framework', [
+                        'secret' => 'foo',
+                        'http_method_override' => false,
+                        'annotations' => ['enabled' => false],
+                    ]);
 
                     $twigConfig = [
                         'default_path' => __DIR__.'/fixtures',

diff --git a/tests/fixtures/flag.html b/tests/fixtures/flag.html
@@ -7,6 +7,6 @@
     </style>
 </head>
 <body>
-<div class="icons"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">%A<path d="M476.3 0c-6.365 0-13.01 1.35-19.34 4.233c-45.69 20.86-79.56 27.94-107.8 27.94c-59.96 0-94.81-31.86-163.9-31.87c-34.63 0-77.87 8.003-137.2 32.05V24C48 10.75 37.25 0 24 0S0 10.75 0 24v464C0 501.3 10.75 512 24 512s24-10.75 24-24v-104c53.59-23.86 96.02-31.81 132.8-31.81c73.63 0 124.9 31.78 198.6 31.78c31.91 0 68.02-5.971 111.1-23.09C504.1 355.9 512 344.4 512 332.1V30.73C512 11.1 495.3 0 476.3 0zM464 319.8c-30.31 10.82-58.08 16.1-84.6 16.1c-30.8 0-58.31-7-87.44-14.41c-32.01-8.141-68.29-17.37-111.1-17.37c-42.35 0-85.99 9.09-132.8 27.73V84.14l18.03-7.301c47.39-19.2 86.38-28.54 119.2-28.54c28.24 .0039 49.12 6.711 73.31 14.48c25.38 8.148 54.13 17.39 90.58 17.39c35.43 0 72.24-8.496 114.9-26.61V319.8z"/></svg></div>
+<div class="icons"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">%A<path d="M48 24C48 10.7 37.3 0 24 0S0 10.7 0 24V64 350.5 400v88c0 13.3 10.7 24 24 24s24-10.7 24-24V388l80.3-20.1c41.1-10.3 84.6-5.5 122.5 13.4c44.2 22.1 95.5 24.8 141.7 7.4l34.7-13c12.5-4.7 20.8-16.6 20.8-30V66.1c0-23-24.2-38-44.8-27.7l-9.6 4.8c-46.3 23.2-100.8 23.2-147.1 0c-35.1-17.6-75.4-22-113.5-12.5L48 52V24zm0 77.5l96.6-24.2c27-6.7 55.5-3.6 80.4 8.8c54.9 27.4 118.7 29.7 175 6.8V334.7l-24.4 9.1c-33.7 12.6-71.2 10.7-103.4-5.4c-48.2-24.1-103.3-30.1-155.6-17.1L48 338.5v-237z"/></svg></div>
 </body>
 </html>