調整

tokushima · Jul 8, 2023 · 8537c36 · 8537c36
1 parent c9da2dc
commit 8537c36
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/ebi/Paginator.php b/lib/ebi/Paginator.php
@@ -14,11 +14,12 @@ class Paginator implements \IteratorAggregate{
 
 	public function getIterator(): \Traversable{
 		return new \ArrayIterator([
-			'current'=>$this->current()
-			,'limit'=>$this->limit()
-			,'offset'=>$this->offset()
-			,'total'=>$this->total()
-			,'order'=>$this->order()
+			'current'=>$this->current(),
+			'pages'=>ceil($this->total() / $this->limit()),
+			'limit'=>$this->limit(),
+			'offset'=>$this->offset(),
+			'total'=>$this->total(),
+			'order'=>$this->order(),
 		]);
 	}
 	/**

diff --git a/lib/ebi/ZipArchive.php b/lib/ebi/ZipArchive.php
@@ -95,7 +95,7 @@ public function __destruct(){
 
 	/**
 	 * 書き出す
-	 * @return 書き出したZIPファイルパス
+	 * @return string 書き出したZIPファイルパス
 	 */
 	public function write(): string{
 		if (!$this->wrote) {

diff --git a/tests/test/ebi/Paginator/getIterator.php b/tests/test/ebi/Paginator/getIterator.php
@@ -3,5 +3,5 @@
 $p->total(100);
 $re = [];
 foreach($p as $k => $v) $re[$k] = $v;
-eq(array('current'=>3,'limit'=>10,'offset'=>20,'total'=>100,'order'=>null),$re);
+eq(array('current'=>3,'pages'=>10,'limit'=>10,'offset'=>20,'total'=>100,'order'=>null),$re);