From b01f673862dae1c9b6784c01c4376b6ef2b194db Mon Sep 17 00:00:00 2001 From: HermanPeeren Date: Sat, 20 Sep 2025 16:59:45 +0200 Subject: [PATCH 1/8] th and td tags corrected in list view --- .../components/com_ccm/tmpl/cmss/default.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/administrator/components/com_ccm/tmpl/cmss/default.php b/src/administrator/components/com_ccm/tmpl/cmss/default.php index be6f8c5..5cbd76e 100644 --- a/src/administrator/components/com_ccm/tmpl/cmss/default.php +++ b/src/administrator/components/com_ccm/tmpl/cmss/default.php @@ -38,15 +38,20 @@ + - - @@ -57,11 +62,11 @@ - From f3da29391e4342c777e9590c56cc0ad4d4ae9872 Mon Sep 17 00:00:00 2001 From: HermanPeeren Date: Sat, 20 Sep 2025 17:01:50 +0200 Subject: [PATCH 2/8] alpha sort use cases in tests --- tests/Unit/Component/Ccm/Administrator/Model/CmsModelTest.php | 2 +- .../Unit/Component/Ccm/Administrator/Model/CmssModelTest.php | 4 ++-- .../Component/Ccm/Administrator/Model/MigrationModelTest.php | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/Unit/Component/Ccm/Administrator/Model/CmsModelTest.php b/tests/Unit/Component/Ccm/Administrator/Model/CmsModelTest.php index e63e17e..bd37600 100644 --- a/tests/Unit/Component/Ccm/Administrator/Model/CmsModelTest.php +++ b/tests/Unit/Component/Ccm/Administrator/Model/CmsModelTest.php @@ -1,10 +1,10 @@ Date: Sat, 20 Sep 2025 17:03:39 +0200 Subject: [PATCH 3/8] admin menu nested --- src/administrator/components/com_ccm/ccm.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/administrator/components/com_ccm/ccm.xml b/src/administrator/components/com_ccm/ccm.xml index b35f6ac..77de63e 100644 --- a/src/administrator/components/com_ccm/ccm.xml +++ b/src/administrator/components/com_ccm/ccm.xml @@ -1,11 +1,11 @@ - COM_CCM + com_ccm 2025-05-14 Joomla! Project joomla@example.com GNU General Public License version 2 or later; see LICENSE.txt - 1.0.1 + 0.10.0 COM_CCM_DESCRIPTION Joomla\Component\CCM @@ -42,7 +42,7 @@ language/en-GB/com_ccm.sys.ini language/en-GB/com_ccm.ini - COM_CCM_MENU_BACKEND + COM_CCM_MENU_BACKEND COM_CCM_SUBMENU_CMS COM_CCM_SUBMENU_MIGRATION From 205852692b2477a6ecb2a265a12515dd97e23e46 Mon Sep 17 00:00:00 2001 From: HermanPeeren Date: Sat, 20 Sep 2025 17:04:35 +0200 Subject: [PATCH 4/8] only some language strings in .sys.ini, rest in .ini --- .../com_ccm/language/en-GB/com_ccm.ini | 10 +++---- .../com_ccm/language/en-GB/com_ccm.sys.ini | 29 ++----------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/src/administrator/components/com_ccm/language/en-GB/com_ccm.ini b/src/administrator/components/com_ccm/language/en-GB/com_ccm.ini index 112089a..86fe5b4 100644 --- a/src/administrator/components/com_ccm/language/en-GB/com_ccm.ini +++ b/src/administrator/components/com_ccm/language/en-GB/com_ccm.ini @@ -1,10 +1,11 @@ -COM_CCM="CMS Migration" +COM_CCM="CMS Content Migration" COM_CCM_APPLY_MIGRATION_BTN="Apply Migration" COM_CCM_CMS_ID="CMS ID" COM_CCM_CMS_NAME="CMS Name" COM_CCM_CMS_NAME_ADD="Add new CMS" COM_CCM_CMS_NAME_EDIT="Edit CMS" COM_CCM_CMS_NAME_LIST="CMS Names List" +COM_CCM_CMSS_TABLE_CAPTION="Content Management Systems" COM_CCM_CONFIG_CCM_MAPPED_FIELDS_LABEL="CCM Mapped Fields" COM_CCM_CONFIG_CCM_MAPPING_LABEL="CCM Mapping" COM_CCM_CONFIG_CCM_UNMAPPED_FIELDS_LABEL="CCM Unmapped Fields" @@ -16,14 +17,11 @@ COM_CCM_CONFIG_MIGRATION_LABEL="Select CMS you want to migrate with" COM_CCM_CONFIG_NAME_LABEL="CMS Name" COM_CCM_CONFIG_URL_LABEL="CMS URL" COM_CCM_CONFIGURATION="CCM Migration Configuration" -COM_CCM_DESCRIPTION="CONTENT MIGRATION COMPONENT" +COM_CCM_DESCRIPTION="CMS Content Migration . Migrating content via the web services API from a source CMS to a target CMS." COM_CCM_FILTER_SEARCH="Search" -COM_CCM_MENU_BACKEND="CMSs" COM_CCM_MIGRATION_FIELDSET_LABEL="Migration Settings" COM_CCM_MIGRATION_SOURCE_CMS="Source CMS" COM_CCM_MIGRATION_TARGET_CMS="Target CMS" COM_CCM_OPTIONS="Options" -COM_CCM_SUBMENU_CMS="CMS Management" -COM_CCM_SUBMENU_MIGRATION="Migration" COM_CCM_TITLE_CMS="Content Management Systems" -COM_CCM_TITLE_MIGRATION="Content Migration" \ No newline at end of file +COM_CCM_TITLE_MIGRATION="Content Migration" diff --git a/src/administrator/components/com_ccm/language/en-GB/com_ccm.sys.ini b/src/administrator/components/com_ccm/language/en-GB/com_ccm.sys.ini index 7c6d37b..73e4d0e 100644 --- a/src/administrator/components/com_ccm/language/en-GB/com_ccm.sys.ini +++ b/src/administrator/components/com_ccm/language/en-GB/com_ccm.sys.ini @@ -1,28 +1,5 @@ -COM_CCM="CMS Migration" -COM_CCM_APPLY_MIGRATION_BTN="Apply Migration" -COM_CCM_CMS_ID="CMS ID" -COM_CCM_CMS_NAME="CMS Name" -COM_CCM_CMS_NAME_ADD="Add new CMS" -COM_CCM_CMS_NAME_EDIT="Edit CMS" -COM_CCM_CMS_NAME_LIST="CMS Names List" -COM_CCM_CONFIG_CCM_MAPPED_FIELDS_LABEL="CCM Mapped Fields" -COM_CCM_CONFIG_CCM_MAPPING_LABEL="CCM Mapping" -COM_CCM_CONFIG_CCM_UNMAPPED_FIELDS_LABEL="CCM Unmapped Fields" -COM_CCM_CONFIG_CMS_NAME_DESCRIPTION="The name of the CMS to migrate from." -COM_CCM_CONFIG_CREDENTIALS_LABEL="Credentials" -COM_CCM_CONFIG_ID_LABEL="CMS ID" -COM_CCM_CONFIG_MIGRATION_LABEL="Select CMS you want to migrate with" -COM_CCM_CONFIG_NAME_LABEL="CMS Name" -COM_CCM_CONFIG_URL_LABEL="CMS URL" -COM_CCM_CONFIGURATION="CCM Migration Configuration" -COM_CCM_DESCRIPTION="CONTENT MIGRATION COMPONENT" -COM_CCM_FILTER_SEARCH="Search" -COM_CCM_MENU_BACKEND="CMSs" -COM_CCM_MIGRATION_FIELDSET_LABEL="Migration Settings" -COM_CCM_MIGRATION_SOURCE_CMS="Source CMS" -COM_CCM_MIGRATION_TARGET_CMS="Target CMS" -COM_CCM_OPTIONS="Options" +COM_CCM="CMS Content Migration" +COM_CCM_DESCRIPTION="CMS Content Migration . Migrating content via the web services API from a source CMS to a target CMS." +COM_CCM_MENU_BACKEND="CMS Content Migration" COM_CCM_SUBMENU_CMS="CMS Management" COM_CCM_SUBMENU_MIGRATION="Migration" -COM_CCM_TITLE_CMS="Content Management Systems" -COM_CCM_TITLE_MIGRATION="Content Migration" \ No newline at end of file From a4167b27553fbb7a1d0893060f301b2ac3184b8a Mon Sep 17 00:00:00 2001 From: HermanPeeren Date: Sat, 20 Sep 2025 17:05:39 +0200 Subject: [PATCH 5/8] no help-key in config --- src/administrator/components/com_ccm/config.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/administrator/components/com_ccm/config.xml b/src/administrator/components/com_ccm/config.xml index 5ce7581..e002f5a 100644 --- a/src/administrator/components/com_ccm/config.xml +++ b/src/administrator/components/com_ccm/config.xml @@ -1,11 +1,7 @@ - +
- +
-
+ \ No newline at end of file From 91885bcf26ce599a0eb036c1885289d388297366 Mon Sep 17 00:00:00 2001 From: HermanPeeren Date: Sat, 20 Sep 2025 17:06:39 +0200 Subject: [PATCH 6/8] deleted unnecessary file --- .../components/com_ccm/src/Service/Router.php | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 src/administrator/components/com_ccm/src/Service/Router.php diff --git a/src/administrator/components/com_ccm/src/Service/Router.php b/src/administrator/components/com_ccm/src/Service/Router.php deleted file mode 100644 index 4b4b8bf..0000000 --- a/src/administrator/components/com_ccm/src/Service/Router.php +++ /dev/null @@ -1,24 +0,0 @@ - - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -namespace Joomla\Component\CCM\Administrator\Service; - -// phpcs:disable PSR1.Files.SideEffects -\defined('_JEXEC') or die; -// phpcs:enable PSR1.Files.SideEffects - -use Joomla\CMS\Router\ApiRouter; -use Joomla\CMS\Router\Route; -use Joomla\CMS\Component\Router\RouterView; - -return new ApiRouter([ - 'cmss' => [ - 'controller' => 'cmss', // This should match your controller/resource - ], -]); \ No newline at end of file From 26806af05cac03e225bde2acec96c05cac86d039 Mon Sep 17 00:00:00 2001 From: HermanPeeren Date: Sat, 20 Sep 2025 17:07:34 +0200 Subject: [PATCH 7/8] changed non-breaking spaces to spaces --- src/administrator/components/com_ccm/access.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/administrator/components/com_ccm/access.xml b/src/administrator/components/com_ccm/access.xml index 8273988..754b0f6 100644 --- a/src/administrator/components/com_ccm/access.xml +++ b/src/administrator/components/com_ccm/access.xml @@ -1,11 +1,11 @@ -    
-         -         -         -         -         -         -    
+
+ + + + + + +
\ No newline at end of file From 05489a519423682f959ebb6797e260518a2feebf Mon Sep 17 00:00:00 2001 From: HermanPeeren Date: Sat, 20 Sep 2025 17:12:35 +0200 Subject: [PATCH 8/8] minor improvements in docblocks and comments --- .../components/com_ccm/src/Controller/CmsController.php | 4 ++++ .../components/com_ccm/src/Controller/CmssController.php | 2 +- .../components/com_ccm/src/Controller/DisplayController.php | 4 ++-- .../components/com_ccm/src/Extension/CCMComponent.php | 2 +- src/administrator/components/com_ccm/src/Fields/CcmField.php | 2 +- src/administrator/components/com_ccm/src/Fields/CmsField.php | 2 +- .../components/com_ccm/src/Fields/CmsObjTypeField.php | 2 +- .../components/com_ccm/src/Helper/MigrationHelper.php | 3 +++ 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/administrator/components/com_ccm/src/Controller/CmsController.php b/src/administrator/components/com_ccm/src/Controller/CmsController.php index 5a3299c..e602ebb 100644 --- a/src/administrator/components/com_ccm/src/Controller/CmsController.php +++ b/src/administrator/components/com_ccm/src/Controller/CmsController.php @@ -14,6 +14,8 @@ // phpcs:enable PSR1.Files.SideEffects use Joomla\CMS\MVC\Controller\FormController; +use Joomla\Component\CCM\Administrator\Model\CmsModel; + class CmsController extends FormController { protected function getRedirectToListAppend() @@ -38,6 +40,8 @@ public function migrate() * @param string $urlVar The name of the URL variable if different from the primary key. * * @return void + * + * @since 1.0.0 */ public function save($key = null, $urlVar = null) { diff --git a/src/administrator/components/com_ccm/src/Controller/CmssController.php b/src/administrator/components/com_ccm/src/Controller/CmssController.php index fb6b0ad..5c4a13e 100644 --- a/src/administrator/components/com_ccm/src/Controller/CmssController.php +++ b/src/administrator/components/com_ccm/src/Controller/CmssController.php @@ -18,7 +18,7 @@ /** * CmssController class. * - * @since __DEV__ + * @since 1.0.0 */ class CmssController extends ListController { diff --git a/src/administrator/components/com_ccm/src/Controller/DisplayController.php b/src/administrator/components/com_ccm/src/Controller/DisplayController.php index ac1d800..3d07028 100644 --- a/src/administrator/components/com_ccm/src/Controller/DisplayController.php +++ b/src/administrator/components/com_ccm/src/Controller/DisplayController.php @@ -22,7 +22,7 @@ class DisplayController extends BaseController * The default view. * * @var string - * @since __DEV__ + * @since 1.0.0 */ protected $default_view = 'Cmss'; @@ -34,7 +34,7 @@ class DisplayController extends BaseController * * @return static This object to support chaining. * - * @since __DEV__ + * @since 1.0.0 */ public function display($cachable = false, $urlparams = []) { diff --git a/src/administrator/components/com_ccm/src/Extension/CCMComponent.php b/src/administrator/components/com_ccm/src/Extension/CCMComponent.php index 8297ed3..8eda05b 100644 --- a/src/administrator/components/com_ccm/src/Extension/CCMComponent.php +++ b/src/administrator/components/com_ccm/src/Extension/CCMComponent.php @@ -29,7 +29,7 @@ public function boot(ContainerInterface $container) { * * @return array * - * @since __DEV__ + * @since 1.0.0 */ public function getContexts(): array { diff --git a/src/administrator/components/com_ccm/src/Fields/CcmField.php b/src/administrator/components/com_ccm/src/Fields/CcmField.php index fc159da..8d66344 100644 --- a/src/administrator/components/com_ccm/src/Fields/CcmField.php +++ b/src/administrator/components/com_ccm/src/Fields/CcmField.php @@ -20,7 +20,7 @@ // what if data is null (e.g. image), then I can't get its type class CcmField extends ListField { - // define a custom form field + // the name of the type for our new field protected $type = 'ccm'; diff --git a/src/administrator/components/com_ccm/src/Fields/CmsField.php b/src/administrator/components/com_ccm/src/Fields/CmsField.php index d2b3785..384395b 100644 --- a/src/administrator/components/com_ccm/src/Fields/CmsField.php +++ b/src/administrator/components/com_ccm/src/Fields/CmsField.php @@ -16,7 +16,7 @@ use Joomla\CMS\Form\Field\ListField; class CmsField extends ListField { // this should be named CmsNameField - // define a custom form field + // the name of the type for our new field protected $type = 'cms'; diff --git a/src/administrator/components/com_ccm/src/Fields/CmsObjTypeField.php b/src/administrator/components/com_ccm/src/Fields/CmsObjTypeField.php index f8e1c86..e4b768f 100644 --- a/src/administrator/components/com_ccm/src/Fields/CmsObjTypeField.php +++ b/src/administrator/components/com_ccm/src/Fields/CmsObjTypeField.php @@ -16,7 +16,7 @@ use Joomla\CMS\Form\Field\ListField; class CmsObjTypeField extends ListField { - // define a custom form field + // the name of the type for our new field protected $type = 'cmsobjtype'; diff --git a/src/administrator/components/com_ccm/src/Helper/MigrationHelper.php b/src/administrator/components/com_ccm/src/Helper/MigrationHelper.php index 99473fe..6c6a62b 100644 --- a/src/administrator/components/com_ccm/src/Helper/MigrationHelper.php +++ b/src/administrator/components/com_ccm/src/Helper/MigrationHelper.php @@ -26,7 +26,10 @@ class MigrationHelper * Parse credentials for HTTP authentication headers. * * @param string $credentials Credentials string (token or username:password) + * * @return array Headers array for HTTP requests + * + * @since 1.0.0 */ public static function parseAuthentication($credentials) {
+ , + , + +
+ - - + + +
id); ?> + escape($item->name); ?> - + id; ?>