minor improvements

atk4 · mvorisek · May 15, 2024 · May 8, 2024 · May 8, 2024 · May 12, 2024
commit a69c18ec0991ea42377ab409642b72e76009e102
diff --git a/src/Form/Control/Calendar.php b/src/Form/Control/Calendar.php
@@ -138,11 +138,11 @@ public function isDtFormatWith24hrTime(string $phpFormat): bool
 
     public function isDtFormatWithSeconds(string $phpFormat): bool
     {
-        return (bool) preg_match('~[suv]~', $this->expandPhpDtFormat($phpFormat));
+        return preg_match('~[suv]~', $this->expandPhpDtFormat($phpFormat)) === 1;
     }
 
     public function isDtFormatWithMicroseconds(string $phpFormat): bool
     {
-        return (bool) preg_match('~[uv]~', $this->expandPhpDtFormat($phpFormat));
+        return preg_match('~[uv]~', $this->expandPhpDtFormat($phpFormat)) === 1;
     }
 }
diff --git a/src/HtmlTemplate/Value.php b/src/HtmlTemplate/Value.php
@@ -26,7 +26,7 @@ private function encodeValueToHtml(string $value): string
     public function set(string $value): self
     {
         if (\PHP_VERSION_ID < 80200
-                ? !preg_match('~~u', $value) // much faster in PHP 8.1 and lower
+                ? preg_match('~~u', $value) === false // much faster in PHP 8.1 and lower
                 : !mb_check_encoding($value, 'UTF-8')
         ) {
             throw new Exception('Value is not valid UTF-8');

diff --git a/src/Js/JsExpression.php b/src/Js/JsExpression.php
@@ -97,7 +97,7 @@ protected function _jsEncode($value): string
             }
         } elseif (is_string($value)) {
             $res = json_encode($value, \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR);
-            $res = '\'' . str_replace('\'', '\\\'', str_replace('\"', '"', substr($res, 1, -1))) . '\'';
+            $res = '\'' . str_replace(['\'', '\"'], ['\\\'', '"'], substr($res, 1, -1)) . '\'';
         } elseif (is_bool($value)) {
             $res = $value ? 'true' : 'false';
         } elseif (is_int($value)) {

diff --git a/src/Form/Control/Multiline.php b/src/Form/Control/Multiline.php
            return $dummyModel->expr('[]', [$v]);
        };

        foreach ($entity->getFields() as $field) {
            $dummyModel->addExpression($field->shortName, [
                'expr' => isset($dummyFields[$field->shortName])
                    ? $dummyFields[$field->shortName]->expr
diff --git a/src/Grid.php b/src/Grid.php
                $this->menu->removeElement($menuRight->shortName);
            } finally {
                $this->getApp()->uniqueNameHashes = $appUniqueHashesBackup;
                \Closure::bind(fn () => $this->_elementNameCounts = $menuElementNameCountsBackup, $this->menu, AbstractView::class)();
            }
        }
    }
	return $dummyModel->expr('[]', [$v]);
	};

	foreach ($entity->getFields() as $field) {
Check failure on line 791 in src/Form/Control/Multiline.php GitHub Actions / Smoke (latest, StaticAnalysis) `Foreach overwrites $field with its value variable.` Check failure on line 791 in src/Form/Control/Multiline.php GitHub Actions / Smoke (latest, StaticAnalysis) `Foreach overwrites $field with its value variable.`
	$dummyModel->addExpression($field->shortName, [
	'expr' => isset($dummyFields[$field->shortName])
	? $dummyFields[$field->shortName]->expr
	$this->menu->removeElement($menuRight->shortName);
	} finally {
	$this->getApp()->uniqueNameHashes = $appUniqueHashesBackup;
	\Closure::bind(fn () => $this->_elementNameCounts = $menuElementNameCountsBackup, $this->menu, AbstractView::class)();
Check failure on line 131 in src/Grid.php GitHub Actions / Smoke (latest, StaticAnalysis) `Expression "\Closure::bind(fn() => $this->_elementNameCounts = $menuElementNameCountsBackup, $this->menu, \Atk4\Ui\AbstractView::class)()" on a separate line does not do anything.` Check failure on line 131 in src/Grid.php GitHub Actions / Smoke (latest, StaticAnalysis) `Expression "\Closure::bind(fn() => $this->_elementNameCounts = $menuElementNameCountsBackup, $this->menu, \Atk4\Ui\AbstractView::class)()" on a separate line does not do anything.`
	}
	}
	}