Skip to content

Commit b03a7bc

Browse files
authored
Add PHP 8.5 to test matrices (php-tuf#401)
1 parent 69aa338 commit b03a7bc

6 files changed

Lines changed: 5 additions & 9 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
max-parallel: 10
2323
matrix:
2424
operating-system: [ubuntu-latest, macos-latest, windows-latest]
25-
php: ['8.1', '8.2', '8.3', '8.4']
25+
php: ['8.1', '8.2', '8.3', '8.4', '8.5']
2626
experimental: [false]
2727
include:
2828
- operating-system: ubuntu-latest

.github/workflows/drupal.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,17 @@ jobs:
1717
fail-fast: false
1818
max-parallel: 10
1919
matrix:
20-
php: ['8.1', '8.2', '8.3', '8.4']
20+
php: ['8.1', '8.2', '8.3', '8.4', '8.5']
2121
template:
2222
- recommended-project
2323
- legacy-project
2424
core: [10, 11]
25-
# Drupal 11's minimum PHP version is 8.3.
2625
exclude:
26+
# Drupal 11's minimum PHP version is 8.3.
2727
- { core: 11, php: 8.1 }
2828
- { core: 11, php: 8.2 }
29+
# Drupal 10's maximum PHP version is 8.4.
30+
- { core: 10, php: 8.5 }
2931

3032
steps:
3133
- name: Checkout code

tests/ClientTestBase.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,9 @@ protected function getUpdater(string $updaterClass = Updater::class): Updater
9494
// we control what time it is.
9595
$reflector = new \ReflectionObject($updater);
9696
$property = $reflector->getProperty('clock');
97-
$property->setAccessible(true);
9897
$property->setValue($updater, new TestClock());
9998

10099
$property = $reflector->getProperty('server');
101-
$property->setAccessible(true);
102100
$property->setValue($updater, $this->serverMetadata);
103101

104102
return $updater;

tests/SignatureVerifierTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public function testCreateFromRootMetadata(): void
3232

3333
$verifier = SignatureVerifier::createFromRootMetadata($rootMetadata);
3434
$verifierKeys = new \ReflectionProperty($verifier, 'keys');
35-
$verifierKeys->setAccessible(true);
3635
$verifierKeys = $verifierKeys->getValue($verifier);
3736

3837
// All of the root metadata keys should be loaded into the verifier.

tests/Unit/Client/VerifierTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ public function testCheckFreezeAttackNoAttack(): void
184184
$now = \DateTimeImmutable::createFromFormat($dateFormat, $nowString);
185185

186186
$method = new \ReflectionMethod(VerifierBase::class, 'checkFreezeAttack');
187-
$method->setAccessible(true);
188187

189188
// The update's expiration is later than now, so no freeze attack
190189
// exception should be thrown.
@@ -223,7 +222,6 @@ public function testCheckFreezeAttackAttack(): void
223222
$now = \DateTimeImmutable::createFromFormat($dateFormat, '1970-01-01T00:00:01Z');
224223

225224
$method = new \ReflectionMethod(VerifierBase::class, 'checkFreezeAttack');
226-
$method->setAccessible(true);
227225

228226
// The update has already expired, so a freeze attack exception should
229227
// be thrown.

tests/Unit/FileStorageTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ public function testFileNamesAreUrlEncoded(): void
165165
$this->assertFileExists($dir . '/' . $expectedFileName);
166166

167167
$method = new \ReflectionMethod($storage, 'read');
168-
$method->setAccessible(true);
169168
$this->assertSame($fileContents, $method->invoke($storage, $roleName));
170169
}
171170
}

0 commit comments

Comments
 (0)