removed always true condition (#5359)

redaxo · Oct 9, 2022 · 6c491a9 · 6c491a9
1 parent e4f5848
commit 6c491a9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/.tools/phpstan/baseline.neon b/.tools/phpstan/baseline.neon
@@ -820,11 +820,6 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/addons/mediapool/lib/media_category.php
 
-		-
-			message: "#^Left side of && is always true\\.$#"
-			count: 1
-			path: ../../redaxo/src/addons/mediapool/lib/media_category_select.php
-
 		-
 			message: "#^Method rex_media_category_select\\:\\:__construct\\(\\) has parameter \\$checkPerms with no type specified\\.$#"
 			count: 1
@@ -1802,7 +1797,7 @@ parameters:
 
 		-
 			message: "#^Left side of && is always true\\.$#"
-			count: 3
+			count: 1
 			path: ../../redaxo/src/addons/structure/lib/select_category.php
 
 		-
@@ -1840,6 +1835,11 @@ parameters:
 			count: 1
 			path: ../../redaxo/src/addons/structure/lib/select_category.php
 
+		-
+			message: "#^Right side of && is always false\\.$#"
+			count: 1
+			path: ../../redaxo/src/addons/structure/lib/select_category.php
+
 		-
 			message: "#^Method rex_article_service\\:\\:addArticle\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/redaxo/src/addons/mediapool/lib/media_category_select.php b/redaxo/src/addons/mediapool/lib/media_category_select.php
@@ -65,8 +65,7 @@ protected function addCatOptions()
      */
     protected function addCatOption(rex_media_category $mediacat, int $parentId = 0)
     {
-        if (!$this->checkPerms ||
-                $this->checkPerms && rex::getUser()->getComplexPerm('media')->hasCategoryPerm($mediacat->getId())
+        if (!$this->checkPerms || rex::getUser()->getComplexPerm('media')->hasCategoryPerm($mediacat->getId())
         ) {
             $mid = $mediacat->getId();
             $mname = $mediacat->getName();

diff --git a/redaxo/src/addons/structure/lib/select_category.php b/redaxo/src/addons/structure/lib/select_category.php
@@ -87,8 +87,7 @@ protected function addCatOptions()
      */
     protected function addCatOption(rex_category $cat, $group = null)
     {
-        if (!$this->checkPerms ||
-                $this->checkPerms && rex::getUser()->getComplexPerm('structure')->hasCategoryPerm($cat->getId())
+        if (!$this->checkPerms || rex::getUser()->getComplexPerm('structure')->hasCategoryPerm($cat->getId())
         ) {
             $cid = $cat->getId();
             $cname = $cat->getName() . ' [' . $cid . ']';
@@ -133,9 +132,9 @@ protected function outGroup($parentId, $level = 0)
             $name = $option[0];
             $value = $option[1];
             $id = $option[2];
-            if (0 == $id || !$this->checkPerms || ($this->checkPerms && rex::getUser()->getComplexPerm('structure')->hasCategoryPerm($option[2]))) {
+            if (0 == $id || !$this->checkPerms || rex::getUser()->getComplexPerm('structure')->hasCategoryPerm($option[2])) {
                 $ausgabe .= $this->outOption($name, $value, $level);
-            } elseif (($this->checkPerms && rex::getUser()->getComplexPerm('structure')->hasCategoryPerm($option[2]))) {
+            } elseif ($this->checkPerms && rex::getUser()->getComplexPerm('structure')->hasCategoryPerm($option[2])) {
                 --$level;
             }