Update tools (#5603)

redaxo · Feb 26, 2023 · 985d246 · 985d246
1 parent dd8b232
commit 985d246
Show file tree

Hide file tree

Showing 7 changed files with 1,135 additions and 1,190 deletions.
diff --git a/.tools/bin/update-all b/.tools/bin/update-all
@@ -97,21 +97,7 @@ find redaxo/src/addons/phpmailer/vendor -name "*.md" ! -name "LICENSE.md" -type
 
 printf "\nUpdate root composer.json and vendor/\n"
 .tools/bin/update-root-composer
-composer require --dev --ansi --fixed \
-    friendsofphp/php-cs-fixer \
-    friendsofredaxo/linter \
-    phpstan/extension-installer \
-    phpstan/phpstan \
-    phpstan/phpstan-deprecation-rules \
-    phpstan/phpstan-phpunit \
-    phpstan/phpstan-symfony \
-    psalm/plugin-phpunit \
-    psalm/plugin-symfony \
-    rector/rector \
-    redaxo/php-cs-fixer-config \
-    redaxo/psalm-plugin \
-    vimeo/psalm
-composer update --ansi
+.tools/bin/update-tools
 
 printf "\nUpdate redaxo/src/core/assets/jquery.min.js\n"
 curl -# https://cdn.jsdelivr.net/gh/jquery/jquery@3/dist/jquery.js > redaxo/src/core/assets/jquery.js

diff --git a/.tools/bin/update-tools b/.tools/bin/update-tools
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+composer require --dev --ansi --fixed \
+    friendsofphp/php-cs-fixer \
+    friendsofredaxo/linter \
+    phpstan/extension-installer \
+    phpstan/phpstan \
+    phpstan/phpstan-deprecation-rules \
+    phpstan/phpstan-phpunit \
+    phpstan/phpstan-symfony \
+    psalm/plugin-phpunit \
+    psalm/plugin-symfony \
+    rector/rector \
+    redaxo/php-cs-fixer-config \
+    redaxo/psalm-plugin \
+    vimeo/psalm
+
+composer update --ansi
diff --git a/.tools/phpstan/baseline.neon b/.tools/phpstan/baseline.neon
@@ -1015,11 +1015,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/addons/structure/lib/perm.php
 
-		-
-			message: "#^Left side of && is always true\\.$#"
-			count: 1
-			path: ../../redaxo/src/addons/structure/lib/select_category.php
-
 		-
 			message: "#^Method rex_category_select\\:\\:__construct\\(\\) has parameter \\$addHomepage with no type specified\\.$#"
 			count: 1
@@ -1485,11 +1480,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/addons/structure/plugins/history/lib/history_login.php
 
-		-
-			message: "#^If condition is always false\\.$#"
-			count: 1
-			path: ../../redaxo/src/addons/structure/plugins/version/lib/revision.php
-
 		-
 			message: "#^Method class@anonymous/addons/structure/tests/category_test\\.php\\:175\\:\\:__construct\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1555,11 +1545,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/core/lib/autoload.php
 
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/autoload.php
-
 		-
 			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, Closure\\(string\\)\\: bool given\\.$#"
 			count: 1
@@ -1745,11 +1730,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/core/lib/form/elements/options.php
 
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/form/elements/prio.php
-
 		-
 			message: "#^Method rex_form_prio_element\\:\\:organizePriorities\\(\\) has parameter \\$ep with generic class rex_extension_point but does not specify its types\\: T$#"
 			count: 1
@@ -1780,11 +1760,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/core/lib/form/form.php
 
-		-
-			message: "#^Call to function is_string\\(\\) with int\\|false will always evaluate to false\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/form/form_base.php
-
 		-
 			message: "#^Method rex_form_base\\:\\:addCheckboxField\\(\\) has parameter \\$attributes with no value type specified in iterable type array\\.$#"
 			count: 1
@@ -1905,16 +1880,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/core/lib/form/form_base.php
 
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/form/form_base.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/fragment.php
-
 		-
 			message: "#^Method rex_list\\:\\:_getAttributeString\\(\\) has parameter \\$array with no type specified\\.$#"
 			count: 1
@@ -2105,26 +2070,11 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/core/lib/login/complex_perm.php
 
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/login/login.php
-
 		-
 			message: "#^Method rex_login\\:\\:setSessionVar\\(\\) has parameter \\$value with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: ../../redaxo/src/core/lib/login/login.php
 
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/login/login.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: ../../redaxo/src/core/lib/login/login.php
-
 		-
 			message: "#^Method rex_perm\\:\\:getAll\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/.tools/psalm/baseline-taint.xml b/.tools/psalm/baseline-taint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.6.0@e784128902dfe01d489c4123d69918a9f3c1eac5">
+<files psalm-version="5.7.7@e028ba46ba0d7f9a78bc3201c251e137383e145f">
   <file src="redaxo/src/addons/backup/lib/backup.php">
     <TaintedFile>
       <code>$filename</code>
@@ -13,60 +13,60 @@
   </file>
   <file src="redaxo/src/addons/structure/plugins/history/fragments/history/layer.php">
     <TaintedHtml>
-      <code>$this-&gt;getVar('content1iframe')</code>
-      <code>$this-&gt;getVar('content1select')</code>
-      <code>$this-&gt;getVar('content2iframe')</code>
-      <code>$this-&gt;getVar('content2select')</code>
+      <code><![CDATA[$this->getVar('content1iframe')]]></code>
+      <code><![CDATA[$this->getVar('content1select')]]></code>
+      <code><![CDATA[$this->getVar('content2iframe')]]></code>
+      <code><![CDATA[$this->getVar('content2select')]]></code>
     </TaintedHtml>
     <TaintedTextWithQuotes>
-      <code>$this-&gt;getVar('content1iframe')</code>
-      <code>$this-&gt;getVar('content1select')</code>
-      <code>$this-&gt;getVar('content2iframe')</code>
-      <code>$this-&gt;getVar('content2select')</code>
+      <code><![CDATA[$this->getVar('content1iframe')]]></code>
+      <code><![CDATA[$this->getVar('content1select')]]></code>
+      <code><![CDATA[$this->getVar('content2iframe')]]></code>
+      <code><![CDATA[$this->getVar('content2select')]]></code>
     </TaintedTextWithQuotes>
   </file>
   <file src="redaxo/src/core/fragments/core/fe_ooops.php">
     <TaintedHtml>
-      <code>$this-&gt;getVar('content', '')</code>
+      <code><![CDATA[$this->getVar('content', '')]]></code>
     </TaintedHtml>
     <TaintedTextWithQuotes>
-      <code>$this-&gt;getVar('content', '')</code>
+      <code><![CDATA[$this->getVar('content', '')]]></code>
     </TaintedTextWithQuotes>
   </file>
   <file src="redaxo/src/core/fragments/core/form/search.php">
     <TaintedHtml>
-      <code>'&lt;div class="'. $class . '"' . $id . '&gt;
-      &lt;span class="input-group-addon clear-button"&gt;&lt;i class="rex-icon rex-icon-search"&gt;&lt;/i&gt;&lt;/span&gt;
-      &lt;input class="form-control" type="text"' . $autofocus . $placeholder . $value . '&gt;
-      &lt;span title="' . $clear . '" class="form-control-clear rex-icon rex-icon-clear form-control-feedback hidden"&gt;&lt;/span&gt;
-&lt;/div&gt;'</code>
+      <code><![CDATA['<div class="'. $class . '"' . $id . '>
+      <span class="input-group-addon clear-button"><i class="rex-icon rex-icon-search"></i></span>
+      <input class="form-control" type="text"' . $autofocus . $placeholder . $value . '>
+      <span title="' . $clear . '" class="form-control-clear rex-icon rex-icon-clear form-control-feedback hidden"></span>
+</div>']]></code>
     </TaintedHtml>
     <TaintedTextWithQuotes>
-      <code>'&lt;div class="'. $class . '"' . $id . '&gt;
-      &lt;span class="input-group-addon clear-button"&gt;&lt;i class="rex-icon rex-icon-search"&gt;&lt;/i&gt;&lt;/span&gt;
-      &lt;input class="form-control" type="text"' . $autofocus . $placeholder . $value . '&gt;
-      &lt;span title="' . $clear . '" class="form-control-clear rex-icon rex-icon-clear form-control-feedback hidden"&gt;&lt;/span&gt;
-&lt;/div&gt;'</code>
+      <code><![CDATA['<div class="'. $class . '"' . $id . '>
+      <span class="input-group-addon clear-button"><i class="rex-icon rex-icon-search"></i></span>
+      <input class="form-control" type="text"' . $autofocus . $placeholder . $value . '>
+      <span title="' . $clear . '" class="form-control-clear rex-icon rex-icon-clear form-control-feedback hidden"></span>
+</div>']]></code>
     </TaintedTextWithQuotes>
   </file>
   <file src="redaxo/src/core/fragments/core/page/docs.php">
     <TaintedHtml>
-      <code>$this-&gt;getVar('content')</code>
-      <code>$this-&gt;getVar('sidebar')</code>
-      <code>$this-&gt;getVar('toc')</code>
+      <code><![CDATA[$this->getVar('content')]]></code>
+      <code><![CDATA[$this->getVar('sidebar')]]></code>
+      <code><![CDATA[$this->getVar('toc')]]></code>
     </TaintedHtml>
     <TaintedTextWithQuotes>
-      <code>$this-&gt;getVar('content')</code>
-      <code>$this-&gt;getVar('sidebar')</code>
-      <code>$this-&gt;getVar('toc')</code>
+      <code><![CDATA[$this->getVar('content')]]></code>
+      <code><![CDATA[$this->getVar('sidebar')]]></code>
+      <code><![CDATA[$this->getVar('toc')]]></code>
     </TaintedTextWithQuotes>
   </file>
   <file src="redaxo/src/core/fragments/core/page/readme.php">
     <TaintedHtml>
-      <code>$this-&gt;getVar('content')</code>
+      <code><![CDATA[$this->getVar('content')]]></code>
     </TaintedHtml>
     <TaintedTextWithQuotes>
-      <code>$this-&gt;getVar('content')</code>
+      <code><![CDATA[$this->getVar('content')]]></code>
     </TaintedTextWithQuotes>
   </file>
   <file src="redaxo/src/core/lib/login/login.php">