Skip to content
This repository

Remove trailing commas in arrays and make sure there's a space after ever #413

Merged
merged 1 commit into from almost 3 years ago

2 participants

Rouven Weßling Louis Landry
Rouven Weßling
Collaborator

Remove trailing commas in arrays and make sure there's a space after every comma.

Louis Landry LouisLandry merged commit 756b20a into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Oct 01, 2011
Rouven Weßling realityking Remove trailing commas in arrays and make sure there's a space after …
…every comma.
211d3f5
This page is out of date. Refresh to see the latest.
4 libraries/joomla/cache/storage/file.php
@@ -532,7 +532,7 @@ protected function _cleanPath($path, $ds = DS)
532 532 *
533 533 * @since 11.1
534 534 */
535   - protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS','.DS_Store','__MACOSX'), $excludefilter = array('^\..*','.*~'))
  535 + protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'), $excludefilter = array('^\..*', '.*~'))
536 536 {
537 537 // Initialise variables.
538 538 $arr = array();
@@ -618,7 +618,7 @@ protected function _filesInFolder($path, $filter = '.', $recurse = false, $fullp
618 618 *
619 619 * @since 11.1
620 620 */
621   - protected function _folders($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS','.DS_Store','__MACOSX'), $excludefilter = array('^\..*'))
  621 + protected function _folders($path, $filter = '.', $recurse = false, $fullpath = false, $exclude = array('.svn', 'CVS', '.DS_Store', '__MACOSX'), $excludefilter = array('^\..*'))
622 622 {
623 623 // Initialise variables.
624 624 $arr = array();
2  libraries/joomla/html/html/jgrid.php
@@ -147,7 +147,7 @@ public static function published($value, $i, $prefix = '', $enabled = true, $che
147 147 $states = array(1 => array('unpublish', 'JPUBLISHED', 'JLIB_HTML_UNPUBLISH_ITEM', 'JPUBLISHED', false, 'publish', 'publish'),
148 148 0 => array('publish', 'JUNPUBLISHED', 'JLIB_HTML_PUBLISH_ITEM', 'JUNPUBLISHED', false, 'unpublish', 'unpublish'),
149 149 2 => array('unpublish', 'JARCHIVED', 'JLIB_HTML_UNPUBLISH_ITEM', 'JARCHIVED', false, 'archive', 'archive'),
150   - -2 => array('publish', 'JTRASHED', 'JLIB_HTML_PUBLISH_ITEM', 'JTRASHED', false, 'trash', 'trash'),);
  150 + -2 => array('publish', 'JTRASHED', 'JLIB_HTML_PUBLISH_ITEM', 'JTRASHED', false, 'trash', 'trash'));
151 151
152 152 // Special state for dates
153 153 if ($publish_up || $publish_down)
12 libraries/joomla/html/html/select.php
@@ -27,7 +27,7 @@
27 27 static protected $_optionDefaults = array(
28 28 'option' => array('option.attr' => null, 'option.disable' => 'disable', 'option.id' => null, 'option.key' => 'value',
29 29 'option.key.toHtml' => true, 'option.label' => null, 'option.label.toHtml' => true, 'option.text' => 'text',
30   - 'option.text.toHtml' => true,),);
  30 + 'option.text.toHtml' => true));
31 31
32 32 /**
33 33 * Generates a yes/no radio list.
@@ -81,7 +81,7 @@ public static function genericlist($data, $name, $attribs = null, $optKey = 'val
81 81 $translate = false)
82 82 {
83 83 // Set default options
84   - $options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'id' => false,));
  84 + $options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'id' => false));
85 85 if (is_array($attribs) && func_num_args() == 3)
86 86 {
87 87 // Assume we have an options array
@@ -160,7 +160,7 @@ public static function groupedlist($data, $name, $options = array())
160 160 // Set default options and overwrite with anything passed in
161 161 $options = array_merge(
162 162 JHtml::$formatOptions,
163   - array('format.depth' => 0, 'group.items' => 'items', 'group.label' => 'text', 'group.label.toHtml' => true, 'id' => false,),
  163 + array('format.depth' => 0, 'group.items' => 'items', 'group.label' => 'text', 'group.label.toHtml' => true, 'id' => false),
164 164 $options
165 165 );
166 166
@@ -281,7 +281,7 @@ public static function groupedlist($data, $name, $options = array())
281 281 public static function integerlist($start, $end, $inc, $name, $attribs = null, $selected = null, $format = '')
282 282 {
283 283 // Set default options
284   - $options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'option.format' => '', 'id' => null,));
  284 + $options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'option.format' => '', 'id' => null));
285 285 if (is_array($attribs) && func_num_args() == 5)
286 286 {
287 287 // Assume we have an options array
@@ -387,7 +387,7 @@ public static function optgroup($text, $optKey = 'value', $optText = 'text')
387 387 public static function option($value, $text = '', $optKey = 'value', $optText = 'text', $disable = false)
388 388 {
389 389 $options = array('attr' => null, 'disable' => false, 'option.attr' => null, 'option.disable' => 'disable', 'option.key' => 'value',
390   - 'option.label' => null, 'option.text' => 'text',);
  390 + 'option.label' => null, 'option.text' => 'text');
391 391 if (is_array($optKey))
392 392 {
393 393 // Merge in caller's options
@@ -481,7 +481,7 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele
481 481 $options = array_merge(
482 482 JHtml::$formatOptions,
483 483 self::$_optionDefaults['option'],
484   - array('format.depth' => 0, 'groups' => true, 'list.select' => null, 'list.translate' => false,)
  484 + array('format.depth' => 0, 'groups' => true, 'list.select' => null, 'list.translate' => false)
485 485 );
486 486
487 487 if (is_array($optKey))
2  libraries/joomla/html/parameter/element/timezones.php
@@ -90,7 +90,7 @@ public function fetchElement($name, $value, &$node, $control_name)
90 90 JHtml::_('select.option', 11.5, JText::_('UTC__11_30__NORFOLK_ISLAND')),
91 91 JHtml::_('select.option', 12, JText::_('UTC__12_00__AUCKLAND__WELLINGTON__FIJI__KAMCHATKA')),
92 92 JHtml::_('select.option', 12.75, JText::_('UTC__12_45__CHATHAM_ISLAND')), JHtml::_('select.option', 13, JText::_('UTC__13_00__TONGA')),
93   - JHtml::_('select.option', 14, JText::_('UTC__14_00__KIRIBATI')),);
  93 + JHtml::_('select.option', 14, JText::_('UTC__14_00__KIRIBATI')));
94 94
95 95 return JHtml::_(
96 96 'select.genericlist',

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.