Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,21 @@ jobs:
fail-fast: false
matrix:
php: [
7.0,
7.1,
7.2,
7.3,
7.4,
8.0,
8.1
8.1,
8.2,
8.3,
8.4
]
composer: [basic]
timeout-minutes: 10
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@2.9.0
Expand All @@ -44,7 +46,7 @@ jobs:
run: echo "::set-output name=directory::$(composer config cache-dir)"

- name: Cache composer dependencies
uses: actions/cache@v2.1.3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.directory }}
key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down Expand Up @@ -88,7 +90,7 @@ jobs:
uses: codecov/codecov-action@v1
with:
files: build/logs/clover.xml

- name: Archive logs artifacts
if: ${{ failure() }}
uses: actions/upload-artifact@v2
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
],
"require": {
"php": ">=7.0.0",
"php": ">=7.1.0",
"ext-dom": "*",
"ext-libxml": "*",
"ext-simplexml": "*",
Expand All @@ -33,7 +33,7 @@
"voku/portable-utf8": "If you need e.g. UTF-8 fixed output."
},
"require-dev": {
"phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
"phpunit/phpunit": "~7.0 || ~9.0 || ~10.0 || ~11.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/voku/helper/SimpleHtmlAttributes.php
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public function replace(string $old, string $new)
/**
* {@inheritdoc}
*/
public function toggle(string $token, bool $force = null): bool
public function toggle(string $token, ?bool $force = null): bool
{
// init
$this->tokenize();
Expand Down
2 changes: 1 addition & 1 deletion src/voku/helper/SimpleHtmlAttributesInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ public function replace(string $old, string $new);
* @return bool false if the token is not in the list after the call, or true if the token is in the list after the
* call
*/
public function toggle(string $token, bool $force = null): bool;
public function toggle(string $token, ?bool $force = null): bool;
}
2 changes: 1 addition & 1 deletion src/voku/helper/XmlDomParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ public function loadXmlFile(string $filePath, $libXMLExtraOptions = null, $useDe
*
* @return void
*/
public function replaceTextWithCallback($callback, \DOMNode $domNode = null)
public function replaceTextWithCallback($callback, ?\DOMNode $domNode = null)
{
if ($domNode === null) {
$domNode = $this->document;
Expand Down