[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368043 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: Ib3765db6d1538a7748e9ea81549f2e06ec12ff22
---
M composer.json
M nova/OpenStackNovaArticle.php
M nova/OpenStackNovaController.php
M nova/OpenStackNovaDomain.php
M nova/OpenStackNovaHost.php
M nova/OpenStackNovaProject.php
M nova/OpenStackNovaRole.php
M nova/OpenStackNovaUser.php
M phpcs.xml
9 files changed, 12 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 6a20d4f..ea7fb13 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0"
+ "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/nova/OpenStackNovaArticle.php b/nova/OpenStackNovaArticle.php
index 1556302..e779d18 100644
--- a/nova/OpenStackNovaArticle.php
+++ b/nova/OpenStackNovaArticle.php
@@ -29,7 +29,7 @@
}
public static function deleteArticle( $titletext, $namespace =
NS_NOVA_RESOURCE ) {
- if ( !OpenStackNovaArticle::canCreatePages() ) {
+ if ( !self::canCreatePages() ) {
return;
}
$title = Title::newFromText( $titletext, $namespace );
diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index 4dc4f02..f81e007 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -709,7 +709,7 @@
$data['server']['name'] = $instanceName;
if ( $wgOpenStackManagerInstanceUserData ) {
$random_hash = md5( date( 'r', time() ) );
- $endl = OpenStackNovaController::getLineEnding();
+ $endl = self::getLineEnding();
$boundary = '===' . $random_hash .'==';
$userdata = 'Content-Type: multipart/mixed; boundary="'
. $boundary .'"' . $endl;
$userdata .= 'MIME-Version: 1.0' . $endl;
diff --git a/nova/OpenStackNovaDomain.php b/nova/OpenStackNovaDomain.php
index 2e62bc8..1378ce1 100644
--- a/nova/OpenStackNovaDomain.php
+++ b/nova/OpenStackNovaDomain.php
@@ -97,7 +97,7 @@
function updateSOA() {
$ldap = LdapAuthenticationPlugin::getInstance();
$domain = [];
- $domain['soarecord'] = OpenStackNovaDomain::generateSOA();
+ $domain['soarecord'] = self::generateSOA();
$success = LdapAuthenticationPlugin::ldap_modify(
$ldap->ldapconn, $this->domainDN, $domain
);
@@ -214,7 +214,7 @@
* @return null|OpenStackNovaDomain
*/
static function getDomainByRegion( $region ) {
- $domain = OpenStackNovaDomain::getDomainByName( $region );
+ $domain = self::getDomainByName( $region );
if ( $domain ) {
if ( $domain->getLocation() ) {
return $domain;
@@ -242,7 +242,7 @@
$ldap = LdapAuthenticationPlugin::getInstance();
OpenStackNovaLdapConnection::connect();
- $soa = OpenStackNovaDomain::generateSOA();
+ $soa = self::generateSOA();
$domain = [];
$domain['objectclass'][] = 'dcobject';
$domain['objectclass'][] = 'dnsdomain';
diff --git a/nova/OpenStackNovaHost.php b/nova/OpenStackNovaHost.php
index 2f6faf5..c906b3a 100644
--- a/nova/OpenStackNovaHost.php
+++ b/nova/OpenStackNovaHost.php
@@ -302,7 +302,7 @@
OpenStackNovaLdapConnection::connect();
$domainname = $domain->getFullyQualifiedDomainName();
- $host = OpenStackNovaHost::getHostByPublicIP( $ip );
+ $host = self::getHostByPublicIP( $ip );
if ( $host ) {
$ldap->printDebug(
"Failed to add public host $hostname as the DNS
entry already exists", NONSENSITIVE
diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 228a87b..4d0f7ac 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -538,7 +538,7 @@
*/
static function getAllProjects() {
$projects = [];
- foreach ( OpenStackNovaProject::getProjectList() as $id =>
$name ) {
+ foreach ( self::getProjectList() as $id => $name ) {
[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368043 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: Ib3765db6d1538a7748e9ea81549f2e06ec12ff22
---
M composer.json
M nova/OpenStackNovaArticle.php
M nova/OpenStackNovaController.php
M nova/OpenStackNovaDomain.php
M nova/OpenStackNovaHost.php
M nova/OpenStackNovaProject.php
M nova/OpenStackNovaRole.php
M nova/OpenStackNovaUser.php
M phpcs.xml
9 files changed, 12 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/43/368043/1
diff --git a/composer.json b/composer.json
index 6a20d4f..ea7fb13 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0"
+ "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/nova/OpenStackNovaArticle.php b/nova/OpenStackNovaArticle.php
index 1556302..e779d18 100644
--- a/nova/OpenStackNovaArticle.php
+++ b/nova/OpenStackNovaArticle.php
@@ -29,7 +29,7 @@
}
public static function deleteArticle( $titletext, $namespace =
NS_NOVA_RESOURCE ) {
- if ( !OpenStackNovaArticle::canCreatePages() ) {
+ if ( !self::canCreatePages() ) {
return;
}
$title = Title::newFromText( $titletext, $namespace );
diff --git a/nova/OpenStackNovaController.php b/nova/OpenStackNovaController.php
index 4dc4f02..f81e007 100644
--- a/nova/OpenStackNovaController.php
+++ b/nova/OpenStackNovaController.php
@@ -709,7 +709,7 @@
$data['server']['name'] = $instanceName;
if ( $wgOpenStackManagerInstanceUserData ) {
$random_hash = md5( date( 'r', time() ) );
- $endl = OpenStackNovaController::getLineEnding();
+ $endl = self::getLineEnding();
$boundary = '===' . $random_hash .'==';
$userdata = 'Content-Type: multipart/mixed; boundary="'
. $boundary .'"' . $endl;
$userdata .= 'MIME-Version: 1.0' . $endl;
diff --git a/nova/OpenStackNovaDomain.php b/nova/OpenStackNovaDomain.php
index 2e62bc8..1378ce1 100644
--- a/nova/OpenStackNovaDomain.php
+++ b/nova/OpenStackNovaDomain.php
@@ -97,7 +97,7 @@
function updateSOA() {
$ldap = LdapAuthenticationPlugin::getInstance();
$domain = [];
- $domain['soarecord'] = OpenStackNovaDomain::generateSOA();
+ $domain['soarecord'] = self::generateSOA();
$success = LdapAuthenticationPlugin::ldap_modify(
$ldap->ldapconn, $this->domainDN, $domain
);
@@ -214,7 +214,7 @@
* @return null|OpenStackNovaDomain
*/
static function getDomainByRegion( $region ) {
- $domain = OpenStackNovaDomain::getDomainByName( $region );
+ $domain = self::getDomainByName( $region );
if ( $domain ) {
if ( $domain->getLocation() ) {
return $domain;
@@ -242,7 +242,7 @@
$ldap = LdapAuthenticationPlugin::getInstance();
OpenStackNovaLdapConnection::connect();
- $soa = OpenStackNovaDomain::generateSOA();
+ $soa = self::generateSOA();
$domain = [];
$domain['objectclass'][] = 'dcobject';
$domain['objectclass'][] = 'dnsdomain';
diff --git a/nova/OpenStackNovaHost.php b/nova/OpenStackNovaHost.php
index 2f6faf5..c906b3a 100644
--- a/nova/OpenStackNovaHost.php
+++ b/nova/OpenStackNovaHost.php
@@ -302,7 +302,7 @@
OpenStackNovaLdapConnection::connect();
$domainname = $domain->getFullyQualifiedDomainName();
- $host = OpenStackNovaHost::getHostByPublicIP( $ip );
+ $host = self::getHostByPublicIP( $ip );
if ( $host ) {
$ldap->printDebug(
"Failed to add public host $hostname as the DNS
entry already exists", NONSENSITIVE
diff --git a/nova/OpenStackNovaProject.php b/nova/OpenStackNovaProject.php
index 228a87b..4d0f7ac 100644
--- a/nova/OpenStackNovaProject.php
+++ b/nova/OpenStackNovaProject.php
@@ -538,7 +538,7 @@
*/
static function getAllProjects() {
$projects = [];
- foreach ( OpenStackNovaProject::getProjectList() as $id =>
$name ) {
+ foreach ( self::getProjectList() as $id => $name ) {
