[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rename Convert*a*bleTimestamp to Convert*i*bleTimestamp
jenkins-bot has submitted this change and it was merged.
Change subject: Rename Convert*a*bleTimestamp to Convert*i*bleTimestamp
..
Rename Convert*a*bleTimestamp to Convert*i*bleTimestamp
Per the dictionary.
Change-Id: I3dcef9fb020c8c6764ee073111ed8c032e4c5a63
---
M autoload.php
M includes/MWTimestamp.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/DatabasePostgres.php
R includes/libs/time/ConvertibleTimestamp.php
M includes/libs/xmp/XMPValidate.php
R tests/phpunit/includes/libs/time/ConvertibleTimestampTest.php
7 files changed, 32 insertions(+), 32 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/autoload.php b/autoload.php
index efd34ea..433f907 100644
--- a/autoload.php
+++ b/autoload.php
@@ -281,8 +281,8 @@
'ConvertExtensionToRegistration' => __DIR__ .
'/maintenance/convertExtensionToRegistration.php',
'ConvertLinks' => __DIR__ . '/maintenance/convertLinks.php',
'ConvertUserOptions' => __DIR__ . '/maintenance/convertUserOptions.php',
- 'ConvertableTimestamp' => __DIR__ .
'/includes/libs/time/ConvertableTimestamp.php',
'ConverterRule' => __DIR__ . '/languages/ConverterRule.php',
+ 'ConvertibleTimestamp' => __DIR__ .
'/includes/libs/time/ConvertibleTimestamp.php',
'Cookie' => __DIR__ . '/includes/libs/Cookie.php',
'CookieJar' => __DIR__ . '/includes/libs/CookieJar.php',
'CopyFileBackend' => __DIR__ . '/maintenance/copyFileBackend.php',
diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index 201e9b6..c1e5cc4 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -28,7 +28,7 @@
*
* @since 1.20
*/
-class MWTimestamp extends ConvertableTimestamp {
+class MWTimestamp extends ConvertibleTimestamp {
/**
* Get a timestamp instance in GMT
*
diff --git a/includes/libs/rdbms/database/Database.php
b/includes/libs/rdbms/database/Database.php
index 04ce8ab..d3c9d57 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2972,7 +2972,7 @@
}
public function timestamp( $ts = 0 ) {
- $t = new ConvertableTimestamp( $ts );
+ $t = new ConvertibleTimestamp( $ts );
// Let errors bubble up to avoid putting garbage in the DB
return $t->getTimestamp( TS_MW );
}
@@ -3459,7 +3459,7 @@
}
try {
- $t = new ConvertableTimestamp( $expiry );
+ $t = new ConvertibleTimestamp( $expiry );
return $t->getTimestamp( $format );
} catch ( TimestampException $e ) {
diff --git a/includes/libs/rdbms/database/DatabasePostgres.php
b/includes/libs/rdbms/database/DatabasePostgres.php
index 69488af..8c73a15 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -860,7 +860,7 @@
}
function timestamp( $ts = 0 ) {
- $ct = new ConvertableTimestamp( $ts );
+ $ct = new ConvertibleTimestamp( $ts );
return $ct->getTimestamp( TS_POSTGRES );
}
diff --git a/includes/libs/time/ConvertableTimestamp.php
b/includes/libs/time/ConvertibleTimestamp.php
similarity index 97%
rename from includes/libs/time/ConvertableTimestamp.php
rename to includes/libs/time/ConvertibleTimestamp.php
index a784dc6..7cada84 100644
--- a/includes/libs/time/ConvertableTimestamp.php
+++ b/includes/libs/time/ConvertibleTimestamp.php
@@ -28,7 +28,7 @@
*
* @since 1.28
*/
-class ConvertableTimestamp {
+class ConvertibleTimestamp {
/**
* Standard gmdate() formats for the different timestamp types.
*/
@@ -226,11 +226,11 @@
/**
* Calculate the difference between two ConvertableTimestamp objects.
*
-* @param ConvertableTimestamp $relativeTo Base time to calculate
difference from
+* @param ConvertibleTimestamp $relativeTo Base time to calculate
difference from
* @return DateInterval|bool The DateInterval object representing the
* difference between the two dates or false on failure
*/
- public function diff( ConvertableTimestamp $relativeTo ) {
+ public function diff( ConvertibleTimestamp $relativeTo ) {
return $this->timestamp->diff( $relativeTo->timestamp );
}
diff --git a/includes/libs/xmp/XMPValidate.php
b/includes/libs/xmp/XMPValidate.php
index 32a3340..aaf6491 100644
--- a/includes/libs/xmp/XMPValidate.php
+++ b/includes/libs/xmp/XMPValidate.php
@@ -329,7 +329,7 @@
// We know that if we got to this step, year, month day
hour and min must be set
// by virtue of regex not failing.
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rename Convert*a*bleTimestamp to Convert*i*bleTimestamp
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312172
Change subject: Rename Convert*a*bleTimestamp to Convert*i*bleTimestamp
..
Rename Convert*a*bleTimestamp to Convert*i*bleTimestamp
Per the dictionary.
Change-Id: I3dcef9fb020c8c6764ee073111ed8c032e4c5a63
---
M autoload.php
M includes/MWTimestamp.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/DatabasePostgres.php
R includes/libs/time/ConvertibleTimestamp.php
M includes/libs/xmp/XMPValidate.php
R tests/phpunit/includes/libs/time/ConvertibleTimestampTest.php
7 files changed, 32 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/72/312172/1
diff --git a/autoload.php b/autoload.php
index efd34ea..433f907 100644
--- a/autoload.php
+++ b/autoload.php
@@ -281,8 +281,8 @@
'ConvertExtensionToRegistration' => __DIR__ .
'/maintenance/convertExtensionToRegistration.php',
'ConvertLinks' => __DIR__ . '/maintenance/convertLinks.php',
'ConvertUserOptions' => __DIR__ . '/maintenance/convertUserOptions.php',
- 'ConvertableTimestamp' => __DIR__ .
'/includes/libs/time/ConvertableTimestamp.php',
'ConverterRule' => __DIR__ . '/languages/ConverterRule.php',
+ 'ConvertibleTimestamp' => __DIR__ .
'/includes/libs/time/ConvertibleTimestamp.php',
'Cookie' => __DIR__ . '/includes/libs/Cookie.php',
'CookieJar' => __DIR__ . '/includes/libs/CookieJar.php',
'CopyFileBackend' => __DIR__ . '/maintenance/copyFileBackend.php',
diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index 201e9b6..c1e5cc4 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -28,7 +28,7 @@
*
* @since 1.20
*/
-class MWTimestamp extends ConvertableTimestamp {
+class MWTimestamp extends ConvertibleTimestamp {
/**
* Get a timestamp instance in GMT
*
diff --git a/includes/libs/rdbms/database/Database.php
b/includes/libs/rdbms/database/Database.php
index 04ce8ab..d3c9d57 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -2972,7 +2972,7 @@
}
public function timestamp( $ts = 0 ) {
- $t = new ConvertableTimestamp( $ts );
+ $t = new ConvertibleTimestamp( $ts );
// Let errors bubble up to avoid putting garbage in the DB
return $t->getTimestamp( TS_MW );
}
@@ -3459,7 +3459,7 @@
}
try {
- $t = new ConvertableTimestamp( $expiry );
+ $t = new ConvertibleTimestamp( $expiry );
return $t->getTimestamp( $format );
} catch ( TimestampException $e ) {
diff --git a/includes/libs/rdbms/database/DatabasePostgres.php
b/includes/libs/rdbms/database/DatabasePostgres.php
index 69488af..8c73a15 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -860,7 +860,7 @@
}
function timestamp( $ts = 0 ) {
- $ct = new ConvertableTimestamp( $ts );
+ $ct = new ConvertibleTimestamp( $ts );
return $ct->getTimestamp( TS_POSTGRES );
}
diff --git a/includes/libs/time/ConvertableTimestamp.php
b/includes/libs/time/ConvertibleTimestamp.php
similarity index 97%
rename from includes/libs/time/ConvertableTimestamp.php
rename to includes/libs/time/ConvertibleTimestamp.php
index a784dc6..7cada84 100644
--- a/includes/libs/time/ConvertableTimestamp.php
+++ b/includes/libs/time/ConvertibleTimestamp.php
@@ -28,7 +28,7 @@
*
* @since 1.28
*/
-class ConvertableTimestamp {
+class ConvertibleTimestamp {
/**
* Standard gmdate() formats for the different timestamp types.
*/
@@ -226,11 +226,11 @@
/**
* Calculate the difference between two ConvertableTimestamp objects.
*
-* @param ConvertableTimestamp $relativeTo Base time to calculate
difference from
+* @param ConvertibleTimestamp $relativeTo Base time to calculate
difference from
* @return DateInterval|bool The DateInterval object representing the
* difference between the two dates or false on failure
*/
- public function diff( ConvertableTimestamp $relativeTo ) {
+ public function diff( ConvertibleTimestamp $relativeTo ) {
return $this->timestamp->diff( $relativeTo->timestamp );
}
diff --git a/includes/libs/xmp/XMPValidate.php
b/includes/libs/xmp/XMPValidate.php
index 32a3340..aaf6491 100644
--- a/includes/libs/xmp/XMPValidate.php
+++ b/includes/libs/xmp/XMPValidate.php
@@ -329,7 +329,7 @@
// We know that if we got to this step, year, month day
hour and min must be set
// by virtue of regex not failing.
-
