Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154648
Change subject: Use public instead of var in classes
......................................................................
Use public instead of var in classes
Change-Id: I01315ee890923d75d4f1c397585b851bbf53c68a
---
M api/ApiNovaAddress.php
M api/ApiNovaInstance.php
M api/ApiNovaProjectLimits.php
M api/ApiNovaProjects.php
M api/ApiNovaServiceGroups.php
M nova/OpenStackNovaAddress.php
M nova/OpenStackNovaController.php
M nova/OpenStackNovaDomain.php
M nova/OpenStackNovaHost.php
M nova/OpenStackNovaImage.php
M nova/OpenStackNovaInstance.php
M nova/OpenStackNovaInstanceType.php
M nova/OpenStackNovaKeypair.php
M nova/OpenStackNovaPrivateHost.php
M nova/OpenStackNovaProject.php
M nova/OpenStackNovaProjectGroup.php
M nova/OpenStackNovaProxy.php
M nova/OpenStackNovaPublicHost.php
M nova/OpenStackNovaRole.php
M nova/OpenStackNovaSecurityGroup.php
M nova/OpenStackNovaSecurityGroupRule.php
M nova/OpenStackNovaServiceGroup.php
M nova/OpenStackNovaSudoer.php
M nova/OpenStackNovaUser.php
M nova/OpenStackNovaVolume.php
M special/SpecialNovaAddress.php
M special/SpecialNovaDomain.php
M special/SpecialNovaInstance.php
M special/SpecialNovaKey.php
M special/SpecialNovaProject.php
M special/SpecialNovaProxy.php
M special/SpecialNovaRole.php
M special/SpecialNovaSecurityGroup.php
M special/SpecialNovaServiceGroup.php
M special/SpecialNovaSudoer.php
M special/SpecialNovaVolume.php
36 files changed, 85 insertions(+), 85 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/48/154648/1
diff --git a/api/ApiNovaAddress.php b/api/ApiNovaAddress.php
index 95c07c8..6c8f2f4 100644
--- a/api/ApiNovaAddress.php
+++ b/api/ApiNovaAddress.php
@@ -1,8 +1,8 @@
<?php
class ApiNovaAddress extends ApiBase {
- var $userLDAP;
- var $userNova;
- var $params;
+ public $userLDAP;
+ public $userNova;
+ public $params;
public function canExecute() {
if ( ! $this->userLDAP->exists() ) {
diff --git a/api/ApiNovaInstance.php b/api/ApiNovaInstance.php
index ca9cbb4..b11cb01 100644
--- a/api/ApiNovaInstance.php
+++ b/api/ApiNovaInstance.php
@@ -1,8 +1,8 @@
<?php
class ApiNovaInstance extends ApiBase {
- var $userLDAP;
- var $userNova;
- var $params;
+ public $userLDAP;
+ public $userNova;
+ public $params;
public function canExecute() {
if ( ! $this->userLDAP->exists() ) {
diff --git a/api/ApiNovaProjectLimits.php b/api/ApiNovaProjectLimits.php
index a97c8a7..064e05c 100644
--- a/api/ApiNovaProjectLimits.php
+++ b/api/ApiNovaProjectLimits.php
@@ -1,8 +1,8 @@
<?php
class ApiNovaProjectLimits extends ApiBase {
- var $userLDAP;
- var $userNova;
- var $params;
+ public $userLDAP;
+ public $userNova;
+ public $params;
public function canExecute( $rights=array() ) {
if ( ! $this->userLDAP->exists() ) {
diff --git a/api/ApiNovaProjects.php b/api/ApiNovaProjects.php
index 6f5f04a..1744e6a 100644
--- a/api/ApiNovaProjects.php
+++ b/api/ApiNovaProjects.php
@@ -1,7 +1,7 @@
<?php
class ApiNovaProjects extends ApiBase {
- var $userLDAP;
- var $params;
+ public $userLDAP;
+ public $params;
function execute() {
$this->params = $this->extractRequestParams();
diff --git a/api/ApiNovaServiceGroups.php b/api/ApiNovaServiceGroups.php
index 018375b..bda655f 100644
--- a/api/ApiNovaServiceGroups.php
+++ b/api/ApiNovaServiceGroups.php
@@ -1,7 +1,7 @@
<?php
class ApiNovaServiceGroups extends ApiBase {
- var $userLDAP;
- var $params;
+ public $userLDAP;
+ public $params;
function execute() {
$this->params = $this->extractRequestParams();
diff --git a/nova/OpenStackNovaAddress.php b/nova/OpenStackNovaAddress.php
index 17881a9..74fbdb8 100644
--- a/nova/OpenStackNovaAddress.php
+++ b/nova/OpenStackNovaAddress.php
@@ -9,7 +9,7 @@
class OpenStackNovaAddress {
- var $address;
+ public $address;
/**
* @param $apiInstanceResponse
diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index 868fdad..74c2af1 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -8,11 +8,11 @@
*/
class OpenStackNovaController {
- var $username;
- var $user;
- var $project;
- var $region;
- var $token;
+ public $username;
+ public $user;
+ public $project;
+ public $region;
+ public $token;
/**
* @param $user string
diff --git a/nova/OpenStackNovaDomain.php b/nova/OpenStackNovaDomain.php
index f895f4d..681abbe 100644
--- a/nova/OpenStackNovaDomain.php
+++ b/nova/OpenStackNovaDomain.php
@@ -9,10 +9,10 @@
class OpenStackNovaDomain {
- var $domainname;
- var $domainDN;
- var $domainInfo;
- var $fqdn; // fq domain name
+ public $domainname;
+ public $domainDN;
+ public $domainInfo;
+ public $fqdn; // fq domain name
/**
* @param $domainname
diff --git a/nova/OpenStackNovaHost.php b/nova/OpenStackNovaHost.php
index 2bdf3b1..a6a9646 100644
--- a/nova/OpenStackNovaHost.php
+++ b/nova/OpenStackNovaHost.php
@@ -12,17 +12,17 @@
/**
* @var string
*/
- var $hostDN;
+ public $hostDN;
/**
* @var mixed
*/
- var $hostInfo;
+ public $hostInfo;
/**
* @var OpenStackNovaDomain
*/
- var $domainCache;
+ public $domainCache;
/**
* Return all arecords associated with this host. Return an empty
diff --git a/nova/OpenStackNovaImage.php b/nova/OpenStackNovaImage.php
index 0caf480..9a1acaa 100644
--- a/nova/OpenStackNovaImage.php
+++ b/nova/OpenStackNovaImage.php
@@ -9,7 +9,7 @@
class OpenStackNovaImage {
- var $image;
+ public $image;
/**
* @param $apiInstanceResponse
diff --git a/nova/OpenStackNovaInstance.php b/nova/OpenStackNovaInstance.php
index dee3ab4..79f67c1 100644
--- a/nova/OpenStackNovaInstance.php
+++ b/nova/OpenStackNovaInstance.php
@@ -9,17 +9,17 @@
class OpenStackNovaInstance {
- var $instance;
+ public $instance;
/**
* @var string
*/
- var $region;
+ public $region;
/**
* @var OpenStackNovaHost
*/
- var $host;
+ public $host;
/**
* @param $apiInstanceResponse
diff --git a/nova/OpenStackNovaInstanceType.php
b/nova/OpenStackNovaInstanceType.php
index cce9cf5..f127995 100644
--- a/nova/OpenStackNovaInstanceType.php
+++ b/nova/OpenStackNovaInstanceType.php
@@ -9,7 +9,7 @@
class OpenStackNovaInstanceType {
- var $instanceType;
+ public $instanceType;
/**
* @param $apiInstanceResponse
diff --git a/nova/OpenStackNovaKeypair.php b/nova/OpenStackNovaKeypair.php
index 9efb578..cfd0127 100644
--- a/nova/OpenStackNovaKeypair.php
+++ b/nova/OpenStackNovaKeypair.php
@@ -9,7 +9,7 @@
class OpenStackNovaKeyPair {
- var $keypair;
+ public $keypair;
/**
* @param $apiKeypairResponse
diff --git a/nova/OpenStackNovaPrivateHost.php
b/nova/OpenStackNovaPrivateHost.php
index 0a617a0..e7e4e31 100644
--- a/nova/OpenStackNovaPrivateHost.php
+++ b/nova/OpenStackNovaPrivateHost.php
@@ -12,12 +12,12 @@
/**
* @var string
*/
- var $instanceid;
+ public $instanceid;
/**
* @var string
*/
- var $region;
+ public $region;
/**
* @param $instanceid
diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 93ef1ee..453fdbc 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -8,12 +8,12 @@
*/
class OpenStackNovaProject {
- var $projectname;
- var $projectDN;
- var $projectInfo;
- var $roles;
- var $loaded;
- var $projectGroup;
+ public $projectname;
+ public $projectDN;
+ public $projectInfo;
+ public $roles;
+ public $loaded;
+ public $projectGroup;
// list of roles
static $rolenames = array( 'projectadmin' );
diff --git a/nova/OpenStackNovaProjectGroup.php
b/nova/OpenStackNovaProjectGroup.php
index a040ea2..9d4a80b 100644
--- a/nova/OpenStackNovaProjectGroup.php
+++ b/nova/OpenStackNovaProjectGroup.php
@@ -21,10 +21,10 @@
*/
class OpenStackNovaProjectGroup {
- var $projectName;
- var $projectGroupInfo;
- var $projectGroupDN;
- var $loaded;
+ public $projectName;
+ public $projectGroupInfo;
+ public $projectGroupDN;
+ public $loaded;
static $prefix = 'project-';
diff --git a/nova/OpenStackNovaProxy.php b/nova/OpenStackNovaProxy.php
index 4f9bc58..d1666d9 100644
--- a/nova/OpenStackNovaProxy.php
+++ b/nova/OpenStackNovaProxy.php
@@ -9,9 +9,9 @@
class OpenStackNovaProxy {
- var $proxyFQDN;
- var $backendName;
- var $backendPort;
+ public $proxyFQDN;
+ public $backendName;
+ public $backendPort;
/**
* @param $sudoername
diff --git a/nova/OpenStackNovaPublicHost.php b/nova/OpenStackNovaPublicHost.php
index 354b09f..beb74cd 100644
--- a/nova/OpenStackNovaPublicHost.php
+++ b/nova/OpenStackNovaPublicHost.php
@@ -12,7 +12,7 @@
/**
* @var string
*/
- var $ip;
+ public $ip;
/**
* @param $ip
diff --git a/nova/OpenStackNovaRole.php b/nova/OpenStackNovaRole.php
index b26b9ac..ec0da4e 100644
--- a/nova/OpenStackNovaRole.php
+++ b/nova/OpenStackNovaRole.php
@@ -8,10 +8,10 @@
*/
class OpenStackNovaRole {
- var $rolename;
- var $roleDN;
- var $roleInfo;
- var $project;
+ public $rolename;
+ public $roleDN;
+ public $roleInfo;
+ public $project;
/**
* @param $rolename
diff --git a/nova/OpenStackNovaSecurityGroup.php
b/nova/OpenStackNovaSecurityGroup.php
index 883e410..8b3e97d 100644
--- a/nova/OpenStackNovaSecurityGroup.php
+++ b/nova/OpenStackNovaSecurityGroup.php
@@ -9,8 +9,8 @@
class OpenStackNovaSecurityGroup {
- var $group;
- var $rules;
+ public $group;
+ public $rules;
/**
* @param $apiInstanceResponse
diff --git a/nova/OpenStackNovaSecurityGroupRule.php
b/nova/OpenStackNovaSecurityGroupRule.php
index cd8c580..822a7e7 100644
--- a/nova/OpenStackNovaSecurityGroupRule.php
+++ b/nova/OpenStackNovaSecurityGroupRule.php
@@ -2,7 +2,7 @@
class OpenStackNovaSecurityGroupRule {
- var $rule;
+ public $rule;
/**
* @param $apiInstanceResponse
diff --git a/nova/OpenStackNovaServiceGroup.php
b/nova/OpenStackNovaServiceGroup.php
index ed10abb..4c8524b 100644
--- a/nova/OpenStackNovaServiceGroup.php
+++ b/nova/OpenStackNovaServiceGroup.php
@@ -8,10 +8,10 @@
*/
class OpenStackNovaServiceGroup {
- var $groupName;
- var $groupDN;
- var $groupInfo;
- var $project;
+ public $groupName;
+ public $groupDN;
+ public $groupInfo;
+ public $project;
/**
* @param $groupname string
diff --git a/nova/OpenStackNovaSudoer.php b/nova/OpenStackNovaSudoer.php
index 59e848f..5dbf166 100644
--- a/nova/OpenStackNovaSudoer.php
+++ b/nova/OpenStackNovaSudoer.php
@@ -9,10 +9,10 @@
class OpenStackNovaSudoer {
- var $sudoername;
- var $project;
- var $sudoerDN;
- var $sudoerInfo;
+ public $sudoername;
+ public $project;
+ public $sudoerDN;
+ public $sudoerInfo;
/**
* @param $sudoername
diff --git a/nova/OpenStackNovaUser.php b/nova/OpenStackNovaUser.php
index ae08ccb..a24d180 100644
--- a/nova/OpenStackNovaUser.php
+++ b/nova/OpenStackNovaUser.php
@@ -9,9 +9,9 @@
class OpenStackNovaUser {
- var $username;
- var $userDN;
- var $userInfo;
+ public $username;
+ public $userDN;
+ public $userInfo;
/**
* @param string $username
diff --git a/nova/OpenStackNovaVolume.php b/nova/OpenStackNovaVolume.php
index ffd1e0c..ed06b93 100644
--- a/nova/OpenStackNovaVolume.php
+++ b/nova/OpenStackNovaVolume.php
@@ -9,7 +9,7 @@
class OpenStackNovaVolume {
- var $volume;
+ public $volume;
/**
* @param $apiVolumeResponse
diff --git a/special/SpecialNovaAddress.php b/special/SpecialNovaAddress.php
index 6ee0696..1afad0e 100644
--- a/special/SpecialNovaAddress.php
+++ b/special/SpecialNovaAddress.php
@@ -8,12 +8,12 @@
*/
class SpecialNovaAddress extends SpecialNova {
- var $userNova;
+ public $userNova;
/**
* @var OpenStackNovaUser
*/
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaAddress' );
diff --git a/special/SpecialNovaDomain.php b/special/SpecialNovaDomain.php
index 5ee823e..0e73206 100644
--- a/special/SpecialNovaDomain.php
+++ b/special/SpecialNovaDomain.php
@@ -8,7 +8,7 @@
*/
class SpecialNovaDomain extends SpecialNova {
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaDomain', 'managednsdomain' );
diff --git a/special/SpecialNovaInstance.php b/special/SpecialNovaInstance.php
index 4917331..be5f3f9 100644
--- a/special/SpecialNovaInstance.php
+++ b/special/SpecialNovaInstance.php
@@ -18,12 +18,12 @@
/**
* @var OpenStackNovaController
*/
- var $userNova;
+ public $userNova;
/**
* @var OpenStackNovaUser
*/
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaInstance' );
diff --git a/special/SpecialNovaKey.php b/special/SpecialNovaKey.php
index c405c74..ead09ee 100644
--- a/special/SpecialNovaKey.php
+++ b/special/SpecialNovaKey.php
@@ -8,12 +8,12 @@
*/
class SpecialNovaKey extends SpecialNova {
- var $userNova;
+ public $userNova;
/**
* @var OpenStackNovaUser
*/
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaKey' );
diff --git a/special/SpecialNovaProject.php b/special/SpecialNovaProject.php
index e39da1c..63f03d8 100644
--- a/special/SpecialNovaProject.php
+++ b/special/SpecialNovaProject.php
@@ -11,12 +11,12 @@
/**
* @var OpenStackNovaUser
*/
- var $userLDAP;
+ public $userLDAP;
/**
* @var OpenStackNovaController
*/
- var $userNova;
+ public $userNova;
function __construct() {
parent::__construct( 'NovaProject', 'manageproject' );
diff --git a/special/SpecialNovaProxy.php b/special/SpecialNovaProxy.php
index 74ed99e..7f4c62a 100644
--- a/special/SpecialNovaProxy.php
+++ b/special/SpecialNovaProxy.php
@@ -8,8 +8,8 @@
*/
class SpecialNovaProxy extends SpecialNova {
- var $userLDAP;
- var $userNova;
+ public $userLDAP;
+ public $userNova;
function __construct() {
parent::__construct( 'NovaProxy' );
diff --git a/special/SpecialNovaRole.php b/special/SpecialNovaRole.php
index 5ddf103..25d86f4 100644
--- a/special/SpecialNovaRole.php
+++ b/special/SpecialNovaRole.php
@@ -8,7 +8,7 @@
*/
class SpecialNovaRole extends SpecialNova {
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaRole', 'manageproject' );
diff --git a/special/SpecialNovaSecurityGroup.php
b/special/SpecialNovaSecurityGroup.php
index 9386842..364d2ff 100644
--- a/special/SpecialNovaSecurityGroup.php
+++ b/special/SpecialNovaSecurityGroup.php
@@ -11,12 +11,12 @@
/**
* @var OpenStackNovaController
*/
- var $userNova;
+ public $userNova;
/**
* @var OpenStackNovaUser
*/
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaSecurityGroup', 'listall' );
diff --git a/special/SpecialNovaServiceGroup.php
b/special/SpecialNovaServiceGroup.php
index fa7efe1..7301384 100644
--- a/special/SpecialNovaServiceGroup.php
+++ b/special/SpecialNovaServiceGroup.php
@@ -8,7 +8,7 @@
*/
class SpecialNovaServiceGroup extends SpecialNova {
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaServiceGroup', 'manageproject' );
diff --git a/special/SpecialNovaSudoer.php b/special/SpecialNovaSudoer.php
index 243eaa8..6170a8b 100644
--- a/special/SpecialNovaSudoer.php
+++ b/special/SpecialNovaSudoer.php
@@ -8,7 +8,7 @@
*/
class SpecialNovaSudoer extends SpecialNova {
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaSudoer' );
diff --git a/special/SpecialNovaVolume.php b/special/SpecialNovaVolume.php
index 3a845ab..440b4a8 100644
--- a/special/SpecialNovaVolume.php
+++ b/special/SpecialNovaVolume.php
@@ -11,12 +11,12 @@
/**
* @var OpenStackNovaController
*/
- var $userNova;
+ public $userNova;
/**
* @var OpenStackNovaUser
*/
- var $userLDAP;
+ public $userLDAP;
function __construct() {
parent::__construct( 'NovaVolume' );
--
To view, visit https://gerrit.wikimedia.org/r/154648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I01315ee890923d75d4f1c397585b851bbf53c68a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
