tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-04 07:08:34 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Modulus and MultipleOf should start at index 0 to match the iterator position, by default (from r94071)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95586 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-12-16 05:36:04 +00:00
parent a481bc5de7
commit ed630229ab
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/ViewableData.php
View File

@ -623,7 +623,7 @@ class ViewableData extends Object implements IteratorAggregate {
/**
* Returns the modulus of the numerical position of the item in the data set.
* The count starts from $startIndex, which defaults to 1.
* The count starts from $startIndex, which defaults to 0.
* @param int $Mod The number to perform Mod operation to.
* @param int $startIndex Number to start count from.
* @return int
@ -632,7 +632,7 @@ class ViewableData extends Object implements IteratorAggregate {
return ($this->iteratorPos + $startIndex) % $mod;
}
public function MultipleOf($factor, $offset = 1) {
public function MultipleOf($factor, $offset = 0) {
return ($this->Modulus($factor, $offset) == 0);
}

12
tests/DataObjectSetTest.php
View File

@ -84,15 +84,15 @@ class DataObjectSetTest extends SapphireTest {
}
}
$this->assertEquals(2, $multiplesOf3);
$this->assertEquals(3, $multiplesOf3);
$this->assertFalse($commArr[0]->IsMultipleOf3);
$this->assertTrue($commArr[0]->IsMultipleOf3);
$this->assertFalse($commArr[1]->IsMultipleOf3);
$this->assertTrue($commArr[2]->IsMultipleOf3);
$this->assertFalse($commArr[3]->IsMultipleOf3);
$this->assertFalse($commArr[2]->IsMultipleOf3);
$this->assertTrue($commArr[3]->IsMultipleOf3);
$this->assertFalse($commArr[4]->IsMultipleOf3);
$this->assertTrue($commArr[5]->IsMultipleOf3);
$this->assertFalse($commArr[6]->IsMultipleOf3);
$this->assertFalse($commArr[5]->IsMultipleOf3);
$this->assertTrue($commArr[6]->IsMultipleOf3);
}
/**