Update exception type to a class that exists.

cakephp · Dec 23, 2013 · f0164dd · f0164dd
1 parent 680e13d
commit f0164dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Cake/Test/TestCase/Utility/HashTest.php b/Cake/Test/TestCase/Utility/HashTest.php
@@ -1523,7 +1523,7 @@ public function testCombine() {
 /**
  * test combine() giving errors on key/value length mismatches.
  *
- * @expectedException CakeException
+ * @expectedException RuntimeException
  * @return void
  */
 	public function testCombineErrorMissingValue() {
@@ -1537,7 +1537,7 @@ public function testCombineErrorMissingValue() {
 /**
  * test combine() giving errors on key/value length mismatches.
  *
- * @expectedException CakeException
+ * @expectedException RuntimeException
  * @return void
  */
 	public function testCombineErrorMissingKey() {

diff --git a/Cake/Utility/Hash.php b/Cake/Utility/Hash.php
@@ -362,7 +362,7 @@ public static function remove(array $data, $path) {
  * @param string $groupPath A dot-separated string.
  * @return array Combined array
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::combine
- * @throws CakeException CakeException When keys and values count is unequal.
+ * @throws \RuntimeException  When keys and values count is unequal.
  */
 	public static function combine(array $data, $keyPath, $valuePath = null, $groupPath = null) {
 		if (empty($data)) {
@@ -390,7 +390,7 @@ public static function combine(array $data, $keyPath, $valuePath = null, $groupP
 		}
 
 		if (count($keys) !== count($vals)) {
-			throw new CakeException(__d(
+			throw new \RuntimeException(__d(
 				'cake_dev',
 				'Hash::combine() needs an equal number of keys + values.'
 			));