Fixed #65213 - cannot cast SplFileInfo to boolean

datibbaw · datibbaw · commit 2bcf8a6cd921 · 2014-12-04T07:17:33.000+08:00
diff --git a/NEWS b/NEWS
@@ -25,6 +25,7 @@ PHP                                                                        NEWS
 - SPL:
   . Fixed bug #66405 (RecursiveDirectoryIterator::CURRENT_AS_PATHNAME
     breaks the RecursiveIterator). (Paul Garvin)
+  . Fixed bug #65213 (cannot cast SplFileInfo to boolean) (Tjerk)
 
 11 Dec 2014, PHP 5.5.20
 
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
@@ -1907,6 +1907,9 @@ static int spl_filesystem_object_cast(zval *readobj, zval *writeobj, int type TS
 			}
 			return SUCCESS;
 		}
+	} else if (type == IS_BOOL) {
+		ZVAL_BOOL(writeobj, 1);
+		return SUCCESS;
 	}
 	if (readobj == writeobj) {
 		zval_dtor(readobj);
diff --git a/ext/spl/tests/bug65213.phpt b/ext/spl/tests/bug65213.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #65213 (cannot cast SplFileInfo to boolean)
+--FILE--
+<?php
+
+$o = new SplFileInfo('.');
+var_dump((bool) $o);
+
+?>
+===DONE===
+--EXPECT--
+bool(true)
+===DONE===

Original file line number	Diff line number	Diff line change
`@@ -1907,6 +1907,9 @@ static int spl_filesystem_object_cast(zval readobj, zval writeobj, int type TS`
`1907`	`1907`	`}`
`1908`	`1908`	`return SUCCESS;`
`1909`	`1909`	`}`
	`1910`	`+ } else if (type == IS_BOOL) {`
	`1911`	`+ ZVAL_BOOL(writeobj, 1);`
	`1912`	`+ return SUCCESS;`
`1910`	`1913`	`}`
`1911`	`1914`	`if (readobj == writeobj) {`
`1912`	`1915`	`zval_dtor(readobj);`