Convert some SPL Exceptions to normal Errors in spl_directory.c

Author: Girgias

ext/spl/spl_directory.c

@@ -720,7 +720,7 @@ void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_long cto
 		return;
 	}
 	if (!len) {
-		zend_throw_exception_ex(spl_ce_RuntimeException, 0, "Directory name must not be empty.");
+		zend_value_error("Directory name must not be empty");
 		zend_restore_error_handling(&error_handling);
 		return;
 	}
@@ -852,7 +852,7 @@ SPL_METHOD(DirectoryIterator, seek)
 		valid = zend_is_true(&retval);
 		zval_ptr_dtor(&retval);
 		if (!valid) {
-			zend_throw_exception_ex(spl_ce_OutOfBoundsException, 0, "Seek position " ZEND_LONG_FMT " is out of range", pos);
+			zend_value_error("Seek position " ZEND_LONG_FMT " is out of range", pos);
 			RETURN_THROWS();
 		}
 		zend_call_method_with_0_params(Z_OBJ_P(ZEND_THIS), Z_OBJCE_P(ZEND_THIS), &intern->u.dir.func_next, "next", NULL);
@@ -2500,7 +2500,7 @@ SPL_METHOD(SplFileObject, setMaxLineLen)
 	}
 
 	if (max_len < 0) {
-		zend_throw_exception_ex(spl_ce_DomainException, 0, "Maximum line length must be greater than or equal zero");
+		zend_value_error("Maximum line length must be greater than or equal zero");
 		RETURN_THROWS();
 	}
 
@@ -2965,7 +2965,7 @@ SPL_METHOD(SplFileObject, seek)
 	}
 
 	if (line_pos < 0) {
-		zend_throw_exception_ex(spl_ce_LogicException, 0, "Can't seek file %s to negative line " ZEND_LONG_FMT, intern->file_name, line_pos);
+		zend_value_error("Can't seek file %s to negative line", intern->file_name);
 		RETURN_THROWS();
 	}
 

ext/spl/tests/DirectoryIterator_empty_constructor.phpt

@@ -5,11 +5,13 @@ Havard Eide <nucleuz@gmail.com>
 #PHPTestFest2009 Norway 2009-06-09 \o/
 --FILE--
 <?php
-$it = new DirectoryIterator("");
+
+try {
+    new DirectoryIterator("");
+} catch (\ValueError $ex) {
+    echo $ex->getMessage() . PHP_EOL;
+}
+
 ?>
---EXPECTF--
-Fatal error: Uncaught RuntimeException: Directory name must not be empty. in %s:%d
-Stack trace:
-#0 %s(%d): DirectoryIterator->__construct('')
-#1 {main}
-  thrown in %s on line %d
+--EXPECT--
+Directory name must not be empty

ext/spl/tests/SplFileObject_seek_error_001.phpt

@@ -4,10 +4,10 @@ SplFileObject::seek function - test parameters
 <?php
 $obj = new SplFileObject(__FILE__);
 try {
-    $obj->seek(-1);
-} catch (LogicException $e) {
-    echo($e->getMessage());
+	$obj->seek(-1);
+} catch (\ValueError $e) {
+	echo($e->getMessage());
 }
 ?>
 --EXPECTF--
-Can't seek file %s to negative line -1
+Can't seek file %s to negative line

ext/spl/tests/bug70561.phpt

@@ -13,7 +13,7 @@ while ($di->valid()) {
 
 try {
     $di->seek($cnt+1);
-} catch (OutOfBoundsException $ex) {
+} catch (\ValueError $ex) {
     echo $ex->getMessage() . PHP_EOL;
 }
 echo "Is valid? " . (int) $di->valid() . PHP_EOL;

ext/spl/tests/dit_006.phpt

@@ -34,7 +34,7 @@ try {
     $p = 0;
     $di->seek($o+1);
     $p = 1;
-} catch (\OutOfBoundsException $ex) {
+} catch (\ValueError $ex) {
     echo $ex->getMessage() . PHP_EOL;
 }
 

ext/spl/tests/fileobject_setmaxlinelen_error001.phpt

@@ -8,10 +8,10 @@ $s = new SplFileObject( __FILE__ );
 try {
     $s->setMaxLineLen(-1);
 }
-catch (DomainException $e) {
-    echo 'DomainException thrown';
+catch (\ValueError $e) {
+	echo($e->getMessage());
 }
 
 ?>
 --EXPECT--
-DomainException thrown
+Maximum line length must be greater than or equal zero