Scrutinizer

Author: mambax7

class/Common/FilesManagement.php

@@ -92,31 +92,33 @@ public static function deleteDirectory($src)
             return false;
         }
 
-        $success = true;
+        $success = false;
         // remove old files
         $dirInfo = new \SplFileInfo($src);
         // validate is a directory
         if ($dirInfo->isDir()) {
             $dirScan = scandir($src, SCANDIR_SORT_NONE);
-            $fileList = array_diff($dirScan, ['..', '.']);
-            foreach ($fileList as $k => $v) {
-                $fileInfo = new \SplFileInfo("{$src}/{$v}");
-                if ($fileInfo->isDir()) {
-                    // recursively handle subdirectories
-                    if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
-                        break;
-                    }
-                } elseif (!($success = unlink($fileInfo->getRealPath()))) {
+            if (false !== $dirScan) {
+                $fileList = array_diff($dirScan, ['..', '.']);
+                foreach ($fileList as $k => $v) {
+                    $fileInfo = new \SplFileInfo("{$src}/{$v}");
+                    if ($fileInfo->isDir()) {
+                        // recursively handle subdirectories
+                        if (!$success = self::deleteDirectory($fileInfo->getRealPath())) {
+                            break;
+                        }
+                    } elseif (!($success = unlink($fileInfo->getRealPath()))) {
                         break; // delete the file
                     }
+                }
+                // now delete this (sub)directory if all the files are gone
+                if ($success) {
+                    $success = rmdir($dirInfo->getRealPath());
+                }
             }
-            // now delete this (sub)directory if all the files are gone
-            if ($success) {
-                $success = rmdir($dirInfo->getRealPath());
-            }
-        } else {
-            // input is not a valid directory
-            $success = false;
+//        } else {
+//            // input is not a valid directory
+//            $success = false;
         }
 
         return $success;

class/LanguageHandler.php

@@ -202,7 +202,7 @@ public function create($isNew = true, $isBase = true)
 
     /**
      * @param Blanguage|Language $object
-     * @return bool|string
+     * @return bool|string|array
      * @internal param object $lang
      */
     public function insert(\XoopsObject $object)//insert(&$lang)

docs/changelog.txt

@@ -1,10 +1,11 @@
-<h5>3.1 RC 1        [2019-12-22]</h5>
+<h5>3.1 RC 1        [2019-12-22]</h5>  Dev: XOOPS 2.5.11, PHP 7.4.1
 <hr>
 - __NAMESPACE__ in Helper.php (mamba)
 - renamed 'PHP_SELF' to 'SCRIPT_NAME' (mamba)
 - cosmetics, PSR12 (mamba)
 - decreased index key length (mamba) (MySQL error #1071)
 - added few \Xmf\Request checks (mamba)
+- Scrutinizer suggestions (mamba)
 
 
 <h5>3.1 Beta 1        [NOT RELEASED]</h5>

include/oninstall.php

@@ -72,11 +72,11 @@ function xoops_module_install_xlanguage(\XoopsModule $module)
     /** @var \XoopsGroupPermHandler $grouppermHandler */
     $grouppermHandler = xoops_getHandler('groupperm');
     // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName . '_approve', 1, (int)XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName . '_submit', 1, (int)XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName . '_view', 1, (int)XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName . '_view', 1, (int)XOOPS_GROUP_USERS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName . '_view', 1, (int)XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     //  ---  CREATE FOLDERS ---------------
     if (count($configurator->uploadFolders) > 0) {