Skip to content

Commit 60bfdaf

Browse files
mpdudempdude
authored
Update dependencies (#52)
1 parent ed0032c commit 60bfdaf

7 files changed

+54
-63
lines changed

‎.github/workflows/dependencies.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ on:
77
pull_request:
88

99
env:
10-
PHP_VERSION: 8.1
10+
PHP_VERSION: 8.3
1111

1212
jobs:
1313
composer-require-checker:
1414
name: Check missing composer requirements
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
1818
- name: Konfiguriere PHP-Version und -Einstellungen im Worker-Node
@@ -35,4 +35,4 @@ jobs:
3535
composer require webfactory/http-cache-bundle
3636
composer show
3737
- name: ComposerRequireChecker
38-
uses: docker://ghcr.io/webfactory/composer-require-checker:4.8.0
38+
uses: docker://ghcr.io/webfactory/composer-require-checker:4.12.0

‎.github/workflows/fix-cs-php.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name: Coding Standards
99
jobs:
1010
open-pr-for-cs-violations:
1111
name: PHP-CS-Fixer
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-latest
1313
if: github.actor != 'dependabot[bot]'
1414
steps:
1515
- name: Checkout code

‎.github/workflows/tests.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ env:
1313

1414
jobs:
1515
PHPUnit:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-latest
1717
strategy:
1818
fail-fast: false
1919
matrix:
2020
include:
2121
- { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-lowest }
22+
- { php-version: 8.2, symfony-locked-version: 5.4.*, dependency-version: prefer-stable }
2223
- { php-version: 8.2, symfony-locked-version: 6.4.*, dependency-version: prefer-stable }
2324
- { php-version: 8.3, symfony-locked-version: none, dependency-version: prefer-stable }
2425
name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }})

‎Tests/Config/WfdMetaConfigCacheTest.php

Whitespace-only changes.

‎Tests/Util/CriticalSectionTest.php

+27-23
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
namespace Webfactory\Bundle\WfdMetaBundle\Tests\Util;
44

5-
use Closure;
65
use PHPUnit\Framework\TestCase;
7-
use stdClass;
86
use Symfony\Component\Lock\LockFactory;
97
use Symfony\Component\Lock\Store\FlockStore;
108
use Webfactory\Bundle\WfdMetaBundle\Util\CriticalSection;
@@ -48,39 +46,45 @@ public function testExecuteReturnsValueFromCallback()
4846

4947
public function testInvokesCallbacksWithDifferentLocks()
5048
{
51-
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', $this->createCallbackThatMustBeInvoked());
52-
$this->criticalSection->execute(__DIR__.'/my/virtual/file2', $this->createCallbackThatMustBeInvoked());
49+
$invoked = false;
50+
51+
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
52+
$invoked = true;
53+
});
54+
$this->criticalSection->execute(__DIR__.'/my/virtual/file2', function () use (&$invoked) {
55+
$invoked = true;
56+
});
57+
58+
self::assertTrue($invoked);
5359
}
5460

5561
public function testInvokesCallbackWithSameLock()
5662
{
57-
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', $this->createCallbackThatMustBeInvoked());
58-
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', $this->createCallbackThatMustBeInvoked());
63+
$invoked = false;
64+
65+
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
66+
$invoked = true;
67+
});
68+
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
69+
$invoked = true;
70+
});
71+
72+
self::assertTrue($invoked);
5973
}
6074

6175
/**
6276
* This ensures that the critical section is re-entrant as documented.
6377
*/
6478
public function testCallbackCanAcquireSameLockAgain()
6579
{
66-
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () {
67-
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', $this->createCallbackThatMustBeInvoked());
68-
});
69-
}
80+
$invoked = false;
7081

71-
/**
72-
* Creates a closure that must be called, otherwise the test fails.
73-
*
74-
* @return Closure
75-
*/
76-
private function createCallbackThatMustBeInvoked()
77-
{
78-
$mock = $this->getMockBuilder(stdClass::class)->setMethods(['__invoke'])->getMock();
79-
$mock->expects($this->once())
80-
->method('__invoke');
82+
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
83+
$this->criticalSection->execute(__DIR__.'/my/virtual/file1', function () use (&$invoked) {
84+
$invoked = true;
85+
});
86+
});
8187

82-
return function () use ($mock) {
83-
\call_user_func($mock);
84-
};
88+
self::assertTrue($invoked);
8589
}
8690
}

‎composer.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@
1616

1717
"require": {
1818
"php": ">= 8.1",
19-
"doctrine/dbal": "^2.12|^3.0",
20-
"doctrine/orm": "^2.0",
21-
"doctrine/persistence": "^1.3|^2.1|^3.0",
19+
"doctrine/dbal": "^2.13|^3.0",
20+
"doctrine/orm": "^2.8|^3.0",
21+
"doctrine/persistence": "^2.1|^3.0",
2222
"psr/container": "^1.0",
23-
"psr/log": "^1.0",
24-
"symfony/config": "^5.1|^6.0|^7.0",
25-
"symfony/service-contracts": "^1.0|^2.0|^3.0",
26-
"symfony/dependency-injection": "^5.1|^6.0|^7.0",
27-
"symfony/filesystem": "^5.1|^6.0|^7.0",
28-
"symfony/finder": "^5.1|^6.0|^7.0",
29-
"symfony/http-foundation": "^5.1|^6.0|^7.0",
30-
"symfony/http-kernel": "^5.1|^6.0|^7.0",
31-
"symfony/lock": "^5.1|^6.0|^7.0",
32-
"symfony/twig-bundle": "^5.1|^6.0|^7.0",
33-
"twig/twig": "^1.0|^2.0|^3.0"
23+
"psr/log": "^1|^2|^3",
24+
"symfony/config": "^5.4|^6.4|^7.0",
25+
"symfony/service-contracts": "^2.5|^3.0",
26+
"symfony/dependency-injection": "^5.4|^6.4|^7.0",
27+
"symfony/filesystem": "^5.4|^6.4|^7.0",
28+
"symfony/finder": "^5.4|^6.4|^7.0",
29+
"symfony/http-foundation": "^5.4|^6.4|^7.0",
30+
"symfony/http-kernel": "^5.4|^6.4|^7.0",
31+
"symfony/lock": "^5.4|^6.4|^7.0",
32+
"symfony/twig-bundle": "^5.4|^6.4|^7.0",
33+
"twig/twig": "^2.0|^3.0"
3434
},
3535

3636
"suggest": {
3737
"webfactory/http-cache-bundle": "If you want to use wfd_meta information to determine Last-Modified information for requests"
3838
},
3939

4040
"require-dev": {
41-
"phpunit/phpunit": "^9.6.18",
41+
"phpunit/phpunit": "^9.6.18|^10.5",
4242
"symfony/phpunit-bridge": ">=7.0"
4343
},
4444

‎phpunit.xml.dist

+6-20
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.5/phpunit.xsd"
4-
bootstrap="vendor/autoload.php">
5-
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php">
63
<testsuites>
74
<testsuite name="Full test suite">
85
<directory>Tests</directory>
96
</testsuite>
107
</testsuites>
11-
12-
<!-- Filter for code coverage -->
13-
<filter>
14-
<whitelist processUncoveredFilesFromWhitelist="true">
15-
<directory suffix=".php">.</directory>
16-
<exclude>
17-
<directory>Resources</directory>
18-
<directory>Tests</directory>
19-
<directory>vendor</directory>
20-
</exclude>
21-
</whitelist>
22-
</filter>
23-
24-
<listeners>
25-
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
26-
</listeners>
8+
<php>
9+
<ini name="error_reporting" value="-1" />
10+
<server name="SHELL_VERBOSITY" value="-1" />
11+
<env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
12+
</php>
2713
</phpunit>

0 commit comments

Comments
 (0)