Merge pull request #3 from AyrtonRicardo/master

Ajustes no dictionary
italolelis · Sep 5, 2014 · 2dc05dc · 2dc05dc
2 parents f7961fb + 0c031a9
commit 2dc05dc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@ composer.lock
 /resources/cache/*
 resources/cache
 resources/cache/*
-/build/
+/build/
+
diff --git a/src/Easy/Collections/ArrayList.php b/src/Easy/Collections/ArrayList.php
@@ -96,7 +96,7 @@ public function offsetExists($offset)
     public function offsetGet($offset)
     {
         if ($this->containsKey($offset) === false) {
-            throw new OutOfBoundsException('No element at position ' . $index);
+            throw new OutOfBoundsException('No element at position ' . $offset);
         }
 
         return $this->array[$offset];

diff --git a/src/Easy/Collections/CollectionArray.php b/src/Easy/Collections/CollectionArray.php
@@ -152,7 +152,8 @@ public function matching(Criteria $criteria)
             $filtered = array_filter($filtered, $filter);
         }
 
-        if ($orderings = $criteria->getOrderings()) {
+        $orderings = $criteria->getOrderings();
+        if ($orderings) {
             $next = null;
             foreach (array_reverse($orderings) as $field => $ordering) {
                 $next = ClosureExpressionVisitor::sortByField($field, $ordering == 'DESC' ? -1 : 1, $next);

diff --git a/src/Easy/Collections/Dictionary.php b/src/Easy/Collections/Dictionary.php
@@ -83,7 +83,7 @@ public function offsetExists($offset)
     public function offsetGet($offset)
     {
         if ($this->containsKey($offset) === false) {
-            throw new OutOfBoundsException('No element at position ' . $index);
+            throw new OutOfBoundsException('No element at position ' . $offset);
         }
 
         if (is_object($offset)) {

diff --git a/tests/Easy/Tests/Collections/DictionaryTest.php b/tests/Easy/Tests/Collections/DictionaryTest.php
@@ -10,7 +10,7 @@
 use ArrayObject;
 use Easy\Collections\Dictionary;
 use InvalidArgumentException;
-use PHPUnit_Framework_Error_Notice;
+use OutOfBoundsException;
 use stdClass;
 
 /**
@@ -117,7 +117,7 @@ public function testGetItem()
     }
 
     /**
-     * @expectedException PHPUnit_Framework_Error_Notice
+     * @expectedException OutOfBoundsException
      */
     public function testGetInvalidItem()
     {