Merge branch 'InternalClassClean'

* InternalClassClean:
  Fixed test
  Patch improvement:
  Fixed indentation. Fixed comment style. Fixed commented out code.
  Reverted change to function name and added note of why it is different from the class it is actually changing.
  Made UConverter throw an exception if the constructor fails.
  Fixed PDO constructor to not return null.
  Fixed fileinfo behaviour.
  Made Phar throw exception on bad constructor.
  Converted intl extension to use IntlException in constructors.
  Fixed SplFixedArray and tests.
  Fixed ReflectionExtension and ReflectionProperty.
  Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
  Fixed PDORow behaviour and message.

1 files changed, 5 insertions, 2 deletions

diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
index 0cabfe6aa3..2a890c963d 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
@@ -28,8 +28,11 @@ MySQLPDOTest::skip();
 
 	try {
 
-		if (NULL !== ($db = @new PDO()))
-			printf("[001] Too few parameters\n");
+	    try {
+			if (NULL !== ($db = @new PDO()))
+				printf("[001] Too few parameters\n");
+		} catch (Exception $ex) {
+		}
 
 		print tryandcatch(2, '$db = new PDO(chr(0));');
 		print tryandcatch(3, '$db = new PDO("a" . chr(0) . "b");');