Update dependencies (#52)

webfactory · Sep 4, 2024 · 60bfdaf · 60bfdaf
1 parent ed0032c
commit 60bfdaf
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 63 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -7,12 +7,12 @@ on:
     pull_request:
 
 env:
-    PHP_VERSION: 8.1
+    PHP_VERSION: 8.3
 
 jobs:
     composer-require-checker:
         name: Check missing composer requirements
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         steps:
             -   uses: actions/checkout@v4
             -   name: Konfiguriere PHP-Version und -Einstellungen im Worker-Node
@@ -35,4 +35,4 @@ jobs:
                     composer require webfactory/http-cache-bundle
                     composer show
             -   name: ComposerRequireChecker
-                uses: docker://ghcr.io/webfactory/composer-require-checker:4.8.0
+                uses: docker://ghcr.io/webfactory/composer-require-checker:4.12.0
diff --git a/.github/workflows/fix-cs-php.yml b/.github/workflows/fix-cs-php.yml
@@ -9,7 +9,7 @@ name: Coding Standards
 jobs:
     open-pr-for-cs-violations:
         name: PHP-CS-Fixer
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         if: github.actor != 'dependabot[bot]'
         steps:
             -   name: Checkout code

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,12 +13,13 @@ env:
 
 jobs:
     PHPUnit:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:
                 include:
                     - { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-lowest }
+                    - { php-version: 8.2, symfony-locked-version: 5.4.*, dependency-version: prefer-stable }
                     - { php-version: 8.2, symfony-locked-version: 6.4.*, dependency-version: prefer-stable }
                     - { php-version: 8.3, symfony-locked-version: none, dependency-version: prefer-stable }
         name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }})

diff --git a/Tests/Config/WfdMetaConfigCacheTest.php b/Tests/Config/WfdMetaConfigCacheTest.php
diff --git a/Tests/Util/CriticalSectionTest.php b/Tests/Util/CriticalSectionTest.php
@@ -2,9 +2,7 @@
 
 namespace Webfactory\Bundle\WfdMetaBundle\Tests\Util;
 
-use Closure;
 use PHPUnit\Framework\TestCase;
-use stdClass;
 use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Lock\Store\FlockStore;
 use Webfactory\Bundle\WfdMetaBundle\Util\CriticalSection;
@@ -48,39 +46,45 @@ public function testExecuteReturnsValueFromCallback()
 
     public function testInvokesCallbacksWithDifferentLocks()
     {
-        $this->criticalSection->execute(__DIR__.'/my/virtual/file1', $this->createCallbackThatMustBeInvoked());
-        $this->criticalSection->execute(__DIR__.'/my/virtual/file2', $this->createCallbackThatMustBeInvoked());
+        $invoked = false;
+
+        $this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
+            $invoked = true;
+        });
+        $this->criticalSection->execute(__DIR__.'/my/virtual/file2', function () use (&$invoked) {
+            $invoked = true;
+        });
+
+        self::assertTrue($invoked);
     }
 
     public function testInvokesCallbackWithSameLock()
     {
-        $this->criticalSection->execute(__DIR__.'/my/virtual/file1', $this->createCallbackThatMustBeInvoked());
-        $this->criticalSection->execute(__DIR__.'/my/virtual/file1', $this->createCallbackThatMustBeInvoked());
+        $invoked = false;
+
+        $this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
+            $invoked = true;
+        });
+        $this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
+            $invoked = true;
+        });
+
+        self::assertTrue($invoked);
     }
 
     /**
      *  This ensures that the critical section is re-entrant as documented.
      */
     public function testCallbackCanAcquireSameLockAgain()
     {
-        $this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () {
-            $this->criticalSection->execute(__DIR__.'/my/virtual/file1', $this->createCallbackThatMustBeInvoked());
-        });
-    }
+        $invoked = false;
 
-    /**
-     * Creates a closure that must be called, otherwise the test fails.
-     *
-     * @return Closure
-     */
-    private function createCallbackThatMustBeInvoked()
-    {
-        $mock = $this->getMockBuilder(stdClass::class)->setMethods(['__invoke'])->getMock();
-        $mock->expects($this->once())
-            ->method('__invoke');
+        $this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
+            $this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
+                $invoked = true;
+            });
+        });
 
-        return function () use ($mock) {
-            \call_user_func($mock);
-        };
+        self::assertTrue($invoked);
     }
 }
diff --git a/composer.json b/composer.json
@@ -16,29 +16,29 @@
 
     "require": {
         "php": ">= 8.1",
-        "doctrine/dbal": "^2.12|^3.0",
-        "doctrine/orm": "^2.0",
-        "doctrine/persistence": "^1.3|^2.1|^3.0",
+        "doctrine/dbal": "^2.13|^3.0",
+        "doctrine/orm": "^2.8|^3.0",
+        "doctrine/persistence": "^2.1|^3.0",
         "psr/container": "^1.0",
-        "psr/log": "^1.0",
-        "symfony/config": "^5.1|^6.0|^7.0",
-        "symfony/service-contracts": "^1.0|^2.0|^3.0",
-        "symfony/dependency-injection": "^5.1|^6.0|^7.0",
-        "symfony/filesystem": "^5.1|^6.0|^7.0",
-        "symfony/finder": "^5.1|^6.0|^7.0",
-        "symfony/http-foundation": "^5.1|^6.0|^7.0",
-        "symfony/http-kernel": "^5.1|^6.0|^7.0",
-        "symfony/lock": "^5.1|^6.0|^7.0",
-        "symfony/twig-bundle": "^5.1|^6.0|^7.0",
-        "twig/twig": "^1.0|^2.0|^3.0"
+        "psr/log": "^1|^2|^3",
+        "symfony/config": "^5.4|^6.4|^7.0",
+        "symfony/service-contracts": "^2.5|^3.0",
+        "symfony/dependency-injection": "^5.4|^6.4|^7.0",
+        "symfony/filesystem": "^5.4|^6.4|^7.0",
+        "symfony/finder": "^5.4|^6.4|^7.0",
+        "symfony/http-foundation": "^5.4|^6.4|^7.0",
+        "symfony/http-kernel": "^5.4|^6.4|^7.0",
+        "symfony/lock": "^5.4|^6.4|^7.0",
+        "symfony/twig-bundle": "^5.4|^6.4|^7.0",
+        "twig/twig": "^2.0|^3.0"
     },
 
     "suggest": {
         "webfactory/http-cache-bundle": "If you want to use wfd_meta information to determine Last-Modified information for requests"
     },
 
     "require-dev": {
-        "phpunit/phpunit": "^9.6.18",
+        "phpunit/phpunit": "^9.6.18|^10.5",
         "symfony/phpunit-bridge": ">=7.0"
     },
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,27 +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/8.5/phpunit.xsd"
-         bootstrap="vendor/autoload.php">
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php">
     <testsuites>
         <testsuite name="Full test suite">
             <directory>Tests</directory>
         </testsuite>
     </testsuites>
-
-    <!-- Filter for code coverage -->
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">.</directory>
-            <exclude>
-                <directory>Resources</directory>
-                <directory>Tests</directory>
-                <directory>vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-    </listeners>
+    <php>
+        <ini name="error_reporting" value="-1" />
+        <server name="SHELL_VERBOSITY" value="-1" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
+    </php>
 </phpunit>