Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2

zendframework · Jul 12, 2012 · aff706f · aff706f
commit aff706f
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 28 deletions.
diff --git a/src/Adapter/DbSelect.php b/src/Adapter/DbSelect.php
@@ -92,7 +92,7 @@ public function setRowCount($rowCount)
             $result = $rowCount->query(Db\Db::FETCH_ASSOC)->fetch();
 
             $this->_rowCount = count($result) > 0 ? $result[$rowCountColumn] : 0;
-        } else if (is_integer($rowCount)) {
+        } elseif (is_integer($rowCount)) {
             $this->_rowCount = $rowCount;
         } else {
             throw new Exception\InvalidArgumentException('Invalid row count');
@@ -183,7 +183,7 @@ public function getCountSelect()
              */
             if (($isDistinct && count($columnParts) > 1) || count($groupParts) > 1 || !empty($havingParts)) {
                 $rowCount = $db->select()->from($this->_select);
-            } else if ($isDistinct) {
+            } elseif ($isDistinct) {
                 $part = $columnParts[0];
 
                 if ($part[1] !== Sql\Select::SQL_WILDCARD && !($part[1] instanceof Sql\ExpressionInterface)) {
@@ -195,7 +195,7 @@ public function getCountSelect()
 
                     $groupPart = $column;
                 }
-            } else if (!empty($groupParts) && $groupParts[0] !== Sql\Select::SQL_WILDCARD &&
+            } elseif (!empty($groupParts) && $groupParts[0] !== Sql\Select::SQL_WILDCARD &&
                 !($groupParts[0] instanceof Sql\ExpressionInterface)
             ) {
                 $groupPart = $db->quoteIdentifier($groupParts[0], true);

diff --git a/src/Adapter/Exception/InvalidArgumentException.php b/src/Adapter/Exception/InvalidArgumentException.php
@@ -17,6 +17,6 @@
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface
 {}
diff --git a/src/Adapter/Exception/RuntimeException.php b/src/Adapter/Exception/RuntimeException.php
@@ -17,6 +17,6 @@
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  */
-class RuntimeException extends Exception\RuntimeException implements 
+class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
 {}
diff --git a/src/Adapter/Exception/UnexpectedValueException.php b/src/Adapter/Exception/UnexpectedValueException.php
@@ -17,6 +17,6 @@
  * @package    Zend\Paginator\Adapter
  * @subpackage Exception
  */
-class UnexpectedValueException extends Exception\UnexpectedValueException implements 
+class UnexpectedValueException extends Exception\UnexpectedValueException implements
     ExceptionInterface
 {}
diff --git a/src/AdapterPluginManager.php b/src/AdapterPluginManager.php
@@ -16,7 +16,7 @@
  * Plugin manager implementation for pagination adapters
  *
  * Enforces that adapters retrieved are instances of
- * Adapter\AdapterInterface. Additionally, it registers a number 
+ * Adapter\AdapterInterface. Additionally, it registers a number
  * of default adapters available.
  *
  * @category   Zend
@@ -26,7 +26,7 @@ class AdapterPluginManager extends AbstractPluginManager
 {
     /**
      * Default set of adapters
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
@@ -46,8 +46,8 @@ class AdapterPluginManager extends AbstractPluginManager
      * Validate the plugin
      *
      * Checks that the adapter loaded is an instance of Adapter\AdapterInterface.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\InvalidArgumentException if invalid
      */

diff --git a/src/Paginator.php b/src/Paginator.php
@@ -185,13 +185,13 @@ public static function factory($data, $adapter = self::INTERNAL_ADAPTER,
         if ($adapter == self::INTERNAL_ADAPTER) {
             if (is_array($data)) {
                 $adapter = 'array';
-            } else if ($data instanceof DbTableSelect) {
+            } elseif ($data instanceof DbTableSelect) {
                 $adapter = 'db_table_select';
-            } else if ($data instanceof DbSelect) {
+            } elseif ($data instanceof DbSelect) {
                 $adapter = 'db_select';
-            } else if ($data instanceof Iterator) {
+            } elseif ($data instanceof Iterator) {
                 $adapter = 'iterator';
-            } else if (is_integer($data)) {
+            } elseif (is_integer($data)) {
                 $adapter = 'null';
             } else {
                 $type = (is_object($data)) ? get_class($data) : gettype($data);
@@ -375,7 +375,7 @@ public function __construct($adapter)
     {
         if ($adapter instanceof AdapterInterface) {
             $this->_adapter = $adapter;
-        } else if ($adapter instanceof AdapterAggregateInterface) {
+        } elseif ($adapter instanceof AdapterAggregateInterface) {
             $this->_adapter = $adapter->getPaginatorAdapter();
         } else {
             throw new Exception\InvalidArgumentException(
@@ -604,7 +604,7 @@ public function getItem($itemNumber, $pageNumber = null)
     {
         if ($pageNumber == null) {
             $pageNumber = $this->getCurrentPageNumber();
-        } else if ($pageNumber < 0) {
+        } elseif ($pageNumber < 0) {
             $pageNumber = ($this->count() + 1) + $pageNumber;
         }
 

diff --git a/src/ScrollingStyle/Elastic.php b/src/ScrollingStyle/Elastic.php
@@ -40,7 +40,7 @@ public function getPages(Paginator $paginator, $pageRange = null)
 
         if ($originalPageRange + $pageNumber - 1 < $pageRange) {
             $pageRange = $originalPageRange + $pageNumber - 1;
-        } else if ($originalPageRange + $pageNumber - 1 > count($paginator)) {
+        } elseif ($originalPageRange + $pageNumber - 1 > count($paginator)) {
             $pageRange = $originalPageRange + count($paginator) - $pageNumber;
         }
 

diff --git a/src/ScrollingStylePluginManager.php b/src/ScrollingStylePluginManager.php
@@ -16,7 +16,7 @@
  * Plugin manager implementation for scrolling style adapters
  *
  * Enforces that adapters retrieved are instances of
- * ScrollingStyle\ScrollingStyleInterface. Additionally, it registers a number 
+ * ScrollingStyle\ScrollingStyleInterface. Additionally, it registers a number
  * of default adapters available.
  *
  * @category   Zend
@@ -26,7 +26,7 @@ class ScrollingStylePluginManager extends AbstractPluginManager
 {
     /**
      * Default set of adapters
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
@@ -40,8 +40,8 @@ class ScrollingStylePluginManager extends AbstractPluginManager
      * Validate the plugin
      *
      * Checks that the adapter loaded is an instance of ScrollingStyle\ScrollingStyleInterface.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\InvalidArgumentException if invalid
      */

diff --git a/test/Adapter/ArrayTest.php b/test/Adapter/ArrayTest.php
@@ -60,12 +60,13 @@ public function testReturnsCorrectCount()
     {
         $this->assertEquals(101, $this->_adapter->count());
     }
-    
+
 
     /**
      * @group ZF-4151
      */
-    public function testEmptySet() {
+    public function testEmptySet()
+    {
         $this->_adapter = new Adapter\ArrayAdapter(array());
         $actual = $this->_adapter->getItems(0, 10);
         $this->assertEquals(array(), $actual);

diff --git a/test/Adapter/IteratorTest.php b/test/Adapter/IteratorTest.php
@@ -95,7 +95,8 @@ public function testDoesNotThrowOutOfBoundsExceptionIfIteratorIsEmpty()
     /**
      * @group ZF-8084
      */
-    public function testGetItemsSerializable() {
+    public function testGetItemsSerializable()
+    {
         $items = $this->_adapter->getItems(0, 1);
         $innerIterator = $items->getInnerIterator();
         $items = unserialize(serialize($items));
@@ -105,7 +106,8 @@ public function testGetItemsSerializable() {
     /**
      * @group ZF-4151
      */
-    public function testEmptySet() {
+    public function testEmptySet()
+    {
         $iterator = new \ArrayIterator(array());
         $this->_adapter = new Adapter\Iterator($iterator);
         $actual = $this->_adapter->getItems(0, 10);

diff --git a/test/Adapter/NullTest.php b/test/Adapter/NullTest.php
@@ -81,16 +81,18 @@ public function testAdapterReturnsCorrectValues()
     /**
      * @group ZF-4151
      */
-    public function testEmptySet() {
+    public function testEmptySet()
+    {
         $this->_adapter = new Adapter\Null(0);
         $actual = $this->_adapter->getItems(0, 10);
         $this->assertEquals(array(), $actual);
     }
-    
+
     /**
      * Verify that the fix for ZF-4151 doesn't create an OBO error
      */
-    public function testSetOfOne() {
+    public function testSetOfOne()
+    {
         $this->_adapter = new Adapter\Null(1);
         $actual = $this->_adapter->getItems(0, 10);
         $this->assertEquals(array_fill(0, 1, null), $actual);