Feature/glpi 11.0

.github/workflows/continuous-integration.yml

@@ -20,7 +20,7 @@ jobs:
     name: "Generate CI matrix"
     uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
     with:
-      glpi-version: "10.0.x"
+      glpi-version: "11.0.x"
   ci:
     name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
     needs: "generate-ci-matrix"

.gitignore

@@ -1,2 +1,3 @@
 vendor
 .phpunit.result.cache
+var/

.php-cs-fixer.php

@@ -11,11 +11,11 @@
 $config = new Config();
 
 $rules = [
-    '@PER-CS2.0'                  => true,
-    'trailing_comma_in_multiline' => ['elements' => ['arguments', 'array_destructuring', 'arrays']], // For PHP 7.4 compatibility
+    '@PER-CS' => true, // Latest PER rules.
 ];
 
 return $config
     ->setRules($rules)
     ->setFinder($finder)
-    ->setUsingCache(false);
+    ->setCacheFile(__DIR__ . '/var/php-cs-fixer/.php-cs-fixer.cache')
+;

.twig_cs.dist.php

@@ -2,14 +2,16 @@
 
 declare(strict_types=1);
 
-use FriendsOfTwig\Twigcs;
+use FriendsOfTwig\Twigcs\Finder\TemplateFinder;
+use FriendsOfTwig\Twigcs\Config\Config;
+use Glpi\Tools\GlpiTwigRuleset;
 
-$finder = Twigcs\Finder\TemplateFinder::create()
+$finder = TemplateFinder::create()
     ->in(__DIR__ . '/templates')
     ->name('*.html.twig')
     ->ignoreVCSIgnored(true);
 
-return Twigcs\Config\Config::create()
+return Config::create()
     ->setFinder($finder)
-    ->setRuleSet(\Glpi\Tools\GlpiTwigRuleset::class)
+    ->setRuleSet(GlpiTwigRuleset::class)
 ;

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [UNRELEASED]
 
+- GLPI 11 compatibility
+
 ### Fixes
 
 - SQL error when merging the Jamf device linked to a GLPI asset

ajax/cron.php

@@ -22,24 +22,27 @@
  * You should have received a copy of the GNU General Public License
  * along with JAMF plugin for GLPI. If not, see <http://www.gnu.org/licenses/>.
  * -------------------------------------------------------------------------
- * @copyright Copyright (C) 2024-2024 by Teclib'
+ * @copyright Copyright (C) 2024-2025 by Teclib'
  * @copyright Copyright (C) 2019-2024 by Curtis Conard
  * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
  * @link      https://github.com/pluginsGLPI/jamf
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
+use Glpi\Exception\Http\NotFoundHttpException;
+
+use function Safe\file_get_contents;
 
 $plugin = new Plugin();
 if (!$plugin->isActivated('jamf')) {
-    Html::displayNotFoundError();
+    throw new NotFoundHttpException();
 }
 
 Html::header_nocache();
 
 Session::checkLoginUser();
 
+/** @var DBmysql $DB */
 global $DB;
 
 // Get AJAX input and load it into $_REQUEST
@@ -55,4 +58,5 @@
 if (!in_array($_REQUEST['crontask'], $accepted_tasks)) {
     throw new RuntimeException('Unacceptable cron task!');
 }
+
 CronTask::launch(-CronTask::MODE_EXTERNAL, 1, $_REQUEST['crontask']);

ajax/getMDMCommandForm.php

@@ -22,18 +22,18 @@
  * You should have received a copy of the GNU General Public License
  * along with JAMF plugin for GLPI. If not, see <http://www.gnu.org/licenses/>.
  * -------------------------------------------------------------------------
- * @copyright Copyright (C) 2024-2024 by Teclib'
+ * @copyright Copyright (C) 2024-2025 by Teclib'
  * @copyright Copyright (C) 2019-2024 by Curtis Conard
  * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
  * @link      https://github.com/pluginsGLPI/jamf
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
+use Glpi\Exception\Http\NotFoundHttpException;
 
 $plugin = new Plugin();
 if (!$plugin->isActivated('jamf')) {
-    Html::displayNotFoundError();
+    throw new NotFoundHttpException();
 }
 
 Session::checkLoginUser();
@@ -45,12 +45,17 @@
 
 if (isset($_GET['itemtype'], $_GET['items_id'])) {
     $className = 'PluginJamf' . $_GET['itemtype'];
+    if (is_a($className, 'CommonDBTM', true) === false) {
+        throw new RuntimeException('Invalid itemtype!');
+    }
+
     $device = new $className();
     if (!$device->getFromDB($_GET['items_id'])) {
         throw new RuntimeException('Invalid itemtype/items_id!');
     }
 } else {
     $device = null;
 }
+
 $form = PluginJamfMDMCommand::getFormForCommand($_GET['command'], $device);
 echo $form;

ajax/import.php

@@ -22,24 +22,27 @@
  * You should have received a copy of the GNU General Public License
  * along with JAMF plugin for GLPI. If not, see <http://www.gnu.org/licenses/>.
  * -------------------------------------------------------------------------
- * @copyright Copyright (C) 2024-2024 by Teclib'
+ * @copyright Copyright (C) 2024-2025 by Teclib'
  * @copyright Copyright (C) 2019-2024 by Curtis Conard
  * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
  * @link      https://github.com/pluginsGLPI/jamf
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
+use Glpi\Exception\Http\NotFoundHttpException;
+
+use function Safe\file_get_contents;
 
 $plugin = new Plugin();
 if (!$plugin->isActivated('jamf')) {
-    Html::displayNotFoundError();
+    throw new NotFoundHttpException();
 }
 
 Html::header_nocache();
 
 Session::checkLoginUser();
 
+/** @var DBmysql $DB */
 global $DB;
 
 // Get AJAX input and load it into $_REQUEST

ajax/merge.php

@@ -22,24 +22,27 @@
  * You should have received a copy of the GNU General Public License
  * along with JAMF plugin for GLPI. If not, see <http://www.gnu.org/licenses/>.
  * -------------------------------------------------------------------------
- * @copyright Copyright (C) 2024-2024 by Teclib'
+ * @copyright Copyright (C) 2024-2025 by Teclib'
  * @copyright Copyright (C) 2019-2024 by Curtis Conard
  * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
  * @link      https://github.com/pluginsGLPI/jamf
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
+use Glpi\Exception\Http\NotFoundHttpException;
+
+use function Safe\file_get_contents;
 
 $plugin = new Plugin();
 if (!$plugin->isActivated('jamf')) {
-    Html::displayNotFoundError();
+    throw new NotFoundHttpException();
 }
 
 Html::header_nocache();
 
 Session::checkLoginUser();
 
+/** @var DBmysql $DB */
 global $DB;
 
 // Get AJAX input and load it into $_REQUEST
@@ -50,6 +53,7 @@
 if (!isset($_REQUEST['action'])) {
     throw new RuntimeException('Required argument missing!');
 }
+
 if ($_REQUEST['action'] === 'merge') {
     // Trigger extension attribute definition sync
     PluginJamfMobileSync::syncExtensionAttributeDefinitions();
@@ -62,17 +66,19 @@
             if (!isset($data['jamf_id'], $data['itemtype'])) {
                 continue;
             }
+
             $jamf_id  = $data['jamf_id'];
             $itemtype = $data['itemtype'];
 
             if (($itemtype !== 'Computer') && ($itemtype !== 'Phone')) {
                 // Invalid itemtype for a mobile device
                 throw new RuntimeException('Invalid itemtype!');
             }
+
             $item = new $itemtype();
-            /** @var PluginJamfAbstractDevice $plugin_itemtype */
+            /** @var class-string<PluginJamfAbstractDevice> $plugin_itemtype */
             $plugin_itemtype = 'PluginJamf' . $data['jamf_type'];
-            /** @var PluginJamfDeviceSync $plugin_sync_itemtype */
+            /** @var class-string<PluginJamfDeviceSync> $plugin_sync_itemtype */
             $plugin_sync_itemtype = 'PluginJamf' . $data['jamf_type'] . 'Sync';
             if ($data['jamf_type'] === 'MobileDevice') {
                 $plugin_sync_itemtype = 'PluginJamfMobileSync';
@@ -102,7 +108,7 @@
                 'supervised'     => $jamf_item['supervised']                   ?? $os_details['supervised'],
             ];
             $ruleinput = $rules->processAllRules($ruleinput, $ruleinput, ['recursive' => true]);
-            $import    = isset($ruleinput['_import']) ? $ruleinput['_import'] : 'NS';
+            $import    = $ruleinput['_import'] ?? 'NS';
 
             if (isset($ruleinput['_import']) && !$ruleinput['_import']) {
                 // Dropped by rules
@@ -120,9 +126,15 @@
                     'jamf_items_id' => $data['jamf_id'],
                 ]);
                 if ($r === false) {
-                    throw new \RuntimeException('Failed to import the device data!');
+                    throw new RuntimeException('Failed to import the device data!');
                 }
+
                 // Link
+
+                if (is_a($plugin_itemtype, 'CommonDBTM', true) === false) {
+                    throw new RuntimeException('Invalid plugin itemtype!');
+                }
+
                 $plugin_item     = new $plugin_itemtype();
                 $plugin_items_id = $plugin_item->add([
                     'glpi_plugin_jamf_devices_id' => $DB->insertId(),
@@ -155,8 +167,9 @@
                 $DB->rollBack();
             }
         }
-        if ($failures) {
-            Session::addMessageAfterRedirect(sprintf(__('An error occurred while merging %d devices!', 'jamf'), $failures), false, ERROR);
+
+        if ($failures !== 0) {
+            Session::addMessageAfterRedirect(sprintf(__s('An error occurred while merging %d devices!', 'jamf'), $failures), false, ERROR);
         }
     } else {
         throw new RuntimeException('Required argument missing!');

ajax/sendMDMCommand.php

@@ -22,18 +22,19 @@
  * You should have received a copy of the GNU General Public License
  * along with JAMF plugin for GLPI. If not, see <http://www.gnu.org/licenses/>.
  * -------------------------------------------------------------------------
- * @copyright Copyright (C) 2024-2024 by Teclib'
+ * @copyright Copyright (C) 2024-2025 by Teclib'
  * @copyright Copyright (C) 2019-2024 by Curtis Conard
  * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
  * @link      https://github.com/pluginsGLPI/jamf
  * -------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
+use Glpi\Exception\Http\BadRequestHttpException;
+use Glpi\Exception\Http\NotFoundHttpException;
 
 $plugin = new Plugin();
 if (!$plugin->isActivated('jamf')) {
-    Html::displayNotFoundError();
+    throw new NotFoundHttpException();
 }
 
 Html::header_nocache();
@@ -61,19 +62,18 @@
 $valid_types = ['MobileDevice'];
 
 if (!in_array($_POST['itemtype'], $valid_types, true)) {
-    die('Invalid itemtype. Cannot send Jamf MDM command.');
+    throw new BadRequestHttpException();
 }
 
 $items = [];
-if ($_POST['itemtype'] === 'MobileDevice') {
-    foreach ($_POST['items_id'] as $items_id) {
-        /** @var PluginJamfMobileDevice $item */
-        $item = new PluginJamfMobileDevice();
-        $item->getFromDB((int) $items_id);
-        $items[] = $item;
-    }
+foreach ($_POST['items_id'] as $items_id) {
+    /** @var PluginJamfMobileDevice $item */
+    $item = new PluginJamfMobileDevice();
+    $item->getFromDB((int) $items_id);
+    $items[] = $item;
 }
 
+
 foreach ($items as $k => $item) {
     $commands      = PluginJamfItem_MDMCommand::getApplicableCommands($item);
     $command_names = array_keys($commands);
@@ -83,9 +83,9 @@
     }
 }
 
-if (!count($items)) {
+if ($items === []) {
     // No applicable items or no right to send command
-    exit();
+    return;
 }
 
 // The API endpoint for sending MDM commands only accepts XML, so we need to build the XML payload
@@ -101,4 +101,5 @@
     $m           = $mobile_devices->addChild('mobile_device');
     $m->addChild('id', $jamf_id);
 }
+
 echo PluginJamfAPI::sendMDMCommand($payload->asXML(), true);