jenkins-bot has submitted this change and it was merged.
Change subject: Improve names, fix version number and update rel notes
......................................................................
Improve names, fix version number and update rel notes
Change-Id: Iaab8f26acea092200b8c87126639986552cf94dd
---
M Diff.classes.php
M Diff.php
M RELEASE-NOTES.md
R src/ArrayComparer/OrderedArrayComparer.php
R src/differ/OrderedListDiffer.php
R tests/phpunit/ArrayComparer/OrderedArrayComparerTest.php
R tests/phpunit/differ/OrderedListDifferTest.php
7 files changed, 41 insertions(+), 38 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Diff.classes.php b/Diff.classes.php
index 8a3da0b..f0dd998 100644
--- a/Diff.classes.php
+++ b/Diff.classes.php
@@ -18,7 +18,7 @@
'Diff\ArrayComparer\ArrayComparer' =>
'src/ArrayComparer/ArrayComparer.php',
'Diff\ArrayComparer\NativeArrayComparer' =>
'src/ArrayComparer/NativeArrayComparer.php',
'Diff\ArrayComparer\StrategicArrayComparer' =>
'src/ArrayComparer/StrategicArrayComparer.php',
- 'Diff\ArrayComparer\StrategicOrderedArrayComparer' =>
'src/ArrayComparer/StrategicOrderedArrayComparer.php',
+ 'Diff\ArrayComparer\OrderedArrayComparer' =>
'src/ArrayComparer/OrderedArrayComparer.php',
'Diff\ArrayComparer\StrictArrayComparer' =>
'src/ArrayComparer/StrictArrayComparer.php',
'Diff\Comparer\CallbackComparer' => 'src/Comparer/CallbackComparer.php',
@@ -26,7 +26,7 @@
'Diff\Comparer\ValueComparer' => 'src/Comparer/ValueComparer.php',
'Diff\CallbackListDiffer' => 'src/differ/CallbackListDiffer.php',
- 'Diff\CallbackOrderedListDiffer' =>
'src/differ/CallbackOrderedListDiffer.php',
+ 'Diff\OrderedListDiffer' => 'src/differ/OrderedListDiffer.php',
'Diff\Differ' => 'src/differ/Differ.php',
'Diff\ListDiffer' => 'src/differ/ListDiffer.php',
'Diff\MapDiffer' => 'src/differ/MapDiffer.php',
diff --git a/Diff.php b/Diff.php
index b40ecad..43ec19f 100644
--- a/Diff.php
+++ b/Diff.php
@@ -19,7 +19,7 @@
return;
}
-define( 'Diff_VERSION', '0.8' );
+define( 'Diff_VERSION', '0.9 alpha' );
// @codeCoverageIgnoreStart
spl_autoload_register( function ( $className ) {
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 760e6c5..c8417d7 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -3,6 +3,13 @@
Latest release:
[](https://packagist.org/packages/diff/diff)
+## Version 0.9 (Under development)
+
+#### Additions
+
+* Added OrderedArrayComparer
+* Added OrderedListDiffer
+
## Version 0.8 (2013-08-26)
#### Additions
diff --git a/src/ArrayComparer/StrategicOrderedArrayComparer.php
b/src/ArrayComparer/OrderedArrayComparer.php
similarity index 93%
rename from src/ArrayComparer/StrategicOrderedArrayComparer.php
rename to src/ArrayComparer/OrderedArrayComparer.php
index 930cf0a..1ef970b 100644
--- a/src/ArrayComparer/StrategicOrderedArrayComparer.php
+++ b/src/ArrayComparer/OrderedArrayComparer.php
@@ -12,13 +12,13 @@
* Quantity matters: [42, 42] and [42] are different
* Order matters: [42, 43] and [43, 42] are different
*
- * @since 0.8
+ * @since 0.9
*
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class StrategicOrderedArrayComparer implements ArrayComparer {
+class OrderedArrayComparer implements ArrayComparer {
protected $valueComparer;
@@ -29,7 +29,7 @@
/**
* @see ArrayComparer::diffArrays
*
- * @since 0.8
+ * @since 0.9
*
* @param array $arrayOne
* @param array $arrayTwo
@@ -52,7 +52,7 @@
}
/**
- * @since 0.8
+ * @since 0.9
*
* @param string|int $needle
* @param array $haystack
diff --git a/src/differ/CallbackOrderedListDiffer.php
b/src/differ/OrderedListDiffer.php
similarity index 70%
rename from src/differ/CallbackOrderedListDiffer.php
rename to src/differ/OrderedListDiffer.php
index edbf7fe..2d8c1c0 100644
--- a/src/differ/CallbackOrderedListDiffer.php
+++ b/src/differ/OrderedListDiffer.php
@@ -2,7 +2,7 @@
namespace Diff;
-use Diff\ArrayComparer\StrategicOrderedArrayComparer;
+use Diff\ArrayComparer\OrderedArrayComparer;
use Diff\Comparer\CallbackComparer;
/**
@@ -12,16 +12,16 @@
* Quantity matters: [42, 42] and [42] are different
* Order matters: [42, 43] and [43, 42] are different
*
- * @since 0.8
+ * @since 0.9
*
* @licence GNU GPL v2+
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class CallbackOrderedListDiffer implements Differ {
+class OrderedListDiffer implements Differ {
/**
- * @since 0.8
+ * @since 0.9
*
* @var ListDiffer
*/
@@ -30,18 +30,18 @@
/**
* Constructor.
*
- * @since 0.8
+ * @since 0.9
*
* @param callable $comparisonCallback
*/
public function __construct( $comparisonCallback ) {
- $this->differ = new ListDiffer( new
StrategicOrderedArrayComparer( new CallbackComparer( $comparisonCallback ) ) );
+ $this->differ = new ListDiffer( new OrderedArrayComparer( new
CallbackComparer( $comparisonCallback ) ) );
}
/**
* @see Differ::doDiff
*
- * @since 0.8
+ * @since 0.9
*
* @param array $oldValues The first array
* @param array $newValues The second array
@@ -49,8 +49,7 @@
* @return DiffOp[]
*/
public function doDiff( array $oldValues, array $newValues ) {
- $diffOps = $this->differ->doDiff( $oldValues, $newValues );
- return $diffOps;
+ return $this->differ->doDiff( $oldValues, $newValues );
}
}
diff --git a/tests/phpunit/ArrayComparer/StrategicOrderedArrayComparerTest.php
b/tests/phpunit/ArrayComparer/OrderedArrayComparerTest.php
similarity index 86%
rename from tests/phpunit/ArrayComparer/StrategicOrderedArrayComparerTest.php
rename to tests/phpunit/ArrayComparer/OrderedArrayComparerTest.php
index 02c7d1a..d6b5c22 100644
--- a/tests/phpunit/ArrayComparer/StrategicOrderedArrayComparerTest.php
+++ b/tests/phpunit/ArrayComparer/OrderedArrayComparerTest.php
@@ -3,16 +3,13 @@
namespace Diff\Tests\ArrayComparer;
use Diff\ArrayComparer\ArrayComparer;
-use Diff\ArrayComparer\StrategicOrderedArrayComparer;
+use Diff\ArrayComparer\OrderedArrayComparer;
use Diff\Tests\DiffTestCase;
/**
- * @covers Diff\ArrayComparer\StrategicOrderedArrayComparer
+ * @covers Diff\ArrayComparer\OrderedArrayComparer
*
- * @file
- * @since 0.8
- *
- * @ingroup DiffTest
+ * @since 0.9
*
* @group Diff
*
@@ -20,10 +17,10 @@
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class StrategicOrderedArrayComparerTest extends DiffTestCase {
+class OrderedArrayComparerTest extends DiffTestCase {
public function testCanConstruct() {
- new StrategicOrderedArrayComparer( $this->getMock(
'Diff\Comparer\ValueComparer' ) );
+ new OrderedArrayComparer( $this->getMock(
'Diff\Comparer\ValueComparer' ) );
$this->assertTrue( true );
}
@@ -34,7 +31,7 @@
->method( 'valuesAreEqual' )
->will( $this->returnValue( true ) );
- $arrayComparer = new StrategicOrderedArrayComparer(
$valueComparer );
+ $arrayComparer = new OrderedArrayComparer( $valueComparer );
$this->assertNoDifference(
$arrayComparer,
@@ -84,7 +81,7 @@
->method( 'valuesAreEqual' )
->will( $this->returnValue( false ) );
- $arrayComparer = new StrategicOrderedArrayComparer(
$valueComparer );
+ $arrayComparer = new OrderedArrayComparer( $valueComparer );
$this->assertAllDifferent(
$arrayComparer,
@@ -128,7 +125,7 @@
->method( 'valuesAreEqual' )
->will( $this->returnValue( true ) );
- $arrayComparer = new StrategicOrderedArrayComparer(
$valueComparer );
+ $arrayComparer = new OrderedArrayComparer( $valueComparer );
$this->assertEquals(
array( 1, 1, 1 ),
@@ -156,7 +153,7 @@
return $firstValue == $secondValue;
} ) );
- $arrayComparer = new StrategicOrderedArrayComparer(
$valueComparer );
+ $arrayComparer = new OrderedArrayComparer( $valueComparer );
$this->assertEquals(
array( 1, 2, 3, 2, 5 ),
@@ -192,7 +189,7 @@
return $firstValue == $secondValue;
} ) );
- $arrayComparer = new StrategicOrderedArrayComparer(
$valueComparer );
+ $arrayComparer = new OrderedArrayComparer( $valueComparer );
$this->assertEquals(
array(),
@@ -246,7 +243,7 @@
)
->will( $this->returnValue( true ) );
- $arrayComparer = new StrategicOrderedArrayComparer(
$valueComparer );
+ $arrayComparer = new OrderedArrayComparer( $valueComparer );
$arrayComparer->diffArrays(
array( 1 ),
@@ -261,7 +258,7 @@
->method( 'valuesAreEqual' )
->will( $this->returnValue( '~=[,,_,,]:3' ) );
- $arrayComparer = new StrategicOrderedArrayComparer(
$valueComparer );
+ $arrayComparer = new OrderedArrayComparer( $valueComparer );
$this->setExpectedException( 'RuntimeException' );
diff --git a/tests/phpunit/differ/CallbackOrderedListDifferTest.php
b/tests/phpunit/differ/OrderedListDifferTest.php
similarity index 94%
rename from tests/phpunit/differ/CallbackOrderedListDifferTest.php
rename to tests/phpunit/differ/OrderedListDifferTest.php
index a5a2f64..7ef9354 100644
--- a/tests/phpunit/differ/CallbackOrderedListDifferTest.php
+++ b/tests/phpunit/differ/OrderedListDifferTest.php
@@ -2,15 +2,15 @@
namespace Diff\Tests;
-use Diff\CallbackOrderedListDiffer;
+use Diff\OrderedListDiffer;
use Diff\DiffOpAdd;
use Diff\DiffOpRemove;
use Diff\Differ;
/**
- * @covers Diff\CallbackOrderedListDiffer
+ * @covers Diff\OrderedListDiffer
*
- * @since 0.8
+ * @since 0.9
*
* @group Diff
* @group Differ
@@ -237,7 +237,7 @@
return is_object( $foo ) ? $foo == $bar : $foo === $bar;
};
- $this->doTestDiff( new CallbackOrderedListDiffer( $callback ),
$old, $new, $expected, $message );
+ $this->doTestDiff( new OrderedListDiffer( $callback ), $old,
$new, $expected, $message );
}
protected function doTestDiff( Differ $differ, $old, $new, $expected,
$message ) {
@@ -247,7 +247,7 @@
}
public function testCallbackComparisonReturningFalse() {
- $differ = new CallbackOrderedListDiffer( function( $foo, $bar )
{
+ $differ = new OrderedListDiffer( function( $foo, $bar ) {
return false;
} );
@@ -268,7 +268,7 @@
}
public function testCallbackComparisonReturningTrue() {
- $differ = new CallbackOrderedListDiffer( function( $foo, $bar )
{
+ $differ = new OrderedListDiffer( function( $foo, $bar ) {
return true;
} );
@@ -283,7 +283,7 @@
}
public function testCallbackComparisonReturningNyanCat() {
- $differ = new CallbackOrderedListDiffer( function( $foo, $bar )
{
+ $differ = new OrderedListDiffer( function( $foo, $bar ) {
return '~=[,,_,,]:3';
} );
--
To view, visit https://gerrit.wikimedia.org/r/85861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaab8f26acea092200b8c87126639986552cf94dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Diff
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
