SpecialPageExecutor: Use `finally` now that we're in a PHP 5.5+ world
authorKunal Mehta <legoktm@member.fsf.org>
Tue, 4 Sep 2018 05:10:06 +0000 (22:10 -0700)
committerKunal Mehta <legoktm@member.fsf.org>
Tue, 4 Sep 2018 05:10:55 +0000 (22:10 -0700)
Change-Id: I2f91998781be492557d90444b773951ae1e1580e

tests/phpunit/includes/specials/SpecialPageExecutor.php

index 9572e30..abb0d11 100644 (file)
@@ -117,15 +117,10 @@ class SpecialPageExecutor {
                        } else {
                                $html = $output->getHTML();
                        }
-               } catch ( Exception $ex ) {
+               } finally {
                        ob_end_clean();
-
-                       // Re-throw exception after "finally" handling because PHP 5.3 doesn't have "finally".
-                       throw $ex;
                }
 
-               ob_end_clean();
-
                return $html;
        }