Consistently order abstract, visibility, access modifiers

Jamie Snape · Jamie Snape · commit df084fa53d56 · 2014-06-11T17:34:31.000-04:00
diff --git a/core/controllers/components/DateComponent.php b/core/controllers/components/DateComponent.php
@@ -22,7 +22,7 @@
 class DateComponent extends AppComponent
   {
   /** format date (ex: 01/14/2011 or 14/01/2011 (fr or en) */
-  static public function formatDate($timestamp)
+  public static function formatDate($timestamp)
     {
     if(!is_numeric($timestamp))
       {
@@ -43,7 +43,7 @@ static public function formatDate($timestamp)
     }
 
   /** format the date (ex: 5 days ago) */
-  static public function ago($timestamp, $only_time = false)
+  public static function ago($timestamp, $only_time = false)
     {
     if(!is_numeric($timestamp))
       {
@@ -94,7 +94,7 @@ static public function ago($timestamp, $only_time = false)
     }
 
   /** format the date (ex: 5 days ago) */
-  static public function duration($timestamp)
+  public static function duration($timestamp)
     {
     if(!is_numeric($timestamp))
       {
diff --git a/core/controllers/components/InternationalizationComponent.php b/core/controllers/components/InternationalizationComponent.php
@@ -21,15 +21,15 @@
 /** Internationalization tools */
 class InternationalizationComponent extends AppComponent
   {
-  static private $_instance = null;
+  private static $_instance = null;
 
   /** Constructor */
   function __construct()
     {
     }
 
   /** Instance */
-  static public function getInstance()
+  public static function getInstance()
     {
     if(!self::$_instance instanceof self)
       {
@@ -39,7 +39,7 @@ static public function getInstance()
     }
 
   /** translate*/
-  static public function translate($text)
+  public static function translate($text)
     {
     if(Zend_Registry::get('configGlobal')->application->lang == 'fr')
       {
@@ -67,7 +67,7 @@ static public function translate($text)
    * Is Debug mode ON
    * @return boolean
    */
-  static public function isDebug()
+  public static function isDebug()
     {
     $config = Zend_Registry::get('config');
     if($config->mode->debug == 1)
diff --git a/core/controllers/components/JsonComponent.php b/core/controllers/components/JsonComponent.php
@@ -21,15 +21,15 @@
 /** Json Component */
 class JsonComponent extends AppComponent
   {
-  static private $_instance = null;
+  private static $_instance = null;
 
   /** Constructor */
   function __construct()
     {
     }
 
   /** Instance */
-  static public function getInstance()
+  public static function getInstance()
     {
     if(!self::$_instance instanceof self)
       {
@@ -46,7 +46,7 @@ static public function getInstance()
    * @param boolean
    * @return mixed
    */
-  static public function decode($encodedValue, $objectDecodeType = true)
+  public static function decode($encodedValue, $objectDecodeType = true)
     {
     $char = substr($encodedValue, 0, 1);
     $isValue = false;
@@ -78,7 +78,7 @@ static public function decode($encodedValue, $objectDecodeType = true)
    * @param mixed $valueToEncode
    * @return string JSON encoded object
    */
-  static public function encode($valueToEncode)
+  public static function encode($valueToEncode)
     {
     if(!is_array($valueToEncode))
       {
diff --git a/core/controllers/components/UtilityComponent.php b/core/controllers/components/UtilityComponent.php
@@ -192,7 +192,7 @@ private function _initModulesConfig($dir)
     }
 
   /** format long names*/
-  static public function sliceName($name, $nchar)
+  public static function sliceName($name, $nchar)
     {
     if(strlen($name) > $nchar)
       {
@@ -208,7 +208,7 @@ static public function sliceName($name, $nchar)
     }
 
   /** create init file*/
-  static public function createInitFile($path, $data)
+  public static function createInitFile($path, $data)
     {
     if(!is_writable(dirname($path)))
       {
@@ -247,7 +247,7 @@ static public function createInitFile($path, $data)
     return $text;
     }
   /** PHP md5_file is very slow on large file. If md5 sum is on the system we use it. */
-  static public function md5file($filename)
+  public static function md5file($filename)
     {
     // If we have md5 sum
     if(Zend_Registry::get('configGlobal')->md5sum->path)
@@ -296,7 +296,7 @@ static function checkPhpExtensions($phpextensions)
    * which is not supported by PHP's filesize()
    * @param path Path of the file to check
    */
-  static public function fileSize($path)
+  public static function fileSize($path)
     {
     if(strpos(strtolower(PHP_OS), 'win') === 0)
       {
@@ -314,7 +314,7 @@ static public function fileSize($path)
    * Format file size. Rounds to 1 decimal place and makes sure
    * to use 3 or less digits before the decimal place.
    */
-  static public function formatSize($sizeInBytes, $separator = ',')
+  public static function formatSize($sizeInBytes, $separator = ',')
     {
     $suffix = 'B';
     if(Zend_Registry::get('configGlobal')->application->lang == 'fr')
@@ -344,7 +344,7 @@ static public function formatSize($sizeInBytes, $separator = ',')
     }
 
   /** Safe delete function. Checks ifthe file can be deleted. */
-  static public function safedelete($filename)
+  public static function safedelete($filename)
     {
     if(!file_exists($filename))
       {
diff --git a/core/models/base/ActivedownloadModelBase.php b/core/models/base/ActivedownloadModelBase.php
@@ -38,7 +38,7 @@ public function __construct()
     }
 
   /** Check for an active download by ip address */
-  public abstract function getByIp($ip);
+  abstract public function getByIp($ip);
 
   /**
    * Call this function to acquire the download lock.
diff --git a/core/models/base/FeedModelBase.php b/core/models/base/FeedModelBase.php
@@ -43,9 +43,9 @@ public function __construct()
     } // end __construct()
 
   /** get Feeds*/
-  protected abstract function getFeeds($loggedUserDao, $userDao = null, $communityDao = null, $policy = 0, $limit = 20);
+  abstract protected function getFeeds($loggedUserDao, $userDao = null, $communityDao = null, $policy = 0, $limit = 20);
   /** add a community*/
-  protected abstract function addCommunity($feed, $community);
+  abstract protected function addCommunity($feed, $community);
   abstract function policyCheck($feedDao, $userDao = null, $policy = 0);
 
   /** get feeds (filtered by policies)
diff --git a/core/models/base/MetadataModelBase.php b/core/models/base/MetadataModelBase.php
@@ -45,7 +45,7 @@ abstract function getMetadataQualifiers($type, $element);
 
   abstract function getMetadata($type, $element, $qualifier);
   abstract function getAllMetadata();
-  protected abstract function saveMetadataValue($metadataDao);
+  abstract protected function saveMetadataValue($metadataDao);
   abstract function getMetadataValueExists($metadataDao);
 
   /** Add a metadata
diff --git a/core/models/base/NewUserInvitationModelBase.php b/core/models/base/NewUserInvitationModelBase.php
@@ -48,10 +48,10 @@ public function __construct()
     } // end __construct()
 
   /** abstract functions */
-  public abstract function getByParams($params);
-  public abstract function getAllByParams($params);
-  public abstract function deleteByGroup($group);
-  public abstract function deleteByCommunity($community);
+  abstract public function getByParams($params);
+  abstract public function getAllByParams($params);
+  abstract public function deleteByGroup($group);
+  abstract public function deleteByCommunity($community);
 
   /**
    * Create the database record for inviting a user via email that is not registered yet
diff --git a/core/models/base/PendingUserModelBase.php b/core/models/base/PendingUserModelBase.php
@@ -45,8 +45,8 @@ public function __construct()
     } // end __construct()
 
   /** abstract functions */
-  public abstract function getByParams($params);
-  public abstract function getAllByParams($params);
+  abstract public function getByParams($params);
+  abstract public function getAllByParams($params);
 
   /**
    * Create the database record for a user who has registered but not had their email verified yet
diff --git a/modules/batchmake/models/base/ItemmetricModelBase.php b/modules/batchmake/models/base/ItemmetricModelBase.php
@@ -62,5 +62,5 @@ public function createItemmetric($metricName, $bmsName)
   /**
    * getAll returns all rows
    */
-  public abstract function getAll();
+  abstract public function getAll();
   } // end class
diff --git a/modules/ldap/models/base/UserModelBase.php b/modules/ldap/models/base/UserModelBase.php
@@ -38,9 +38,9 @@ public function __construct()
     $this->initialize();
     }
 
-  public abstract function getLdapUser($login);
-  public abstract function deleteByUser($userDao);
-  public abstract function getByUser($userDao);
+  abstract public function getLdapUser($login);
+  abstract public function deleteByUser($userDao);
+  abstract public function getByUser($userDao);
 
   /**
    * Create a new ldap user and an underlying core user entry.
diff --git a/modules/oauth/models/base/ClientModelBase.php b/modules/oauth/models/base/ClientModelBase.php
@@ -40,7 +40,7 @@ public function __construct()
     $this->initialize(); // required
     } // end __construct()
 
-  public abstract function getByUser($userDao);
+  abstract public function getByUser($userDao);
 
   /**
    * Create and return a new oauth client owned by the given user.
diff --git a/modules/oauth/models/base/CodeModelBase.php b/modules/oauth/models/base/CodeModelBase.php
@@ -43,9 +43,9 @@ public function __construct()
     $this->initialize(); // required
     } // end __construct()
 
-  public abstract function getByUser($userDao);
-  public abstract function getByCode($code);
-  public abstract function cleanExpired();
+  abstract public function getByUser($userDao);
+  abstract public function getByCode($code);
+  abstract public function cleanExpired();
 
   /**
    * Create and return a new oauth authorization code for the given client and user. Expires after 10 minutes
diff --git a/modules/oauth/models/base/TokenModelBase.php b/modules/oauth/models/base/TokenModelBase.php
@@ -44,10 +44,10 @@ public function __construct()
     $this->initialize(); // required
     } // end __construct()
 
-  public abstract function getByToken($token);
-  public abstract function getByUser($userDao, $onlyValid = true);
-  public abstract function expireTokens($userDao, $clientDao);
-  public abstract function cleanExpired();
+  abstract public function getByToken($token);
+  abstract public function getByUser($userDao, $onlyValid = true);
+  abstract public function expireTokens($userDao, $clientDao);
+  abstract public function cleanExpired();
 
   /**
    * Use the provided codeDao to create and return an oauth access token.
diff --git a/modules/packages/models/base/ApplicationModelBase.php b/modules/packages/models/base/ApplicationModelBase.php
@@ -35,9 +35,9 @@ public function __construct()
     $this->initialize();
     }
 
-  public abstract function getAllByProjectId($projectId);
-  public abstract function getAllReleases($application);
-  public abstract function getDistinctPlatforms($application);
+  abstract public function getAllByProjectId($projectId);
+  abstract public function getAllReleases($application);
+  abstract public function getDistinctPlatforms($application);
 
   /**
    * Override the save function
diff --git a/modules/packages/models/base/ExtensionModelBase.php b/modules/packages/models/base/ExtensionModelBase.php
@@ -58,10 +58,10 @@ public function __construct()
     $this->initialize(); // required
     } // end __construct()
 
-  public abstract function getAll();
-  public abstract function getByItemId($itemId);
-  public abstract function getAllCategories($applicationId);
-  public abstract function getAllReleases($applicationId);
+  abstract public function getAll();
+  abstract public function getByItemId($itemId);
+  abstract public function getAllCategories($applicationId);
+  abstract public function getAllReleases($applicationId);
 
   /**
    * If an extension already exists that matches the given
diff --git a/modules/packages/models/base/PackageModelBase.php b/modules/packages/models/base/PackageModelBase.php
@@ -47,7 +47,7 @@ public function __construct()
     $this->initialize(); // required
     } // end __construct()
 
-  public abstract function getAll();
-  public abstract function getByItemId($itemId);
-  public abstract function getLatestOfEachPackageType($application, $os, $arch, $submissiontype = null);
+  abstract public function getAll();
+  abstract public function getByItemId($itemId);
+  abstract public function getLatestOfEachPackageType($application, $os, $arch, $submissiontype = null);
   }
diff --git a/modules/packages/models/base/ProjectModelBase.php b/modules/packages/models/base/ProjectModelBase.php
@@ -38,8 +38,8 @@ public function __construct()
     $this->initialize();
     }
 
-  public abstract function getAllEnabled();
-  public abstract function getByCommunityId($communityId);
+  abstract public function getAllEnabled();
+  abstract public function getByCommunityId($communityId);
 
   /**
    * Enable or disable the community as a package-hosting project
diff --git a/modules/pvw/models/base/InstanceModelBase.php b/modules/pvw/models/base/InstanceModelBase.php
@@ -42,5 +42,5 @@ public function __construct()
     $this->initialize();
     }
 
-  public abstract function getAll();
+  abstract public function getAll();
   }
diff --git a/modules/scheduler/models/base/JobModelBase.php b/modules/scheduler/models/base/JobModelBase.php
@@ -44,10 +44,10 @@ public function __construct()
     $this->initialize(); // required
     } // end __construct()
 
-  public abstract function getJobsByTask($task);
-  public abstract function getJobsToRun($limit = 1000);
-  public abstract function getFutureScheduledJobs();
-  public abstract function removeUserReferences($userId);
+  abstract public function getJobsByTask($task);
+  abstract public function getJobsToRun($limit = 1000);
+  abstract public function getFutureScheduledJobs();
+  abstract public function removeUserReferences($userId);
 
   /** get server load*/
   protected function getServerLoad()
diff --git a/modules/sizequota/models/base/FolderQuotaModelBase.php b/modules/sizequota/models/base/FolderQuotaModelBase.php
@@ -39,7 +39,7 @@ public function __construct()
     }
 
   /** Get the quota dao for a particular folder, or return false if none is set */
-  public abstract function getQuota($folder);
+  abstract public function getQuota($folder);
 
   /** Get the quota in bytes for a particular folder, or return the default if none is set */
   public function getFolderQuota($folder)
diff --git a/modules/thumbnailcreator/models/base/ItemthumbnailModelBase.php b/modules/thumbnailcreator/models/base/ItemthumbnailModelBase.php
@@ -33,6 +33,6 @@ public function __construct()
     $this->initialize();
     }
 
-  public abstract function getByItemId($itemId);
-  public abstract function deleteByItem($item);
+  abstract public function getByItemId($itemId);
+  abstract public function deleteByItem($item);
   }
diff --git a/modules/tracker/models/base/ProducerModelBase.php b/modules/tracker/models/base/ProducerModelBase.php
@@ -42,8 +42,8 @@ public function __construct()
     $this->initialize();
     }
 
-  public abstract function getByCommunityId($communityId);
-  public abstract function getByCommunityIdAndName($communityId, $displayName);
+  abstract public function getByCommunityId($communityId);
+  abstract public function getByCommunityIdAndName($communityId, $displayName);
 
   /**
    * If the producer with the given displayName and communityId exists, returns it.
diff --git a/modules/tracker/models/base/ScalarModelBase.php b/modules/tracker/models/base/ScalarModelBase.php
@@ -44,10 +44,10 @@ public function __construct()
     $this->initialize();
     }
 
-  public abstract function associateItem($scalar, $item, $label);
-  public abstract function getAssociatedItems($scalar);
-  public abstract function getOtherValuesFromSubmission($scalar);
-  public abstract function getByTrendAndTimestamp($trendId, $timestamp, $user = null);
+  abstract public function associateItem($scalar, $item, $label);
+  abstract public function getAssociatedItems($scalar);
+  abstract public function getOtherValuesFromSubmission($scalar);
+  abstract public function getByTrendAndTimestamp($trendId, $timestamp, $user = null);
 
   /**
    * Add a new scalar point to the trend.  If overwrite is true, and a scalar
diff --git a/modules/tracker/models/base/ThresholdNotificationModelBase.php b/modules/tracker/models/base/ThresholdNotificationModelBase.php
@@ -38,9 +38,9 @@ public function __construct()
     $this->initialize();
     }
 
-  public abstract function getNotifications($scalar);
-  public abstract function getUserSetting($user, $trend);
-  public abstract function deleteByTrend($trend);
+  abstract public function getNotifications($scalar);
+  abstract public function getUserSetting($user, $trend);
+  abstract public function deleteByTrend($trend);
 
   /**
    * Check whether the given scalar value meets the threshold condition.
diff --git a/modules/tracker/models/base/TrendModelBase.php b/modules/tracker/models/base/TrendModelBase.php

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`class DateComponent extends AppComponent`
`23`	`23`	`{`
`24`	`24`	`/** format date (ex: 01/14/2011 or 14/01/2011 (fr or en) */`
`25`		`- static public function formatDate($timestamp)`
	`25`	`+ public static function formatDate($timestamp)`
`26`	`26`	`{`
`27`	`27`	`if(!is_numeric($timestamp))`
`28`	`28`	`{`
`@@ -43,7 +43,7 @@ static public function formatDate($timestamp)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/** format the date (ex: 5 days ago) */`
`46`		`- static public function ago($timestamp, $only_time = false)`
	`46`	`+ public static function ago($timestamp, $only_time = false)`
`47`	`47`	`{`
`48`	`48`	`if(!is_numeric($timestamp))`
`49`	`49`	`{`
`@@ -94,7 +94,7 @@ static public function ago($timestamp, $only_time = false)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`/** format the date (ex: 5 days ago) */`
`97`		`- static public function duration($timestamp)`
	`97`	`+ public static function duration($timestamp)`
`98`	`98`	`{`
`99`	`99`	`if(!is_numeric($timestamp))`
`100`	`100`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@`
`21`	`21`	`/** Internationalization tools */`
`22`	`22`	`class InternationalizationComponent extends AppComponent`
`23`	`23`	`{`
`24`		`- static private $_instance = null;`
	`24`	`+ private static $_instance = null;`
`25`	`25`
`26`	`26`	`/** Constructor */`
`27`	`27`	`function __construct()`
`28`	`28`	`{`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/** Instance */`
`32`		`- static public function getInstance()`
	`32`	`+ public static function getInstance()`
`33`	`33`	`{`
`34`	`34`	`if(!self::$_instance instanceof self)`
`35`	`35`	`{`
`@@ -39,7 +39,7 @@ static public function getInstance()`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/** translate*/`
`42`		`- static public function translate($text)`
	`42`	`+ public static function translate($text)`
`43`	`43`	`{`
`44`	`44`	`if(Zend_Registry::get('configGlobal')->application->lang == 'fr')`
`45`	`45`	`{`
`@@ -67,7 +67,7 @@ static public function translate($text)`
`67`	`67`	`* Is Debug mode ON`
`68`	`68`	`* @return boolean`
`69`	`69`	`*/`
`70`		`- static public function isDebug()`
	`70`	`+ public static function isDebug()`
`71`	`71`	`{`
`72`	`72`	`$config = Zend_Registry::get('config');`
`73`	`73`	`if($config->mode->debug == 1)`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ private function _initModulesConfig($dir)`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`/** format long names*/`
`195`		`- static public function sliceName($name, $nchar)`
	`195`	`+ public static function sliceName($name, $nchar)`
`196`	`196`	`{`
`197`	`197`	`if(strlen($name) > $nchar)`
`198`	`198`	`{`
`@@ -208,7 +208,7 @@ static public function sliceName($name, $nchar)`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/** create init file*/`
`211`		`- static public function createInitFile($path, $data)`
	`211`	`+ public static function createInitFile($path, $data)`
`212`	`212`	`{`
`213`	`213`	`if(!is_writable(dirname($path)))`
`214`	`214`	`{`
`@@ -247,7 +247,7 @@ static public function createInitFile($path, $data)`
`247`	`247`	`return $text;`
`248`	`248`	`}`
`249`	`249`	`/** PHP md5_file is very slow on large file. If md5 sum is on the system we use it. */`
`250`		`- static public function md5file($filename)`
	`250`	`+ public static function md5file($filename)`
`251`	`251`	`{`
`252`	`252`	`// If we have md5 sum`
`253`	`253`	`if(Zend_Registry::get('configGlobal')->md5sum->path)`
`@@ -296,7 +296,7 @@ static function checkPhpExtensions($phpextensions)`
`296`	`296`	`* which is not supported by PHP's filesize()`
`297`	`297`	`* @param path Path of the file to check`
`298`	`298`	`*/`
`299`		`- static public function fileSize($path)`
	`299`	`+ public static function fileSize($path)`
`300`	`300`	`{`
`301`	`301`	`if(strpos(strtolower(PHP_OS), 'win') === 0)`
`302`	`302`	`{`
`@@ -314,7 +314,7 @@ static public function fileSize($path)`
`314`	`314`	`* Format file size. Rounds to 1 decimal place and makes sure`
`315`	`315`	`* to use 3 or less digits before the decimal place.`
`316`	`316`	`*/`
`317`		`- static public function formatSize($sizeInBytes, $separator = ',')`
	`317`	`+ public static function formatSize($sizeInBytes, $separator = ',')`
`318`	`318`	`{`
`319`	`319`	`$suffix = 'B';`
`320`	`320`	`if(Zend_Registry::get('configGlobal')->application->lang == 'fr')`
`@@ -344,7 +344,7 @@ static public function formatSize($sizeInBytes, $separator = ',')`
`344`	`344`	`}`
`345`	`345`
`346`	`346`	`/** Safe delete function. Checks ifthe file can be deleted. */`
`347`		`- static public function safedelete($filename)`
	`347`	`+ public static function safedelete($filename)`
`348`	`348`	`{`
`349`	`349`	`if(!file_exists($filename))`
`350`	`350`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct()`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/** Check for an active download by ip address */`
`41`		`- public abstract function getByIp($ip);`
	`41`	`+ abstract public function getByIp($ip);`
`42`	`42`
`43`	`43`	`/**`
`44`	`44`	`* Call this function to acquire the download lock.`