From bfb02b1350600d9aa69d267c3bbfaec12cb0b8ef Mon Sep 17 00:00:00 2001
From: Denis Ryabov <dryabov@yandex.ru>
Date: Wed, 3 Aug 2022 16:39:10 +0300
Subject: [PATCH 1/2] check of group (for plugins) and client (for modules and
 templates) attributes in package manifest file

---
 .../libraries/rules/xmlmanifest.php           | 66 +++++++++++++++----
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/administrator/components/com_jedchecker/libraries/rules/xmlmanifest.php b/administrator/components/com_jedchecker/libraries/rules/xmlmanifest.php
index 9e6523f..a4ae8a1 100644
--- a/administrator/components/com_jedchecker/libraries/rules/xmlmanifest.php
+++ b/administrator/components/com_jedchecker/libraries/rules/xmlmanifest.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.JEDChecker
  *
- * @copyright  Copyright (C) 2021 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2021-2022 Open Source Matters, Inc. All rights reserved.
  *
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
@@ -162,21 +162,61 @@ class JedcheckerRulesXMLManifest extends JEDcheckerRule
 			$this->report->addWarning($file, JText::_('COM_JEDCHECKER_MANIFEST_MISSED_METHOD_UPGRADE'));
 		}
 
-		// Check 'client' attribute is "site" or "administrator" (for module/template only)
-		if ($type === 'module' || $type === 'template')
+		switch ($type)
 		{
-			$client = (string) $xml['client'];
+			case 'module':
+			case 'template':
+				// Check 'client' attribute is "site" or "administrator" (for module/template only)
+				$client = (string) $xml['client'];
 
-			if (!isset($xml['client']))
-			{
-				$this->report->addError($file, JText::sprintf('COM_JEDCHECKER_MANIFEST_MISSED_ATTRIBUTE', $xml->getName(), 'client'));
-			}
-			elseif ($client !== 'site' && $client !== 'administrator')
-			{
-				$this->report->addError($file, JText::sprintf('COM_JEDCHECKER_MANIFEST_UNKNOWN_ATTRIBUTE_VALUE', $xml->getName(), 'client', $client));
-			}
+				if (!isset($xml['client']))
+				{
+					$this->report->addError($file, JText::sprintf('COM_JEDCHECKER_MANIFEST_MISSED_ATTRIBUTE', $xml->getName(), 'client'));
+				}
+				elseif ($client !== 'site' && $client !== 'administrator')
+				{
+					$this->report->addError($file, JText::sprintf('COM_JEDCHECKER_MANIFEST_UNKNOWN_ATTRIBUTE_VALUE', $xml->getName(), 'client', $client));
+				}
+				break;
+
+			case 'package':
+				// Check type-specific attributes
+				foreach ($xml->files->file as $item)
+				{
+					switch ((string) $item['type'])
+					{
+						case 'plugin':
+							if (!isset($item['group']))
+							{
+								$this->report->addError($file, JText::sprintf('COM_JEDCHECKER_MANIFEST_MISSED_ATTRIBUTE', $item->getName(), 'group'));
+							}
+							break;
+
+						case 'module':
+						case 'template':
+							$client = (string) $item['client'];
+
+							if (!isset($item['client']))
+							{
+								$this->report->addError($file, JText::sprintf('COM_JEDCHECKER_MANIFEST_MISSED_ATTRIBUTE', $item->getName(), 'client'));
+							}
+							elseif ($client !== 'site' && $client !== 'administrator')
+							{
+								$this->report->addError($file, JText::sprintf('COM_JEDCHECKER_MANIFEST_UNKNOWN_ATTRIBUTE_VALUE', $item->getName(), 'client', $client));
+							}
+							break;
+
+						case 'component':
+						case 'file':
+						case 'language':
+						case 'library':
+							break;
+
+						default:
+							$this->report->addError($file, JText::sprintf('COM_JEDCHECKER_MANIFEST_UNKNOWN_TYPE', $item['type']));
+					}
+				}
 		}
-
 		$data = json_decode(file_get_contents($jsonFilename), true);
 		$this->DTDNodeRules = $data['nodes'];
 		$this->DTDAttrRules = $data['attributes'];

From 23fec304c60c2432782f0580a00393ab302f1f8f Mon Sep 17 00:00:00 2001
From: Denis Ryabov <dryabov@yandex.ru>
Date: Thu, 25 Aug 2022 16:06:36 +0300
Subject: [PATCH 2/2] language packs require "client" attribute too

---
 .../com_jedchecker/libraries/rules/xmlmanifest.php           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_jedchecker/libraries/rules/xmlmanifest.php b/administrator/components/com_jedchecker/libraries/rules/xmlmanifest.php
index a4ae8a1..d970462 100644
--- a/administrator/components/com_jedchecker/libraries/rules/xmlmanifest.php
+++ b/administrator/components/com_jedchecker/libraries/rules/xmlmanifest.php
@@ -164,9 +164,10 @@ class JedcheckerRulesXMLManifest extends JEDcheckerRule
 
 		switch ($type)
 		{
+			case 'language':
 			case 'module':
 			case 'template':
-				// Check 'client' attribute is "site" or "administrator" (for module/template only)
+				// Check 'client' attribute is "site" or "administrator" (for language/module/template only)
 				$client = (string) $xml['client'];
 
 				if (!isset($xml['client']))
@@ -192,6 +193,7 @@ class JedcheckerRulesXMLManifest extends JEDcheckerRule
 							}
 							break;
 
+						case 'language':
 						case 'module':
 						case 'template':
 							$client = (string) $item['client'];
@@ -208,7 +210,6 @@ class JedcheckerRulesXMLManifest extends JEDcheckerRule
 
 						case 'component':
 						case 'file':
-						case 'language':
 						case 'library':
 							break;