Skip to content

Commit

Permalink
build(deps-dev): update vimeo/psalm requirement from 4.3.2 to 4.4.1 (#…
Browse files Browse the repository at this point in the history
…4327)

Co-authored-by: Markus Staab <120441+staabm@users.noreply.github.com>
Co-authored-by: Gregor Harlan <330436+gharlan@users.noreply.github.com>
  • Loading branch information
3 people committed Jan 17, 2021
1 parent e032491 commit 5bcdb31
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .tools/psalm/baseline-taint.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.3.2@57b53ff26237074fdf5cbcb034f7da5172be4524">
<files psalm-version="4.4.1@9fd7a7d885b3a216cff8dec9d8c21a132f275224">
<file src="redaxo/src/addons/structure/plugins/history/fragments/history/layer.php">
<TaintedHtml occurrences="56">
<code>$this-&gt;getVar('content1iframe')</code>
Expand Down
2 changes: 1 addition & 1 deletion .tools/psalm/baseline.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<files psalm-version="4.3.2@57b53ff26237074fdf5cbcb034f7da5172be4524">
<files psalm-version="4.4.1@9fd7a7d885b3a216cff8dec9d8c21a132f275224">
<file src="redaxo/src/addons/backup/pages/export.php">
<NullOperand occurrences="1">
<code>rex_escape($exportfilename)</code>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"phpunit/phpunit": "^9.3",
"psalm/plugin-phpunit": "0.15.0",
"psalm/plugin-symfony": "2.1.1",
"vimeo/psalm": "4.3.2"
"vimeo/psalm": "4.4.1"
},
"replace": {
"erusev/parsedown": "1.7.4",
Expand Down
4 changes: 4 additions & 0 deletions redaxo/src/core/lib/util/finder.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ public function sort($sort = rex_sortable_iterator::KEYS)
*/
public function getIterator()
{
/**
* @var RecursiveIterator<string, SplFileInfo> $iterator
* @psalm-suppress ArgumentTypeCoercion
*/
$iterator = new RecursiveDirectoryIterator($this->dir, FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS);

$iterator = new RecursiveCallbackFilterIterator($iterator, function (SplFileInfo $current, $key, $currentIterator) use ($iterator) {
Expand Down

0 comments on commit 5bcdb31

Please sign in to comment.