[MediaWiki-commits] [Gerrit] renaming of read and write methods for database access - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged.
Change subject: renaming of read and write methods for database access
..
renaming of read and write methods for database access
readFromBB-readFromDatabase
writeDBEntry-writeToDatabase
Change-Id: I426be5dc479ad789d0e85b149a989a581945c9be
---
M MathRenderer.php
M MathTexvc.php
M tests/MathDatabaseTest.php
M tests/MathRendererTest.php
M tests/MathTexvcTest.php
5 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
Hashar: Looks good to me, approved
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MathRenderer.php b/MathRenderer.php
index 2c35aab..1d60332 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -118,7 +118,7 @@
*
* @return boolean true if read successfully, false otherwise
*/
- public function readFromDB() {
+ public function readFromDatabase() {
$dbr = wfGetDB( DB_SLAVE );
$rpage = $dbr-selectRow(
'math',
@@ -150,7 +150,7 @@
/**
* Writes rendering entry to database
*/
- public function writeDBEntry() {
+ public function writeToDatabase() {
# Now save it back to the DB:
if ( !wfReadOnly() ) {
$dbw = wfGetDB( DB_MASTER );
diff --git a/MathTexvc.php b/MathTexvc.php
index 25f456a..9fc8e7e 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -279,7 +279,7 @@
if ( $this-isRecall() ) {
return;
}
- $this-writeDBEntry();
+ $this-writeToDatabase();
// If we're replacing an older version of the image, make sure
it's current.
if ( $wgUseSquid ) {
$urls = array( $this-getMathImageUrl() );
@@ -295,7 +295,7 @@
*/
function readCache() {
global $wgMathCheckFiles;
- if ( $this-readFromDB() ) {
+ if ( $this-readFromDatabase() ) {
if ( !$wgMathCheckFiles ) {
// Short-circuit the file existence migration
checks
return true;
diff --git a/tests/MathDatabaseTest.php b/tests/MathDatabaseTest.php
index 3e931ae..9014896 100644
--- a/tests/MathDatabaseTest.php
+++ b/tests/MathDatabaseTest.php
@@ -65,10 +65,10 @@
$this-setValues();
$wgDebugMath = false;
- $this-renderer-writeDBEntry();
+ $this-renderer-writeToDatabase();
$renderer2 = $this-getMockForAbstractClass( 'MathRenderer',
array ( self::SOME_TEX ) );
- $renderer2-readFromDB();
+ $renderer2-readFromDatabase();
// comparing the class object does now work due to null values
etc.
// $this-assertEquals($this-renderer,$renderer2);
$this-assertEquals( $this-renderer-getTex(),
$renderer2-getTex(), test if tex is the same );
@@ -90,7 +90,7 @@
$dbu-doUpdates( array( extensions ) );
$this-expectOutputRegex( '/(.*)Creating math table(.*)/' );
$this-setValues();
- $this-renderer-writeDBEntry();
+ $this-renderer-writeToDatabase();
$res = $this-db-select( math, * );
$row = $res-fetchRow();
$this-assertEquals( sizeof( $row ), 2 * self::NUM_BASIC_FIELDS
);
diff --git a/tests/MathRendererTest.php b/tests/MathRendererTest.php
index 846734e..d985330 100644
--- a/tests/MathRendererTest.php
+++ b/tests/MathRendererTest.php
@@ -22,11 +22,11 @@
*/
public function testWriteCacheSkip() {
$renderer = $this-getMockBuilder( 'MathRenderer' )
- -setMethods( array( 'writeDBEntry' , 'render' ) )
+ -setMethods( array( 'writeToDatabase' , 'render' ) )
-disableOriginalConstructor()
-getMock();
$renderer-expects( $this-never() )
- -method( 'writeDBEntry' );
+ -method( 'writeToDatabase' );
$renderer-writeCache();
}
@@ -36,11 +36,11 @@
*/
public function testWriteCache() {
$renderer = $this-getMockBuilder( 'MathRenderer' )
- -setMethods( array( 'writeDBEntry' , 'render' ) )
+ -setMethods( array( 'writeToDatabase' , 'render' ) )
-disableOriginalConstructor()
-getMock();
$renderer-expects( $this-never() )
- -method( 'writeDBEntry' );
+ -method( 'writeToDatabase' );
$renderer-writeCache();
}
}
\ No newline at end of file
diff --git
[MediaWiki-commits] [Gerrit] renaming of read and write methods for database access - change (mediawiki...Math)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/60627
Change subject: renaming of read and write methods for database access
..
renaming of read and write methods for database access
readFromBB-readFromDatabase
writeDBEntry-writeToDatabase
Change-Id: I426be5dc479ad789d0e85b149a989a581945c9be
---
M MathRenderer.php
M MathTexvc.php
M tests/MathDatabaseTest.php
M tests/MathRendererTest.php
M tests/MathTexvcTest.php
5 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/27/60627/1
diff --git a/MathRenderer.php b/MathRenderer.php
index 2c35aab..1d60332 100644
--- a/MathRenderer.php
+++ b/MathRenderer.php
@@ -118,7 +118,7 @@
*
* @return boolean true if read successfully, false otherwise
*/
- public function readFromDB() {
+ public function readFromDatabase() {
$dbr = wfGetDB( DB_SLAVE );
$rpage = $dbr-selectRow(
'math',
@@ -150,7 +150,7 @@
/**
* Writes rendering entry to database
*/
- public function writeDBEntry() {
+ public function writeToDatabase() {
# Now save it back to the DB:
if ( !wfReadOnly() ) {
$dbw = wfGetDB( DB_MASTER );
diff --git a/MathTexvc.php b/MathTexvc.php
index 25f456a..9fc8e7e 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -279,7 +279,7 @@
if ( $this-isRecall() ) {
return;
}
- $this-writeDBEntry();
+ $this-writeToDatabase();
// If we're replacing an older version of the image, make sure
it's current.
if ( $wgUseSquid ) {
$urls = array( $this-getMathImageUrl() );
@@ -295,7 +295,7 @@
*/
function readCache() {
global $wgMathCheckFiles;
- if ( $this-readFromDB() ) {
+ if ( $this-readFromDatabase() ) {
if ( !$wgMathCheckFiles ) {
// Short-circuit the file existence migration
checks
return true;
diff --git a/tests/MathDatabaseTest.php b/tests/MathDatabaseTest.php
index 3e931ae..9014896 100644
--- a/tests/MathDatabaseTest.php
+++ b/tests/MathDatabaseTest.php
@@ -65,10 +65,10 @@
$this-setValues();
$wgDebugMath = false;
- $this-renderer-writeDBEntry();
+ $this-renderer-writeToDatabase();
$renderer2 = $this-getMockForAbstractClass( 'MathRenderer',
array ( self::SOME_TEX ) );
- $renderer2-readFromDB();
+ $renderer2-readFromDatabase();
// comparing the class object does now work due to null values
etc.
// $this-assertEquals($this-renderer,$renderer2);
$this-assertEquals( $this-renderer-getTex(),
$renderer2-getTex(), test if tex is the same );
@@ -90,7 +90,7 @@
$dbu-doUpdates( array( extensions ) );
$this-expectOutputRegex( '/(.*)Creating math table(.*)/' );
$this-setValues();
- $this-renderer-writeDBEntry();
+ $this-renderer-writeToDatabase();
$res = $this-db-select( math, * );
$row = $res-fetchRow();
$this-assertEquals( sizeof( $row ), 2 * self::NUM_BASIC_FIELDS
);
diff --git a/tests/MathRendererTest.php b/tests/MathRendererTest.php
index 846734e..d985330 100644
--- a/tests/MathRendererTest.php
+++ b/tests/MathRendererTest.php
@@ -22,11 +22,11 @@
*/
public function testWriteCacheSkip() {
$renderer = $this-getMockBuilder( 'MathRenderer' )
- -setMethods( array( 'writeDBEntry' , 'render' ) )
+ -setMethods( array( 'writeToDatabase' , 'render' ) )
-disableOriginalConstructor()
-getMock();
$renderer-expects( $this-never() )
- -method( 'writeDBEntry' );
+ -method( 'writeToDatabase' );
$renderer-writeCache();
}
@@ -36,11 +36,11 @@
*/
public function testWriteCache() {
$renderer = $this-getMockBuilder( 'MathRenderer' )
- -setMethods( array( 'writeDBEntry' , 'render' ) )
+ -setMethods( array( 'writeToDatabase' , 'render' ) )
-disableOriginalConstructor()
-getMock();
$renderer-expects( $this-never() )
- -method( 'writeDBEntry' );
+ -method( 'writeToDatabase' );
$renderer-writeCache();
}
}
\ No newline at end of file
diff --git a/tests/MathTexvcTest.php
