Replace unnecessary double quotes in libraries/cms (#13235)

frankmayer · rdeutz · commit 88014d272241 · 2016-12-16T15:20:58.000+01:00
* Replace unnecessary double quotes

* Reverted some double quotes-replacements
diff --git a/libraries/cms/editor/editor.php b/libraries/cms/editor/editor.php
@@ -261,7 +261,7 @@ public function initialise()
 
 		$document = JFactory::getDocument();
 
-		if (method_exists($document, "addCustomTag") && !empty($return))
+		if (method_exists($document, 'addCustomTag') && !empty($return))
 		{
 			$document->addCustomTag($return);
 		}
diff --git a/libraries/cms/form/field/limitbox.php b/libraries/cms/form/field/limitbox.php
@@ -80,7 +80,7 @@ protected function getOptions()
 			asort($limits);
 
 			// Add an option to show all?
-			$showAll = isset($this->element['showall']) ? ($this->element['showall'] == "true") : true;
+			$showAll = isset($this->element['showall']) ? ($this->element['showall'] == 'true') : true;
 
 			if ($showAll)
 			{
diff --git a/libraries/cms/form/rule/password.php b/libraries/cms/form/rule/password.php
@@ -137,7 +137,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 		// Minimum number of upper case ASCII characters required
 		if (!empty($minimumUppercase))
 		{
-			$nUppercase = preg_match_all("/[A-Z]/", $value, $umatch);
+			$nUppercase = preg_match_all('/[A-Z]/', $value, $umatch);
 
 			if ($nUppercase < $minimumUppercase)
 			{
diff --git a/libraries/cms/helper/tags.php b/libraries/cms/helper/tags.php
@@ -583,7 +583,7 @@ public function getTagItemsQuery($tagId, $typesr = null, $includeChildren = fals
 
 			// Join over the users for the author and email
 			->select("CASE WHEN c.core_created_by_alias > ' ' THEN c.core_created_by_alias ELSE ua.name END AS author")
-			->select("ua.email AS author_email")
+			->select('ua.email AS author_email')
 
 			->join('LEFT', '#__users AS ua ON ua.id = c.core_created_user_id')
 
diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php
@@ -79,7 +79,7 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title
 			$html[] = $tip ? ' title="' . $title . '"' : '';
 			$html[] = '>';
 
-			if ($active_class == "protected")
+			if ($active_class == 'protected')
 			{
 				$html[] = '<span class="icon-lock"></span>';
 			}
diff --git a/libraries/cms/html/list.php b/libraries/cms/html/list.php
@@ -31,7 +31,7 @@ abstract class JHtmlList
 	 *
 	 * @since   1.5
 	 */
-	public static function images($name, $active = null, $javascript = null, $directory = null, $extensions = "bmp|gif|jpg|png")
+	public static function images($name, $active = null, $javascript = null, $directory = null, $extensions = 'bmp|gif|jpg|png')
 	{
 		if (!$directory)
 		{
@@ -109,7 +109,7 @@ public static function genericordering($query, $chop = 30)
 
 			if (StringHelper::strlen($items[$i]->text) > $chop)
 			{
-				$text = StringHelper::substr($items[$i]->text, 0, $chop) . "...";
+				$text = StringHelper::substr($items[$i]->text, 0, $chop) . '...';
 			}
 			else
 			{
diff --git a/libraries/cms/html/select.php b/libraries/cms/html/select.php
@@ -686,7 +686,7 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele
 				$splitText = explode(' - ', $text, 2);
 				$text = $splitText[0];
 
-				if (isset($splitText[1]) && $splitText[1] != "" && !preg_match('/^[\s]+$/', $splitText[1]))
+				if (isset($splitText[1]) && $splitText[1] != '' && !preg_match('/^[\s]+$/', $splitText[1]))
 				{
 					$text .= ' - ' . $splitText[1];
 				}
diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
@@ -95,7 +95,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
 				$openedTags = $result[1];
 
 				// Some tags self close so they do not need a separate close tag.
-				$openedTags = array_diff($openedTags, array("img", "hr", "br"));
+				$openedTags = array_diff($openedTags, array('img', 'hr', 'br'));
 				$openedTags = array_values($openedTags);
 
 				// Put all closed tags into an array
@@ -118,7 +118,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
 				{
 					if (!in_array($openedTags[$i], $closedTags))
 					{
-						$tmp .= "</" . $openedTags[$i] . ">";
+						$tmp .= '</' . $openedTags[$i] . '>';
 					}
 					else
 					{
diff --git a/libraries/cms/html/tabs.php b/libraries/cms/html/tabs.php
@@ -87,8 +87,8 @@ protected static function loadBehavior($group, $params = array())
 			$opt['onActive']            = (isset($params['onActive'])) ? '\\' . $params['onActive'] : null;
 			$opt['onBackground']        = (isset($params['onBackground'])) ? '\\' . $params['onBackground'] : null;
 			$opt['display']             = (isset($params['startOffset'])) ? (int) $params['startOffset'] : null;
-			$opt['titleSelector']       = "dt.tabs";
-			$opt['descriptionSelector'] = "dd.tabs";
+			$opt['titleSelector']       = 'dt.tabs';
+			$opt['descriptionSelector'] = 'dd.tabs';
 
 			// When use storage is set and value is false - By default we allow to use storage
 			$opt['useStorage'] = (isset($params['useCookie']) && !$params['useCookie']) ? false : true;
diff --git a/libraries/cms/html/tag.php b/libraries/cms/html/tag.php
@@ -164,8 +164,8 @@ public static function tags($config = array('filter.published' => array(0, 1)))
 	public static function ajaxfield($selector = '#jform_tags', $allowCustom = true)
 	{
 		// Get the component parameters
-		$params = JComponentHelper::getParams("com_tags");
-		$minTermLength = (int) $params->get("min_term_length", 3);
+		$params = JComponentHelper::getParams('com_tags');
+		$minTermLength = (int) $params->get('min_term_length', 3);
 
 		$displayData = array(
 			'minTermLength' => $minTermLength,
diff --git a/libraries/cms/installer/adapter/component.php b/libraries/cms/installer/adapter/component.php
@@ -1151,7 +1151,7 @@ protected function _updateSiteMenus($component_id = null)
 		$query = $db->getQuery(true)
 					->update('#__menu')
 					->set('component_id = ' . $db->quote($component_id))
-					->where("type = " . $db->quote('component'))
+					->where('type = ' . $db->quote('component'))
 					->where('client_id = 0')
 					->where('link LIKE ' . $db->quote('index.php?option=' . $option)
 							. " OR link LIKE '" . $db->escape('index.php?option=' . $option . '&') . "%'");
diff --git a/libraries/cms/installer/script.php b/libraries/cms/installer/script.php
@@ -118,7 +118,7 @@ public function preflight($type, $parent)
 		}
 
 		// Extension manifest file version
-		$this->release = $parent->get("manifest")->version;
+		$this->release = $parent->get('manifest')->version;
 		$extensionType = substr($this->extension, 0, 3);
 
 		// Modules parameters are located in the module table - else in the extension table
diff --git a/libraries/cms/layout/file.php b/libraries/cms/layout/file.php
@@ -108,7 +108,7 @@ public function render($displayData = array())
 
 		if ($this->isDebugEnabled())
 		{
-			echo "<pre>" . $this->renderDebugMessages() . "</pre>";
+			echo '<pre>' . $this->renderDebugMessages() . '</pre>';
 		}
 
 		// Nothing to show
diff --git a/libraries/cms/less/formatter/joomla.php b/libraries/cms/less/formatter/joomla.php
@@ -22,9 +22,9 @@ class JLessFormatterJoomla extends lessc_formatter_classic
 
 	public $breakSelectors = true;
 
-	public $assignSeparator = ": ";
+	public $assignSeparator = ': ';
 
-	public $selectorSeparator = ",";
+	public $selectorSeparator = ',';
 
 	public $indentChar = "\t";
 }
diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
@@ -694,7 +694,7 @@ protected function createUri($url)
 
 		foreach ($vars as $key => $var)
 		{
-			if ($var == "")
+			if ($var == '')
 			{
 				unset($vars[$key]);
 			}
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
@@ -497,7 +497,7 @@ protected function buildSefRoute(&$uri)
 		$crouter   = $this->getComponentRouter($component);
 		$parts     = $crouter->build($query);
 		$result    = implode('/', $parts);
-		$tmp       = ($result != "") ? $result : '';
+		$tmp       = ($result != '') ? $result : '';
 
 		// Build the application route
 		$built = false;
diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/cms/schema/changeitem/mysql.php
@@ -229,7 +229,7 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == "integer" && strtolower(substr($type2, 0, 8)) == 'unsigned')
+		if (strtolower($type1) == 'integer' && strtolower(substr($type2, 0, 8)) == 'unsigned')
 		{
 			$result = 'int(10) unsigned';
 		}
diff --git a/libraries/cms/table/corecontent.php b/libraries/cms/table/corecontent.php
@@ -132,10 +132,10 @@ public function check()
 			// Only process if not empty
 
 			// Array of characters to remove
-			$bad_characters = array("\n", "\r", "\"", "<", ">");
+			$bad_characters = array("\n", "\r", "\"", '<', '>');
 
 			// Remove bad characters
-			$after_clean = StringHelper::str_ireplace($bad_characters, "", $this->core_metakey);
+			$after_clean = StringHelper::str_ireplace($bad_characters, '', $this->core_metakey);
 
 			// Create array using commas as delimiter
 			$keys = explode(',', $after_clean);
@@ -151,7 +151,7 @@ public function check()
 				}
 			}
 			// Put array back together delimited by ", "
-			$this->core_metakey = implode(", ", $clean_keys);
+			$this->core_metakey = implode(', ', $clean_keys);
 		}
 
 		return true;

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ public function initialise()`
`261`	`261`
`262`	`262`	`$document = JFactory::getDocument();`
`263`	`263`
`264`		`- if (method_exists($document, "addCustomTag") && !empty($return))`
	`264`	`+ if (method_exists($document, 'addCustomTag') && !empty($return))`
`265`	`265`	`{`
`266`	`266`	`$document->addCustomTag($return);`
`267`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ protected function getOptions()`
`80`	`80`	`asort($limits);`
`81`	`81`
`82`	`82`	`// Add an option to show all?`
`83`		`- $showAll = isset($this->element['showall']) ? ($this->element['showall'] == "true") : true;`
	`83`	`+ $showAll = isset($this->element['showall']) ? ($this->element['showall'] == 'true') : true;`
`84`	`84`
`85`	`85`	`if ($showAll)`
`86`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry`
`137`	`137`	`// Minimum number of upper case ASCII characters required`
`138`	`138`	`if (!empty($minimumUppercase))`
`139`	`139`	`{`
`140`		`- $nUppercase = preg_match_all("/[A-Z]/", $value, $umatch);`
	`140`	`+ $nUppercase = preg_match_all('/[A-Z]/', $value, $umatch);`
`141`	`141`
`142`	`142`	`if ($nUppercase < $minimumUppercase)`
`143`	`143`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title`
`79`	`79`	`$html[] = $tip ? ' title="' . $title . '"' : '';`
`80`	`80`	`$html[] = '>';`
`81`	`81`
`82`		`- if ($active_class == "protected")`
	`82`	`+ if ($active_class == 'protected')`
`83`	`83`	`{`
`84`	`84`	`$html[] = '<span class="icon-lock"></span>';`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ abstract class JHtmlList`
`31`	`31`	`*`
`32`	`32`	`* @since 1.5`
`33`	`33`	`*/`
`34`		`- public static function images($name, $active = null, $javascript = null, $directory = null, $extensions = "bmp\|gif\|jpg\|png")`
	`34`	`+ public static function images($name, $active = null, $javascript = null, $directory = null, $extensions = 'bmp\|gif\|jpg\|png')`
`35`	`35`	`{`
`36`	`36`	`if (!$directory)`
`37`	`37`	`{`
`@@ -109,7 +109,7 @@ public static function genericordering($query, $chop = 30)`
`109`	`109`
`110`	`110`	`if (StringHelper::strlen($items[$i]->text) > $chop)`
`111`	`111`	`{`
`112`		`- $text = StringHelper::substr($items[$i]->text, 0, $chop) . "...";`
	`112`	`+ $text = StringHelper::substr($items[$i]->text, 0, $chop) . '...';`
`113`	`113`	`}`
`114`	`114`	`else`
`115`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -686,7 +686,7 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele`
`686`	`686`	`$splitText = explode(' - ', $text, 2);`
`687`	`687`	`$text = $splitText[0];`
`688`	`688`
`689`		`- if (isset($splitText[1]) && $splitText[1] != "" && !preg_match('/^[\s]+$/', $splitText[1]))`
	`689`	`+ if (isset($splitText[1]) && $splitText[1] != '' && !preg_match('/^[\s]+$/', $splitText[1]))`
`690`	`690`	`{`
`691`	`691`	`$text .= ' - ' . $splitText[1];`
`692`	`692`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml`
`95`	`95`	`$openedTags = $result[1];`
`96`	`96`
`97`	`97`	`// Some tags self close so they do not need a separate close tag.`
`98`		`- $openedTags = array_diff($openedTags, array("img", "hr", "br"));`
	`98`	`+ $openedTags = array_diff($openedTags, array('img', 'hr', 'br'));`
`99`	`99`	`$openedTags = array_values($openedTags);`
`100`	`100`
`101`	`101`	`// Put all closed tags into an array`
`@@ -118,7 +118,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml`
`118`	`118`	`{`
`119`	`119`	`if (!in_array($openedTags[$i], $closedTags))`
`120`	`120`	`{`
`121`		`- $tmp .= "</" . $openedTags[$i] . ">";`
	`121`	`+ $tmp .= '</' . $openedTags[$i] . '>';`
`122`	`122`	`}`
`123`	`123`	`else`
`124`	`124`	`{`