Skip to content

update to latest action version #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 8, 2024
Merged

update to latest action version #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0272e33
Apply codestyle from current config with friendsofphp/php-cs-fixer:v3…
84m Mar 8, 2024
d3a203c
Fix composer lowest build
84m Mar 8, 2024
cbeb56a
update to latest action version
84m Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/qa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP, extensions and composer with shivammathur/setup-php
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP, extensions and composer with shivammathur/setup-php
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"require-dev": {
"symfony/form": "^5.4 || ^6.0 || ^7.0",
"symfony/phpunit-bridge": "^7.0",
"symfony/phpunit-bridge": "^7.0.1",
"twig/twig": "^2.4.4 || ^3.0"
},
"autoload": {
Expand Down
2 changes: 1 addition & 1 deletion src/CacheWarmer/SerializerCacheWarmer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function __construct(array $paths, array $profiles, HTMLPurifiersRegistry
$this->filesystem = $filesystem;
}

public function warmUp($cacheDir, string $buildDir = null): array
public function warmUp($cacheDir, ?string $buildDir = null): array
{
foreach ($this->paths as $path) {
$this->filesystem->remove($path); // clean previous cache
Expand Down
2 changes: 1 addition & 1 deletion src/DependencyInjection/ExerciseHTMLPurifierExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private static function resolveProfileInheritance(string $parent, array $configs
$resolved[$parent]['blank_elements'] = $configs[$parent]['blank_elements'];
}

private static function getResolvedConfig(string $parameter, array $parents, array $definition = null): array
private static function getResolvedConfig(string $parameter, array $parents, ?array $definition = null): array
{
if (null !== $definition) {
return array_filter(array_merge(
Expand Down
2 changes: 1 addition & 1 deletion src/HTMLPurifierConfigFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class HTMLPurifierConfigFactory
public static function create(
string $profile,
array $configArray,
\HTMLPurifier_Config $defaultConfig = null,
?\HTMLPurifier_Config $defaultConfig = null,
array $parents = [],
array $attributes = [],
array $elements = [],
Expand Down