fix phpcs

administrator/components/com_associations/Controller/AssociationMasterController.php

@@ -31,11 +31,11 @@ class AssociationMasterController extends BaseController
 	public function update()
 	{
 		$targetId = $this->input->get('targetId', '', 'int');
-		$masterId = $this->input->get('id', '' , 'int');
+		$masterId = $this->input->get('id', '', 'int');
 		$itemtype = $this->input->get('itemtype', '', 'string');
 
 		$this->getModel('associationmaster')->update($targetId, $masterId, $itemtype);
 
 		$this->setRedirect(Route::_('index.php?option=com_associations&view=associations', false));
 	}
-}
+}

administrator/components/com_associations/Helper/AssociationsHelper.php

@@ -219,7 +219,8 @@ private static function getExtensionRealName($extensionName)
 	 *
 	 * @since  3.7.0
 	 */
-	public static function getAssociationHtmlList($extensionName, $typeName, $itemId, $itemLanguage, $addLink = true, $assocLanguages = true, $assocState = 'all')
+	public static function getAssociationHtmlList($extensionName, $typeName, $itemId, $itemLanguage,
+		$addLink = true, $assocLanguages = true, $assocState = 'all')
 	{
 		// Get the associations list for this item.
 		$items   = self::getAssociationList($extensionName, $typeName, $itemId);
@@ -234,6 +235,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 
 		// Get the global master language, empty if not used
 		$globalMasterLang = Associations::getGlobalMasterLanguage();
+
 		// Check if versions are enabled
 		$saveHistory      = ComponentHelper::getParams($extensionName)->get('save_history', 0);
 		$context          = ($typeName === 'category') ? 'com_categories.item' : $extensionName . '.item';
@@ -252,7 +254,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 			$update     = false;
 			$masterInfo = '';
 
-			if(!$globalMasterLang)
+			if (!$globalMasterLang)
 			{
 				// Don't do for the reference language.
 				if ($langCode == $itemLanguage)
@@ -352,7 +354,8 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 					else
 					{
 						// When there is no associated master item, set it to target
-						if (!$masterId){
+						if (!$masterId)
+						{
 							$target        = $globalMasterLang . ':0:add';
 						}
 
@@ -364,7 +367,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 							if ($associatedModifiedMaster < $lastModifiedMaster)
 							{
 								// Don't display not corresponding item
-								if($assocState !== 'all' && $assocState !== 'outdated'){
+								if ($assocState !== 'all' && $assocState !== 'outdated'){
 									unset($items[$langCode]);
 									continue;
 								}
@@ -374,25 +377,27 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 								$target = $langCode . ':' . $items[$langCode]['id'] . ':edit';
 								$update = true;
 
-								// When versions are disabled than the modified date is used for the master item.
-								// That means that when no changes were made and the master item has been saved the modified date has been changed.
-								// So the outdated state means in that case there might have been made changes and it is necessary to check manually and update the target.
+								/*
+								When versions are disabled than the modified date is used for the master item.
+								That means that when no changes were made and the master item has been saved the modified date has been changed.
+								So the outdated state means in that case there might have been made changes and it is necessary to check manually and update the target.
+								*/
 								$masterInfo = $saveHistory
 									? $masterInfoSpace . Text::_('JGLOBAL_ASSOCIATIONS_STATE_OUTDATED_DESC')
 									: $masterInfoSpace . Text::_('JGLOBAL_ASSOCIATIONS_STATE_MIGHT_BE_OUTDATED_DESC');
 							}
 							else
 							{
 								// Don't display not corresponding item
-								if($assocState !== 'all' && $assocState !== 'up_to_date'){
+								if ($assocState !== 'all' && $assocState !== 'up_to_date'){
 									unset($items[$langCode]);
 									continue;
 								}
 
 								$additional .= $addLink && $allow ? Text::_('COM_ASSOCIATIONS_EDIT_ASSOCIATION') : '';
 								$masterInfo  = $masterInfoSpace . Text::_('JGLOBAL_ASSOCIATIONS_STATE_UP_TO_DATE_DESC');
 
-								// for item types that do not use modified date or versions like menu items
+								// For item types that do not use modified date or versions like menu items
 								if (!$associatedModifiedMaster)
 								{
 									$masterInfo  = '';

administrator/components/com_associations/Helper/MasterAssociationsHelper.php

@@ -29,9 +29,9 @@ class MasterAssociationsHelper extends ContentHelper
 	/**
 	 * Method to create a link for a child item that has no master item
 	 *
-	 * @param   string   $globalMasterLang The global master language
-	 * @param   integer  $itemId           The item id
-	 * @param   string   $itemType         The item type
+	 * @param   string   $globalMasterLang  The global master language
+	 * @param   integer  $itemId            The item id
+	 * @param   string   $itemType          The item type
 	 *
 	 * @return  string  the link for the not associated master item
 	 */
@@ -51,10 +51,10 @@ public static function addNotAssociatedMasterLink($globalMasterLang, $itemId, $i
 		$title      = Text::_('JGLOBAL_ASSOCIATIONS_STATE_NOT_ASSOCIATED_DESC');
 		$url        = self::getAssociationUrl($itemId, $globalMasterLang, $itemType);
 
-		$tooltip = '<strong>' . htmlspecialchars( $globalMasterLangInfos['title'], ENT_QUOTES, 'UTF-8') . '</strong><br>'
+		$tooltip = '<strong>' . htmlspecialchars( $globalMasterLangInfos['title'],ENT_QUOTES, 'UTF-8') . '</strong><br>'
 			. htmlspecialchars($title, ENT_QUOTES, 'UTF-8') . $masterInfo;
 
-		$link = '<a href="' . $url . '" title="' .  $globalMasterLangInfos['title'] . '" class="' . $classes . '">' . $text . '</a>'
+		$link = '<a href="' . $url . '" title="' . $globalMasterLangInfos['title'] . '" class="' . $classes . '">' . $text . '</a>'
 			. '<div role="tooltip" id="tip_no_Master">' . $tooltip . '</div>';
 
 		return $link;
@@ -67,7 +67,6 @@ public static function addNotAssociatedMasterLink($globalMasterLang, $itemId, $i
 	 * @param   string  $context       the association context
 	 *
 	 * @return  array  association with master dates
-	 *
 	 */
 	public static function getMasterDates($associations, $context)
 	{
@@ -86,7 +85,7 @@ public static function getMasterDates($associations, $context)
 				->where($db->quoteName('id') . ' = ' . $db->quote($id))
 				->where($db->quoteName('context') . ' = ' . $db->quote($context));
 			$db->setQuery($query);
-			$masterDates[$id] = $db->loadResult();;
+			$masterDates[$id] = $db->loadResult();
 		}
 
 		return $masterDates;
@@ -104,15 +103,15 @@ public static function getMasterDates($associations, $context)
 	 *
 	 * @return  array    master id and master dates for an associated item
 	 */
-	public static function getMasterValues($id, $dataId, $masterId, $masterModified, $assocMasterDates, $old_key) {
-
+	public static function getMasterValues($id, $dataId, $masterId, $masterModified, $assocMasterDates, $old_key)
+	{
 		if ($masterId)
 		{
 			// For the master item
 			if ($masterId === $id)
 			{
 				$masterIdValue = 0;
-				// set always the last modified date
+				// Set always the last modified date
 				$masterDateValue = $masterModified ?? null;
 			}
 
@@ -154,19 +153,19 @@ public static function getMasterValues($id, $dataId, $masterId, $masterModified,
 	 */
 	public static function getMasterModifiedDate($masterId, $tableName, $typeAlias)
 	{
-		// check if the content version is enabled
+		// Check if the content version is enabled
 		$option = Factory::getApplication()->input->get('option');
 		$saveHistory = ComponentHelper::getParams($option)->get('save_history', 0);
 
 		if ($masterId)
 		{
-			// if versions are enabled get the save_data of the master item from history table
+			// If versions are enabled get the save_data of the master item from history table
 			if ($saveHistory)
 			{
 				$typeId        = Table::getInstance('ContentType')->getTypeId($typeAlias);
 				$masterHistory = ContentHistoryHelper::getHistory($typeId, $masterId);
 
-				// latest saved date of the master item
+				// Latest saved date of the master item
 				$masterModified = $masterHistory[0]->save_date;
 			}
 			else
@@ -228,7 +227,7 @@ public static function setMasterAndChildInfos($itemId, $items, $key, $item, $glo
 		}
 		else
 		{
-			// get association state of child when a master exists
+			// Get association state of child when a master exists
 			if ($masterId && (array_key_exists($key, $assocMasterDates)) && (array_key_exists($masterId, $assocMasterDates)))
 			{
 				$associatedModifiedMaster = $assocMasterDates[$key];

administrator/components/com_associations/Model/AssociationMasterModel.php

@@ -25,16 +25,16 @@ class AssociationMasterModel extends BaseModel
 	/**
 	 * Update the childs modified date of the master item from #__associations table.
 	 *
-	 * @param   integer  $childId    The id of the item that gets updated
-	 * @param   integer  $masterId   The associated master item of the child item
-	 * @param   string   $itemtype   The component item type
+	 * @param   integer  $childId   The id of the item that gets updated
+	 * @param   integer  $masterId  The associated master item of the child item
+	 * @param   string   $itemtype  The component item type
 	 *
 	 * @return  boolean  True on success.
 	 *
 	 * @since  4.0
 	 */
-	public function update($childId, $masterId, $itemtype) {
-
+	public function update($childId, $masterId, $itemtype)
+	{
 		list($extensionName, $typeName) = explode('.', $itemtype, 2);
 
 		$context = ($typeName ==='category')
@@ -69,4 +69,4 @@ public function update($childId, $masterId, $itemtype) {
 
 		return true;
 	}
-}
+}

administrator/components/com_associations/Model/AssociationsModel.php

@@ -467,9 +467,9 @@ protected function getListQuery()
 
 				// Join over associations where id does not exists
 				$query->where('((' . $db->quoteName('asso.id') . ' IS NULL )'
-					// or if we are on the child language and there is no master language
+					// Or if we are on the child language and there is no master language
 					. ' OR ( ' . $db->quoteName('asso2.master_id') . ' = ' . $db->quote('-1') . ')'
-					// or a child of the master does not exist.
+					// Or a child of the master does not exist.
 					. ' OR ( ' . $db->quoteName('asso.key') . '  IN (' . $assocQuery . ') 
 						AND ' . $db->quoteName('asso.master_id') . ' = ' . $db->quote('0') . ')'
 					. ')');
@@ -481,7 +481,7 @@ protected function getListQuery()
 				// If we are on the masterlanguage and we check the state of the children
 				$query->where('((' . $db->quoteName('asso2.master_id') . ' = ' . $db->quoteName('asso.id')
 					. ' AND ' . $db->quoteName('asso2.master_date') . ' < ' . $db->quoteName('asso.master_date') . ')'
-					//  or we are on the child language and we check its state comparing to its master.
+					//  Or we are on the child language and we check its state comparing to its master.
 					. ' OR (' . $db->quoteName('asso.master_date') . ' < ' . $db->quoteName('asso2.master_date')
 					. ' AND ' . $db->quoteName('asso2.id') . ' = ' . $db->quoteName('asso.master_id') . '))');
 			}
@@ -492,7 +492,7 @@ protected function getListQuery()
 				// If we are on the masterlanguage and we check the state of the children
 				$query->where('((' . $db->quoteName('asso2.master_id') . ' = ' . $db->quoteName('asso.id')
 					. ' AND ' . $db->quoteName('asso2.master_date') . ' = ' . $db->quoteName('asso.master_date') . ')'
-					// or we are on the child language and we check its state comparing to its master.
+					// Or we are on the child language and we check its state comparing to its master.
 					. ' OR (' . $db->quoteName('asso.master_date') . ' = ' . $db->quoteName('asso2.master_date')
 					. ' AND ' . $db->quoteName('asso2.id') . ' = ' . $db->quoteName('asso.master_id') . '))');
 			}

administrator/components/com_associations/View/Association/HtmlView.php

@@ -171,11 +171,11 @@ public function display($tpl = null)
 			$task                   = $typeName . '.' . $this->targetAction;
 
 			// The update layout can only be set when a global master language is used.
-			// get version ids of the master item, when versions are enabled.
-			if($this->getLayout() === 'update'){
+			// Get version ids of the master item, when versions are enabled.
+			if ($this->getLayout() === 'update'){
 				$saveHistory = ComponentHelper::getParams($extensionName)->get('save_history', 0);
 
-				if($saveHistory)
+				if ($saveHistory)
 				{
 					$typeAlias = $typeName === 'category' ? $extensionName . '.' . $typeName : $reference['typeAlias'];
 					$model = $this->getModel();
@@ -229,7 +229,7 @@ protected function addToolbar()
 		$toolbar = Toolbar::getInstance('toolbar');
 
 		// The update layout can only be set when a global master language is used.
-		if($this->getLayout() === 'update')
+		if ($this->getLayout() === 'update')
 		{
 			// In the update view we can just save the target
 			$toolbar->appendButton(
@@ -238,9 +238,10 @@ protected function addToolbar()
 				. Text::_('COM_ASSOCIATIONS_SAVE_AND_UPDATE_TARGET') . '</button>', 'target'
 			);
 
-			// and when saving the target this button gets activated via js to update the master date for the child
+			// And when saving the target this button gets activated via js to update the master date for the child
 			$toolbar->appendButton(
-				'Custom', '<button class="btn btn-sm btn-success hidden" id="updateChild" onclick="Joomla.submitbutton(\'associationmaster.update\')"></button>', 'target'
+				'Custom', '<button class="btn btn-sm btn-success hidden" id="updateChild" 
+					onclick="Joomla.submitbutton(\'associationmaster.update\')"></button>', 'target'
 			);
 		}
 		else

administrator/components/com_associations/View/Associations/HtmlView.php

@@ -151,10 +151,10 @@ public function display($tpl = null)
 				unset($this->activeFilters['language']);
 				unset($this->activeFilters['assocstate']);
 
-				//Remove association state filter depending on global master language
+				// Remove association state filter depending on global master language
 				$globalMasterLang = Associations::getGlobalMasterLanguage();
 
-				if(!$globalMasterLang){
+				if (!$globalMasterLang){
 					$this->filterForm->removeField('assocstate', 'filter');
 				}
 
@@ -269,8 +269,7 @@ protected function addToolbar()
 				->text('COM_ASSOCIATIONS_PURGE')
 				->message((isset($this->extensionName) && isset($languageKey))
 						? Text::plural('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT', (Text::_($this->extensionName) . ' > ' . Text::_($languageKey)))
-						: Text::_('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT')
-				)
+						: Text::_('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT'))
 				->task('associations.purge');
 			ToolbarHelper::custom('associations.clean', 'refresh', 'refresh', 'COM_ASSOCIATIONS_DELETE_ORPHANS', false, false);
 			ToolbarHelper::preferences('com_associations');

administrator/components/com_categories/Model/CategoryModel.php

@@ -699,8 +699,10 @@ public function save($data)
 				{
 					$masterIdAndDateValues = MasterAssociationsHelper::getMasterValues($id, $dataId, $masterId, $masterModified, $assocMasterDates, $oldKey);
 
-					$query->values(((int) $id) . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key) . ','
-						. $db->quote($masterIdAndDateValues[0]) . ',' . $db->quote($masterIdAndDateValues[1]));
+					$query->values(
+						((int) $id) . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key) . ','
+						. $db->quote($masterIdAndDateValues[0]) . ',' . $db->quote($masterIdAndDateValues[1])
+					);
 				}
 
 				$db->setQuery($query);

administrator/components/com_categories/Service/HTML/AdministratorService.php

@@ -113,14 +113,17 @@ public function association($catid, $extension = 'com_content')
 							continue;
 						}
 
-						$classMasterInfoItems = MasterAssociationsHelper::setMasterAndChildInfos($catid, $items, $key, $item,
-							$globalMasterLang, $isMaster, $masterId, $assocMasterDates, $saveHistory);
+						$classMasterInfoItems = MasterAssociationsHelper::setMasterAndChildInfos(
+							$catid, $items, $key, $item, $globalMasterLang, $isMaster, $masterId, $assocMasterDates, $saveHistory
+						);
 						$labelClass  = $classMasterInfoItems[0];
 						$masterInfo  = $classMasterInfoItems[1];
 						$items       = $classMasterInfoItems[2];
 						$needsUpdate = $classMasterInfoItems[3];
 
-						$url = MasterAssociationsHelper::getAssociationUrl($item->id, $globalMasterLang, $extension . '.category', $item->lang_code, $key, $masterId, $needsUpdate);
+						$url = MasterAssociationsHelper::getAssociationUrl(
+							$item->id, $globalMasterLang, $extension . '.category', $item->lang_code, $key, $masterId, $needsUpdate
+						);
 					}
 
 					$text    = $item->lang_sef ? strtoupper($item->lang_sef) : 'XX';

administrator/components/com_contact/Service/HTML/AdministratorService.php

@@ -116,14 +116,17 @@ public function association($contactid)
 							continue;
 						}
 
-						$classMasterInfoItems = MasterAssociationsHelper::setMasterAndChildInfos($contactid, $items, $key, $item,
-							$globalMasterLang, $isMaster, $masterId, $assocMasterDates, $saveHistory);
+						$classMasterInfoItems = MasterAssociationsHelper::setMasterAndChildInfos(
+							$contactid, $items, $key, $item, $globalMasterLang, $isMaster, $masterId, $assocMasterDates, $saveHistory
+						);
 						$labelClass  = $classMasterInfoItems[0];
 						$masterInfo  = $classMasterInfoItems[1];
 						$items       = $classMasterInfoItems[2];
 						$needsUpdate = $classMasterInfoItems[3];
 
-						$url = MasterAssociationsHelper::getAssociationUrl($item->id, $globalMasterLang, 'com_contact.contact', $item->lang_code, $key, $masterId, $needsUpdate);
+						$url = MasterAssociationsHelper::getAssociationUrl(
+							$item->id, $globalMasterLang, 'com_contact.contact', $item->lang_code, $key, $masterId, $needsUpdate
+						);
 					}
 
 					$text    = strtoupper($item->lang_sef);
@@ -147,7 +150,7 @@ public function association($contactid)
 				{
 					$link = MasterAssociationsHelper::addNotAssociatedMasterLink($globalMasterLang, $contactid, 'com_contact.contact');
 
-					// add this on the top of the array
+					// Add this on the top of the array
 					$items = array('master' => array('link' => $link)) + $items;
 				}
 			}