PHP8 cosmetics, namespaces

Author: mambax7

abandongroup.php

@@ -20,7 +20,9 @@
  */
 
 use Xmf\Request;
-use XoopsModules\Suico;
+use XoopsModules\Suico\{
+    RelgroupuserHandler
+};
 
 require __DIR__ . '/header.php';
 /**
@@ -50,7 +52,7 @@
      * Creating the factory  and the criteria to delete the picture
      * The user must be the owner
      */
-    $relgroupuserFactory = new Suico\RelgroupuserHandler(
+    $relgroupuserFactory = new RelgroupuserHandler(
         $xoopsDB
     );
     $criteria_rel_id     = new Criteria('rel_id', $relgroupuser_id);

admin/admin_header.php

@@ -20,8 +20,13 @@
  */
 
 use Xmf\Module\Admin;
-use XoopsModules\Suico\Helper;
-use XoopsModules\Suico\Utility;
+use XoopsModules\Suico\{
+    Helper,
+    Utility
+};
+/** @var Helper $helper */
+/** @var Utility $utility */
+/** @var Admin $adminObject */
 
 include dirname(__DIR__) . '/preloads/autoloader.php';
 require dirname(__DIR__, 3) . '/include/cp_header.php';

admin/feedback.php

@@ -21,8 +21,14 @@
 
 use Xmf\Module\Admin;
 use Xmf\Request;
-use XoopsModules\Suico;
-use XoopsModules\Suico\Common\ModuleFeedback;
+use XoopsModules\Suico\{
+    Helper,
+    Utility,
+    Common\ModuleFeedback
+};
+/** @var Helper $helper */
+/** @var Utility $utility */
+/** @var Admin $adminObject */
 
 require __DIR__ . '/admin_header.php';
 $adminObject = Admin::getInstance();

admin/index.php

@@ -22,7 +22,15 @@
 use Xmf\Module\Admin;
 use Xmf\Request;
 use Xmf\Yaml;
-use XoopsModules\Suico\Common;
+use XoopsModules\Suico\{
+    Common,
+    Helper,
+    Utility
+};
+
+/** @var Admin $adminObject */
+/** @var Helper $helper */
+/** @var Utility $utility */
 
 require __DIR__ . '/admin_header.php';
 // Display Admin header

admin/migrate.php

@@ -19,9 +19,13 @@
  * @author          Marcello Brandão aka  Suico, Mamba, LioMJ  <https://xoops.org>
  */
 
+use Xmf\Module\Admin;
 use Xmf\Request;
-use XoopsModules\Suico;
-use XoopsModules\Suico\Common\Migrate;
+use XoopsModules\Suico\{
+    ommon\Configurator,
+    Common\Migrate
+};
+/** @var Admin $adminObject */
 
 require_once __DIR__ . '/admin_header.php';
 xoops_cp_header();
@@ -40,7 +44,7 @@
 </form>
 EOF;
 //XoopsLoad::load('migrate', 'newbb');
-$configurator = new Suico\Common\Configurator();
+$configurator = new Configurator();
 $migrator     = new Migrate($configurator);
 $op           = Request::getCmd('op', 'default');
 $opShow       = Request::getCmd('show', null, 'POST');

album.php

@@ -20,12 +20,14 @@
  */
 
 use Xmf\Request;
-use XoopsModules\Suico;
+use XoopsModules\Suico\{
+    PhotosController
+};
 
 const COUNTPHOTOS = 'countPhotos';
 $GLOBALS['xoopsOption']['template_main'] = 'suico_album.tpl';
 require __DIR__ . '/header.php';
-$controller = new Suico\PhotosController($xoopsDB, $xoopsUser);
+$controller = new PhotosController($xoopsDB, $xoopsUser);
 /**
  * Fetching numbers of groups friends videos pictures etc...
  */

audios.php

@@ -19,12 +19,14 @@
  */
 
 use Xmf\Request;
-use XoopsModules\Suico;
+use XoopsModules\Suico\{
+    AudioController
+};
 
 const COUNTAUDIOS = 'countAudios';
 $GLOBALS['xoopsOption']['template_main'] = 'suico_audios.tpl';
 require __DIR__ . '/header.php';
-$controller = new Suico\AudioController($xoopsDB, $xoopsUser);
+$controller = new AudioController($xoopsDB, $xoopsUser);
 /**
  * Fetching numbers of groups friends videos pictures etc...
  */

avatar.php

@@ -20,7 +20,11 @@
  */
 
 use Xmf\Request;
-use XoopsModules\Suico;
+use XoopsModules\Suico\{
+    Image,
+    ImageHandler
+};
+/** @var Image $picture */
 
 require __DIR__ . '/header.php';
 if (!$GLOBALS['xoopsSecurity']->check()) {
@@ -29,10 +33,9 @@
 /**
  * Creating the factory  loading the picture changing its caption
  */
-$imageFactory = new Suico\ImageHandler(
+$imageFactory = new ImageHandler(
     $xoopsDB
 );
-/** @var \XoopsModules\Suico\Image $picture */
 $picture = $imageFactory->create(false);
 $picture->load(Request::getString('image_id', '', 'POST'));
 $uid         = (int)$xoopsUser->getVar('uid');

becomemembergroup.php

@@ -20,7 +20,10 @@
  */
 
 use Xmf\Request;
-use XoopsModules\Suico;
+use XoopsModules\Suico\{
+    RelgroupuserHandler,
+    GroupsHandler
+};
 
 require __DIR__ . '/header.php';
 //require_once __DIR__ . '/class/Friendrequest.php';
@@ -29,10 +32,10 @@
 /**
  * Factories of groups... testing for zend editor
  */
-$relgroupuserFactory = new Suico\RelgroupuserHandler(
+$relgroupuserFactory = new RelgroupuserHandler(
     $xoopsDB
 );
-$groupsFactory       = new Suico\GroupsHandler($xoopsDB);
+$groupsFactory       = new GroupsHandler($xoopsDB);
 $group_id            = Request::getInt('group_id', 0, 'POST');
 $uid                 = (int)$xoopsUser->getVar('uid');
 $criteriaUid         = new Criteria('rel_user_uid', $uid);

cancelFriendrequest.php

@@ -20,14 +20,17 @@
  */
 
 use Xmf\Request;
-use XoopsModules\Suico;
+use XoopsModules\Suico\{
+    FriendrequestHandler,
+    FriendshipHandler
+};
 
 require __DIR__ . '/header.php';
 /**
  * Factory of friendrequests created
  */
-$friendrequestFactory = new Suico\FriendrequestHandler($xoopsDB);
-$friendshipFactory    = new Suico\FriendshipHandler($xoopsDB);
+$friendrequestFactory = new FriendrequestHandler($xoopsDB);
+$friendshipFactory    = new FriendshipHandler($xoopsDB);
 /**
  * Getting the uid of the user which user want to canel friend request
  */