FOGProject · mastacontrola · Sep 4, 2026 · Sep 4, 2026
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.php-cs-fixer.cache
diff --git a/capone/src/Hooks/AddBootMenuItem.php b/capone/src/Hooks/AddBootMenuItem.php
@@ -72,10 +72,10 @@ public function addBootMenuItem()
         if (!$dmi) {
             return;
         }
-        $exists = self::getClass('PXEMenuOptionsManager')
+        $exists = (new \FOG\Managers\PXEMenuOptionsManager())
             ->exists('fog.capone', '', 'name');
         $args = trim("mode=capone shutdown=$shutdown");
-        $entry = self::getClass('PXEMenuOptions')
+        $entry = (new \FOG\Items\PXEMenuOptions())
             ->set('name', 'fog.capone')
             ->load('name');
         if (!$exists) {

diff --git a/capone/src/Hooks/AddCaponeAPI.php b/capone/src/Hooks/AddCaponeAPI.php
@@ -99,7 +99,7 @@ public function customizeDT($arguments)
             return;
         }
         $arguments['columns'] = [];
-        foreach (self::getClass('CaponeManager')
+        foreach ((new \FOG\Plugins\Capone\Managers\CaponeManager())
             ->getColumns() as $common => &$real
         ) {
             switch ($common) {
@@ -139,7 +139,7 @@ public function customizeDT($arguments)
                                 . 'sub=edit&id='
                                 . $d
                                 . '">'
-                                . self::getClass('Image', $d)->get('name')
+                                . (new \FOG\Items\Image($d))->get('name')
                                 . '</a>';
                         }
                     ];
@@ -152,7 +152,7 @@ public function customizeDT($arguments)
             }
             unset($real);
         }
-        foreach (self::getClass('OSManager')
+        foreach ((new \FOG\Managers\OSManager())
             ->getColumns() as $common => &$real
         ) {
             $arguments['columns'][] = [

diff --git a/capone/src/Managers/CaponeManager.php b/capone/src/Managers/CaponeManager.php
@@ -124,7 +124,7 @@ public function seedSettings()
                 $category
             ]
         ];
-        $SettingManager = self::getClass('SettingManager');
+        $SettingManager = new \FOG\Managers\SettingManager();
         $toInsert = [];
         foreach ($settings as $setting) {
             if (!$SettingManager->exists($setting[0], '', 'name')) {

diff --git a/capone/src/Pages/CaponeManagement.php b/capone/src/Pages/CaponeManagement.php
@@ -63,7 +63,7 @@ protected function _addFields()
     {
         $image = filter_input(INPUT_POST, 'image');
         $key = filter_input(INPUT_POST, 'key');
-        $imageSelector = self::getClass('ImageManager')
+        $imageSelector = (new \FOG\Managers\ImageManager())
             ->buildSelectBox($image);
 
         $labelClass = 'col-sm-3 col-form-label';
@@ -149,7 +149,7 @@ function (&$serverFault) {
                         _('The image associated does not have a valid OS!')
                     );
                 }
-                $Capone = self::getClass('Capone')
+                $Capone = (new \FOG\Plugins\Capone\Items\Capone())
                     ->set('imageID', $imageID)
                     ->set('osID', $osID)
                     ->set('key', $key);
@@ -180,7 +180,7 @@ public function caponeGeneral()
             filter_input(INPUT_POST, 'key') ?:
             $this->obj->get('key')
         );
-        $imageSelector = self::getClass('ImageManager')
+        $imageSelector = (new \FOG\Managers\ImageManager())
             ->buildSelectBox($image);
 
         $labelClass = 'col-sm-3 col-form-label';
@@ -348,7 +348,7 @@ public function globalsettings()
             $actionType
         );
 
-        $dmiSelector = self::getClass('DMIKeyManager')->buildSelectBox(
+        $dmiSelector = (new \FOG\Managers\DMIKeyManager())->buildSelectBox(
             $dmifield, // Match
             'dmifield', // Name of form element
             'name', // Sort by

diff --git a/helloworld/src/Pages/HelloWorldManagement.php b/helloworld/src/Pages/HelloWorldManagement.php
@@ -153,14 +153,14 @@ function (&$serverFault) {
                 if (empty($name)) {
                     throw new \Exception(_('Please enter a name'));
                 }
-                $exists = self::getClass('HelloWorldManager')
+                $exists = (new \FOG\Plugins\HelloWorld\Managers\HelloWorldManager())
                     ->exists($name);
                 if ($exists) {
                     throw new \Exception(
                         _('An entry already exists with this name!')
                     );
                 }
-                $HelloWorld = self::getClass('HelloWorld')
+                $HelloWorld = (new \FOG\Plugins\HelloWorld\Items\HelloWorld())
                     ->set('name', $name)
                     ->set('description', $description);
                 if (!$HelloWorld->save()) {
@@ -278,7 +278,7 @@ public function helloworldGeneralPost()
         if (empty($name)) {
             throw new \Exception(_('Please enter a name'));
         }
-        $exists = self::getClass('HelloWorldManager')
+        $exists = (new \FOG\Plugins\HelloWorld\Managers\HelloWorldManager())
             ->exists($name);
         if ($name != $this->obj->get('name')
             && $exists

diff --git a/ldap/src/Hooks/LDAPPluginHook.php b/ldap/src/Hooks/LDAPPluginHook.php
@@ -188,7 +188,7 @@ public function checkAddUser($arguments)
         $displayName = '';
         $ldapAPI = 0;
         foreach ($items as $ldap) {
-            $LDAP = self::getClass('LDAP', $ldap->id);
+            $LDAP = new \FOG\Plugins\LDAP\Items\LDAP($ldap->id);
             $matched = $LDAP->authLDAP($user, $pass);
             if (false === $matched) {
                 continue;

diff --git a/ldap/src/Items/LDAP.php b/ldap/src/Items/LDAP.php
@@ -1124,7 +1124,7 @@ public function destroy($key = 'id')
                 'id'
             );
             foreach ($groupIds as $groupId) {
-                self::getClass('LDAPGroup', (int)$groupId)->destroy();
+                (new \FOG\Plugins\LDAP\Items\LDAPGroup((int)$groupId))->destroy();
             }
         }
         return parent::destroy($key);

diff --git a/ldap/src/Items/LDAPGroup.php b/ldap/src/Items/LDAPGroup.php
@@ -106,7 +106,7 @@ public static function serverLinkCell($serverID)
         if (!$serverID) {
             return \FOG\Router\Route::EMPTY_CELL;
         }
-        $name = self::getClass('LDAP', $serverID)->get('name');
+        $name = (new \FOG\Plugins\LDAP\Items\LDAP($serverID))->get('name');
         // A group outliving its server should still list, not fatal.
         if (!$name) {
             return \FOG\Router\Route::EMPTY_CELL;

diff --git a/ldap/src/Managers/LDAPManager.php b/ldap/src/Managers/LDAPManager.php
@@ -274,7 +274,7 @@ public function seedSettings()
                 $category
             ]
         ];
-        $SettingManager = self::getClass('SettingManager');
+        $SettingManager = new \FOG\Managers\SettingManager();
         $toInsert = [];
         foreach ($settings as $setting) {
             if (!$SettingManager->exists($setting[0], '', 'name')) {
@@ -754,16 +754,16 @@ function () {
             // Rewriting a step that anyone has already applied is invisible
             // to them. Only ever append.
             function () {
-                return self::getClass('LDAPGroupManager')->install();
+                return (new \FOG\Plugins\LDAP\Managers\LDAPGroupManager())->install();
             },
             // 6
             function () {
-                return self::getClass('LDAPGroupRoleAssociationManager')
+                return (new \FOG\Plugins\LDAP\Managers\LDAPGroupRoleAssociationManager())
                     ->install();
             },
             // 7
             function () {
-                return self::getClass('LDAPGroupUserGroupAssociationManager')
+                return (new \FOG\Plugins\LDAP\Managers\LDAPGroupUserGroupAssociationManager())
                     ->install();
             },
             // 8
@@ -782,16 +782,16 @@ function () {
             // outrun the copy.
             // 10
             function () {
-                return self::getClass('LDAPGroupManager')->install();
+                return (new \FOG\Plugins\LDAP\Managers\LDAPGroupManager())->install();
             },
             // 11
             function () {
-                return self::getClass('LDAPGroupRoleAssociationManager')
+                return (new \FOG\Plugins\LDAP\Managers\LDAPGroupRoleAssociationManager())
                     ->install();
             },
             // 12
             function () {
-                return self::getClass('LDAPGroupUserGroupAssociationManager')
+                return (new \FOG\Plugins\LDAP\Managers\LDAPGroupUserGroupAssociationManager())
                     ->install();
             },
             // 13
@@ -814,7 +814,7 @@ function () {
             'DROP TABLE IF EXISTS `LDAPGroupMap`',
             // 17
             function () {
-                return self::getClass('LDAPUserGrantManager')->install();
+                return (new \FOG\Plugins\LDAP\Managers\LDAPUserGrantManager())->install();
             },
             // 18
             function () {
@@ -1009,10 +1009,10 @@ public function uninstall()
         // Associations first, then the groups they point at: dropping the
         // groups first would leave association rows referencing ids that no
         // longer exist if either drop failed part way.
-        self::getClass('LDAPUserGrantManager')->uninstall();
-        self::getClass('LDAPGroupRoleAssociationManager')->uninstall();
-        self::getClass('LDAPGroupUserGroupAssociationManager')->uninstall();
-        self::getClass('LDAPGroupManager')->uninstall();
+        (new \FOG\Plugins\LDAP\Managers\LDAPUserGrantManager())->uninstall();
+        (new \FOG\Plugins\LDAP\Managers\LDAPGroupRoleAssociationManager())->uninstall();
+        (new \FOG\Plugins\LDAP\Managers\LDAPGroupUserGroupAssociationManager())->uninstall();
+        (new \FOG\Plugins\LDAP\Managers\LDAPGroupManager())->uninstall();
         return parent::uninstall();
     }
 }
diff --git a/ldap/src/Pages/LDAPGroupManagement.php b/ldap/src/Pages/LDAPGroupManagement.php
@@ -172,7 +172,7 @@ function (&$serverFault) {
                         _('That group is already defined for this server!')
                     );
                 }
-                $LDAPGroup = self::getClass('LDAPGroup')
+                $LDAPGroup = (new \FOG\Plugins\LDAP\Items\LDAPGroup())
                     ->set('name', $name)
                     ->set('serverID', $serverID);
                 if (!$LDAPGroup->save()) {
@@ -602,7 +602,7 @@ private static function _ownerID()
     public function getRoleFeedList()
     {
         return $this->_feedList(
-            self::getClass('Role', self::_ownerID()),
+            new \FOG\Items\Role(self::_ownerID()),
             'ldapgrouproleassociation',
             'ldapGroupRoleAssoc',
             '`ldapGroupRoleAssoc`.`lgraGroupID`',
@@ -618,7 +618,7 @@ public function getRoleFeedList()
     public function getUserGroupFeedList()
     {
         return $this->_feedList(
-            self::getClass('UserGroup', self::_ownerID()),
+            new \FOG\Items\UserGroup(self::_ownerID()),
             'ldapgroupusergroupassociation',
             'ldapGroupUserGroupAssoc',
             '`ldapGroupUserGroupAssoc`.`lgugGroupID`',

diff --git a/ldap/src/Pages/LDAPManagement.php b/ldap/src/Pages/LDAPManagement.php
@@ -720,14 +720,14 @@ function (&$serverFault) {
                 // these to reach an LDAPS directory on this server's terms.
                 $tls = self::_tlsFromPost();
                 $nested = self::_nestedFromPost($tls);
-                $exists = self::getClass('LDAPManager')
+                $exists = (new \FOG\Plugins\LDAP\Managers\LDAPManager())
                     ->exists($ldap);
                 if ($exists) {
                     throw new \Exception(
                         _('An LDAP server already exists with this name!')
                     );
                 }
-                $LDAP = self::getClass('LDAP')
+                $LDAP = (new \FOG\Plugins\LDAP\Items\LDAP())
                     ->set('name', $ldap)
                     ->set('description', $description)
                     ->set('address', $address)
@@ -1217,7 +1217,7 @@ public function ldapGeneral()
             [
                 'fields' => &$fields,
                 'buttons' => &$buttons,
-                'LDAP' => self::getClass('LDAP')
+                'LDAP' => new \FOG\Plugins\LDAP\Items\LDAP()
             ]
         );
         $rendered = self::formFields($fields);
@@ -1317,7 +1317,7 @@ public function ldapGeneralPost()
         // reach an LDAPS directory on this server's terms.
         $tls = self::_tlsFromPost();
         $nested = self::_nestedFromPost($tls);
-        $exists = self::getClass('LDAPManager')
+        $exists = (new \FOG\Plugins\LDAP\Managers\LDAPManager())
             ->exists($ldap);
         if ($ldap != $this->obj->get('name')
             && $exists

diff --git a/location/src/Hooks/AddLocationAPI.php b/location/src/Hooks/AddLocationAPI.php
@@ -168,7 +168,7 @@ public function addPluginItems($arguments)
                 if ($locID < 1) {
                     break;
                 }
-                $location = \FOG\Router\Route::getClass('location', $locID);
+                $location = new \FOG\Plugins\Location\Items\Location($locID);
                 if (!$location->isValid()) {
                     break;
                 }
@@ -209,7 +209,7 @@ public function addPluginItems($arguments)
                 }
                 $hosts = [];
                 foreach ($hostIDs as $hid) {
-                    $host = \FOG\Router\Route::getClass('host', $hid);
+                    $host = new \FOG\Items\Host($hid);
                     if (!$host->isValid()) {
                         continue;
                     }

diff --git a/location/src/Hooks/AddLocationHost.php b/location/src/Hooks/AddLocationHost.php
@@ -113,7 +113,7 @@ public function hostLocation($obj)
             (int)filter_input(INPUT_POST, 'location') ?:
             $location
         );
-        $locationSelector = self::getClass('LocationManager')
+        $locationSelector = (new \FOG\Plugins\Location\Managers\LocationManager())
             ->buildSelectBox($locationID, 'location');
 
         $fields = [
@@ -203,15 +203,15 @@ public function hostLocationPost($obj)
                 'locationassociation',
                 ['hostID' => $hosts]
             );
-            if (self::getClass('Location', $locationID)->isValid()) {
+            if ((new \FOG\Plugins\Location\Items\Location($locationID))->isValid()) {
                 foreach ((array)$hosts as $ind => &$hostID) {
                     $insert_values[] = [$hostID, $locationID];
                     unset($hostID);
                 }
             }
         }
         if (count($insert_values) > 0) {
-            self::getClass('LocationAssociationManager')
+            (new \FOG\Plugins\Location\Managers\LocationAssociationManager())
                 ->insertBatch(
                     $insert_fields,
                     $insert_values
@@ -235,10 +235,10 @@ public function hostAddLocationRegister($arguments)
             return;
         }
         $locationID = (int)($_POST['location'] ?? 0);
-        if (!self::getClass('Location', $locationID)->isValid()) {
+        if (!(new \FOG\Plugins\Location\Items\Location($locationID))->isValid()) {
             return;
         }
-        self::getClass('LocationAssociationManager')
+        (new \FOG\Plugins\Location\Managers\LocationAssociationManager())
             ->insertBatch(
                 ['hostID', 'locationID'],
                 [[$obj->get('id'), $locationID]]
@@ -305,7 +305,7 @@ public function hostAddLocationField($arguments)
             return;
         }
         $locationID = (int)filter_input(INPUT_POST, 'location');
-        $locationSelector = self::getClass('LocationManager')
+        $locationSelector = (new \FOG\Plugins\Location\Managers\LocationManager())
             ->buildSelectBox($locationID, 'location');
 
         $arguments['fields'][
@@ -349,7 +349,7 @@ public function massEditFields($arguments)
 
         $arguments['fields']['location'] = [
             'label' => _('Host Location'),
-            'input' => self::getClass('LocationManager')->buildSelectBox(
+            'input' => (new \FOG\Plugins\Location\Managers\LocationManager())->buildSelectBox(
                 '',
                 'value[location]',
                 'name',
@@ -391,7 +391,7 @@ private function _sharedLocation(array $hostIDs)
         )['location'];
 
         if (!empty($info['uniform']) && '' !== (string)$info['value']) {
-            $item = self::getClass('Location', (int)$info['value']);
+            $item = new \FOG\Plugins\Location\Items\Location((int)$info['value']);
             if ($item->isValid()) {
                 $info['value'] = $item->get('name');
             }
@@ -440,7 +440,7 @@ function ($id) {
             // an instruction to clear: silently turning it into one would
             // strip the location off every selected host.
             if ($itemID < 1
-                || !self::getClass('Location', $itemID)->isValid()
+                || !(new \FOG\Plugins\Location\Items\Location($itemID))->isValid()
             ) {
                 throw new \Exception(_('Invalid Location selected'));
             }
@@ -460,7 +460,7 @@ function ($id) {
         foreach ($hostIDs as $hostID) {
             $insert_values[] = [$hostID, $itemID];
         }
-        self::getClass('LocationAssociationManager')
+        (new \FOG\Plugins\Location\Managers\LocationAssociationManager())
             ->insertBatch(['hostID', 'locationID'], $insert_values);
     }
 }
diff --git a/location/src/Hooks/AddLocationImport.php b/location/src/Hooks/AddLocationImport.php
@@ -145,7 +145,7 @@ public function getLocationNames($host)
         );
         $names = [];
         foreach ((array)$locationIDs as $locationID) {
-            $Location = self::getClass('Location', $locationID);
+            $Location = new \FOG\Plugins\Location\Items\Location($locationID);
             if ($Location->isValid()) {
                 $names[] = $Location->get('name');
             }
@@ -173,8 +173,8 @@ public function applyLocation($host, $ids)
             ['hostID' => $hostID]
         );
         $locationID = array_shift($ids);
-        if (self::getClass('Location', $locationID)->isValid()) {
-            self::getClass('LocationAssociationManager')
+        if ((new \FOG\Plugins\Location\Items\Location($locationID))->isValid()) {
+            (new \FOG\Plugins\Location\Managers\LocationAssociationManager())
                 ->insertBatch(
                     ['hostID', 'locationID'],
                     [[$hostID, $locationID]]