Merge branch 'master' into settings-bundle

src/Command/CheckRequirementsCommand.php

@@ -79,7 +79,7 @@ class CheckRequirementsCommand extends Command
         //Checking 32-bit system
         if (PHP_INT_SIZE === 4) {
             $io->warning('You are using a 32-bit system. You will have problems with working with dates after the year 2038, therefore a 64-bit system is recommended.');
-        } elseif (PHP_INT_SIZE === 8) {
+        } elseif (PHP_INT_SIZE === 8) { //@phpstan-ignore-line //PHP_INT_SIZE is always 4 or 8
             if (!$only_issues) {
                 $io->success('You are using a 64-bit system.');
             }

src/Command/Migrations/ConvertBBCodeCommand.php

@@ -79,6 +79,7 @@ class ConvertBBCodeCommand extends Command
 
     /**
      * Returns a list which entities and which properties need to be checked.
+     * @return array<class-string<AbstractNamedDBElement>, string[]>
      */
     protected function getTargetsLists(): array
     {
@@ -109,7 +110,6 @@ class ConvertBBCodeCommand extends Command
                 $class
             ));
             //Determine which entities of this type we need to modify
-            /** @var EntityRepository $repo */
             $repo = $this->em->getRepository($class);
             $qb = $repo->createQueryBuilder('e')
                 ->select('e');

src/Command/User/SetPasswordCommand.php

@@ -83,6 +83,19 @@ class SetPasswordCommand extends Command
 
         while (!$success) {
             $pw1 = $io->askHidden('Please enter new password:');
+
+            if ($pw1 === null) {
+                $io->error('No password entered! Please try again.');
+
+                //If we are in non-interactive mode, we can not ask again
+                if (!$input->isInteractive()) {
+                    $io->warning('Non-interactive mode detected. No password can be entered that way! If you are using docker exec, please use -it flag.');
+                    return Command::FAILURE;
+                }
+
+                continue;
+            }
+
             $pw2 = $io->askHidden('Please confirm:');
             if ($pw1 !== $pw2) {
                 $io->error('The entered password did not match! Please try again.');

src/Command/User/UsersPermissionsCommand.php

@@ -206,12 +206,15 @@ class UsersPermissionsCommand extends Command
             return '<fg=green>Allow</>';
         } elseif ($permission_value === false) {
             return '<fg=red>Disallow</>';
-        } elseif ($permission_value === null && !$inherit) {
+        }
+        // Permission value is null by this point
+        elseif (!$inherit) {
             return '<fg=blue>Inherit</>';
-        } elseif ($permission_value === null && $inherit) {
+        } elseif ($inherit) {
             return '<fg=red>Disallow (Inherited)</>';
         }
 
+        //@phpstan-ignore-next-line This line is never reached, but PHPstorm complains otherwise
         return '???';
     }
 }