fix conflicts

williamespindola · Sep 22, 2015 · 7e0a3b8 · 7e0a3b8
2 parents 434e4fb + f1205db
commit 7e0a3b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tests/unit/Repository/RepositoryAbstractTest.php b/tests/unit/Repository/RepositoryAbstractTest.php
@@ -89,4 +89,4 @@ public function getStorage()
     {
         return $this->storage;
     }
-}
+}
diff --git a/tests/unit/Storage/ORM/RespectRelationalTest.php b/tests/unit/Storage/ORM/RespectRelationalTest.php
@@ -59,6 +59,9 @@ public function testSetRepositoryWithInvalidValueShouldThrowAndException()
         $instance->setRepository('');
     }
 
+    /**
+     * @depends testSetRepositoryWithInvalidValueShouldThrowAndException
+     */
     public function testSetRepositoryWithAValidNamespaceShouldWork()
     {
         $instance   = new RespectRelational($this->mapper);
@@ -96,4 +99,4 @@ public function testGetRepositoryShouldReturnMockedInstance()
             'The attribute repository is not instance of the string class name: Respect\Data\Collections\Collection'
         );
     }
-} 
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,4 +89,4 @@ public function getStorage() @@
         {
             return $this->storage;
         }
-    }
+    }