next version is beta version

elabftw · Jul 25, 2023 · 69baf1c · 69baf1c
1 parent 132db5d
commit 69baf1c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/src/Auth/Local.php b/src/Auth/Local.php
@@ -69,12 +69,11 @@ public static function enforceMfa(
         AuthResponse $AuthResponse,
         int $enforceMfa
     ): bool {
-        return (!$AuthResponse->mfaSecret
+        return !$AuthResponse->mfaSecret
             && self::isMfaEnforced(
                 $AuthResponse->userid,
                 $enforceMfa,
-            )
-        );
+            );
     }
 
     /**

diff --git a/src/Auth/Saml.php b/src/Auth/Saml.php
@@ -253,7 +253,7 @@ private function getTeams(): array | int
         }
 
         if (is_array($teams)) {
-            return ($teams);
+            return $teams;
         }
 
         if (is_string($teams)) {

diff --git a/src/classes/App.php b/src/classes/App.php
@@ -44,7 +44,7 @@ class App
     use UploadTrait;
     use TwigTrait;
 
-    public const INSTALLED_VERSION = '4.8.0-alpha';
+    public const INSTALLED_VERSION = '4.8.0-beta';
 
     public const WHATSNEWLINK = 'https://www.deltablot.com/posts/release-480/';
 

diff --git a/src/models/AbstractEntity.php b/src/models/AbstractEntity.php
@@ -223,7 +223,7 @@ public function readAll(): array
     public function readShow(DisplayParams $displayParams, bool $extended = false, string $can = 'canread'): array
     {
         // (extended) search (block must be before the call to getReadSqlBeforeWhere so extendedValues is filled)
-        if (!empty($displayParams->query) or !empty($displayParams->extendedQuery)) {
+        if (!empty($displayParams->query) || !empty($displayParams->extendedQuery)) {
             $this->processExtendedQuery(trim($displayParams->query . ' ' . $displayParams->extendedQuery));
         }