Skip to content

Commit b626dcc

Browse files
authored
Merge pull request #105 from 84m/actions-update
update to latest action version
2 parents 3a64204 + cbeb56a commit b626dcc

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/qa.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020

2121
- name: Setup PHP, extensions and composer with shivammathur/setup-php
2222
uses: shivammathur/setup-php@v2
@@ -58,7 +58,7 @@ jobs:
5858

5959
steps:
6060
- name: Checkout
61-
uses: actions/checkout@v2
61+
uses: actions/checkout@v4
6262

6363
- name: Setup PHP, extensions and composer with shivammathur/setup-php
6464
uses: shivammathur/setup-php@v2

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"require-dev": {
2222
"symfony/form": "^5.4 || ^6.0 || ^7.0",
23-
"symfony/phpunit-bridge": "^7.0",
23+
"symfony/phpunit-bridge": "^7.0.1",
2424
"twig/twig": "^2.4.4 || ^3.0"
2525
},
2626
"autoload": {

src/CacheWarmer/SerializerCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(array $paths, array $profiles, HTMLPurifiersRegistry
3737
$this->filesystem = $filesystem;
3838
}
3939

40-
public function warmUp($cacheDir, string $buildDir = null): array
40+
public function warmUp($cacheDir, ?string $buildDir = null): array
4141
{
4242
foreach ($this->paths as $path) {
4343
$this->filesystem->remove($path); // clean previous cache

src/DependencyInjection/ExerciseHTMLPurifierExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private static function resolveProfileInheritance(string $parent, array $configs
113113
$resolved[$parent]['blank_elements'] = $configs[$parent]['blank_elements'];
114114
}
115115

116-
private static function getResolvedConfig(string $parameter, array $parents, array $definition = null): array
116+
private static function getResolvedConfig(string $parameter, array $parents, ?array $definition = null): array
117117
{
118118
if (null !== $definition) {
119119
return array_filter(array_merge(

src/HTMLPurifierConfigFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class HTMLPurifierConfigFactory
2424
public static function create(
2525
string $profile,
2626
array $configArray,
27-
\HTMLPurifier_Config $defaultConfig = null,
27+
?\HTMLPurifier_Config $defaultConfig = null,
2828
array $parents = [],
2929
array $attributes = [],
3030
array $elements = [],

0 commit comments

Comments
 (0)