Skip to content

Commit

Permalink
Merge pull request #6781 from nueckman/cs
Browse files Browse the repository at this point in the history 
CS - change static order
  • Loading branch information
Michael Babker committed Apr 15, 2015
2 parents fbc3d35 + 909f578 commit 98b401c
Show file tree
Hide file tree
Showing 19 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion libraries/cms/html/select.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ abstract class JHtmlSelect
* @var array
* @since 1.5
*/
static protected $optionDefaults = array(
protected static $optionDefaults = array(
'option' => array('option.attr' => null, 'option.disable' => 'disable', 'option.id' => null, 'option.key' => 'value',
'option.key.toHtml' => true, 'option.label' => null, 'option.label.toHtml' => true, 'option.text' => 'text',
'option.text.toHtml' => true, 'option.class' => 'class', 'option.onclick' => 'onclick'));
Expand Down
2 changes: 1 addition & 1 deletion libraries/joomla/session/storage/memcache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function register()
*
* @since 12.1
*/
static public function isSupported()
public static function isSupported()
{
return (extension_loaded('memcache') && class_exists('Memcache'));
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/joomla/session/storage/memcached.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function register()
*
* @since 12.1
*/
static public function isSupported()
public static function isSupported()
{
return (extension_loaded('memcached') && class_exists('Memcached'));
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/joomla/session/storage/wincache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function register()
*
* @since 12.1
*/
static public function isSupported()
public static function isSupported()
{
return (extension_loaded('wincache') && function_exists('wincache_ucache_get') && !strcmp(ini_get('wincache.ucenabled'), "1"));
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/joomla/session/storage/xcache.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public function destroy($id)
*
* @since 12.1
*/
static public function isSupported()
public static function isSupported()
{
return (extension_loaded('xcache'));
}
Expand Down
4 changes: 2 additions & 2 deletions libraries/legacy/application/application.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ public function getTemplate($params = false)
* @since 11.1
* @deprecated 4.0
*/
static public function getRouter($name = null, array $options = array())
public static function getRouter($name = null, array $options = array())
{
if (!isset($name))
{
Expand Down Expand Up @@ -841,7 +841,7 @@ static public function getRouter($name = null, array $options = array())
* @since 11.1
* @deprecated 4.0 Use JApplicationHelper::stringURLSafe instead
*/
static public function stringURLSafe($string)
public static function stringURLSafe($string)
{
return JApplicationHelper::stringURLSafe($string);
}
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/suites/libraries/cms/html/TestHelpers/JHtmlSelect-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlSelectTest_DataSet
{
static public $genericTest = array(
public static $genericTest = array(
// @todo remove: array($expected, $data, $name, $attribs = null, $optKey = 'value', $optText = 'text',
// $selected = null, $idtag = false, $translate = false)
array(
Expand Down Expand Up @@ -72,7 +72,7 @@ class JHtmlSelectTest_DataSet
),
);

static public $radioTest = array(
public static $radioTest = array(
// @todo remove: array($expected, $data, $name, $attribs = null, $optKey = 'value', $optText = 'text', $selected = null, $idtag = false,
// $translate = false)
array(
Expand Down Expand Up @@ -141,7 +141,7 @@ class JHtmlSelectTest_DataSet
),
);

static public $optionsTest = array(
public static $optionsTest = array(
// @todo remove: array($expected, $arr, $optKey = 'value', $optText = 'text', $selected = null, $translate = false)
array(
"<option value=\"1\">&nbsp;Test</option>\n",
Expand Down Expand Up @@ -209,7 +209,7 @@ class JHtmlSelectTest_DataSet
),
);

static public $optionTest = array(
public static $optionTest = array(
// @todo remove: array($expected, $value, $text = '', $optKey = 'value', $optText = 'text', $disable = false)
array(
array(
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/suites/libraries/joomla/form/TestHelpers/JHtmlField-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldTest_DataSet
{
static public $setupTest = array(
public static $setupTest = array(
'NameValueIdTitleLabel' => array(
array(
'name' => 'myName',
Expand Down
2 changes: 1 addition & 1 deletion ...nit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldCheckbox-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldCheckboxTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValueNoChecked' => array(
array(
'id' => 'myTestId',
Expand Down
2 changes: 1 addition & 1 deletion ...s/unit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldEmail-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldEmailTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValue' => array(
array(
'id' => 'myTestId',
Expand Down
2 changes: 1 addition & 1 deletion .../unit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldNumber-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldNumberTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValue' => array(
array(
'id' => 'myTestId',
Expand Down
2 changes: 1 addition & 1 deletion ...nit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldPassword-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldPasswordTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValue' => array(
array(
'id' => 'myTestId',
Expand Down
2 changes: 1 addition & 1 deletion ...s/unit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldRadio-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldRadioTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoOptions' => array(
'<field name="myTestId" type="radio" />',
array(
Expand Down
2 changes: 1 addition & 1 deletion ...s/unit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldRange-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldRangeTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValue' => array(
array(
'id' => 'myTestId',
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldTel-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldTelTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValue' => array(
array(
'id' => 'myTestId',
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldText-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldTextTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValue' => array(
array(
'id' => 'myTestId',
Expand Down
2 changes: 1 addition & 1 deletion ...nit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldTextarea-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldTextareaTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValue' => array(
array(
'id' => 'myTestId',
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/suites/libraries/joomla/form/fields/TestHelpers/JHtmlFieldUrl-helper-dataset.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
class JHtmlFieldUrlTest_DataSet
{
static public $getInputTest = array(
public static $getInputTest = array(
'NoValue' => array(
array(
'id' => 'myTestId',
Expand Down
Loading

0 comments on commit 98b401c

Please sign in to comment.