composer update
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* PHPExcel
|
||||
* PHPExcel_WorksheetIterator
|
||||
*
|
||||
* Copyright (c) 2006 - 2014 PHPExcel
|
||||
* Copyright (c) 2006 - 2015 PHPExcel
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -20,21 +21,10 @@
|
||||
*
|
||||
* @category PHPExcel
|
||||
* @package PHPExcel
|
||||
* @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
|
||||
* @version ##VERSION##, ##DATE##
|
||||
*/
|
||||
|
||||
|
||||
/**
|
||||
* PHPExcel_WorksheetIterator
|
||||
*
|
||||
* Used to iterate worksheets in PHPExcel
|
||||
*
|
||||
* @category PHPExcel
|
||||
* @package PHPExcel
|
||||
* @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
*/
|
||||
class PHPExcel_WorksheetIterator implements Iterator
|
||||
{
|
||||
/**
|
||||
@@ -42,14 +32,14 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*
|
||||
* @var PHPExcel
|
||||
*/
|
||||
private $_subject;
|
||||
private $subject;
|
||||
|
||||
/**
|
||||
* Current iterator position
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $_position = 0;
|
||||
private $position = 0;
|
||||
|
||||
/**
|
||||
* Create a new worksheet iterator
|
||||
@@ -59,7 +49,7 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
public function __construct(PHPExcel $subject = null)
|
||||
{
|
||||
// Set subject
|
||||
$this->_subject = $subject;
|
||||
$this->subject = $subject;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -67,7 +57,7 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*/
|
||||
public function __destruct()
|
||||
{
|
||||
unset($this->_subject);
|
||||
unset($this->subject);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -75,7 +65,7 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*/
|
||||
public function rewind()
|
||||
{
|
||||
$this->_position = 0;
|
||||
$this->position = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -85,7 +75,7 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*/
|
||||
public function current()
|
||||
{
|
||||
return $this->_subject->getSheet($this->_position);
|
||||
return $this->subject->getSheet($this->position);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -95,7 +85,7 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*/
|
||||
public function key()
|
||||
{
|
||||
return $this->_position;
|
||||
return $this->position;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -103,7 +93,7 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*/
|
||||
public function next()
|
||||
{
|
||||
++$this->_position;
|
||||
++$this->position;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -113,6 +103,6 @@ class PHPExcel_WorksheetIterator implements Iterator
|
||||
*/
|
||||
public function valid()
|
||||
{
|
||||
return $this->_position < $this->_subject->getSheetCount();
|
||||
return $this->position < $this->subject->getSheetCount();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user