From 660857a80f52d3801615f06bdf7c4cc050a40ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= <theo.fidry@gmail.com>
Date: Tue, 20 Feb 2018 22:12:16 +0000
Subject: [PATCH] Fix prefixing classes used in try/catch blocks

---
 specs/catch.php                      | 156 +++++++++++++++++++++++++++
 src/NodeVisitor/NameStmtPrefixer.php |   2 +
 2 files changed, 158 insertions(+)
 create mode 100644 specs/catch.php

diff --git a/specs/catch.php b/specs/catch.php
new file mode 100644
index 00000000..80a5d937
--- /dev/null
+++ b/specs/catch.php
@@ -0,0 +1,156 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the humbug/php-scoper package.
+ *
+ * Copyright (c) 2017 Théo FIDRY <theo.fidry@gmail.com>,
+ *                    Pádraic Brady <padraic.brady@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+return [
+    'meta' => [
+        'title' => 'Miscellaneous',
+        // Default values. If not specified will be the one used
+        'prefix' => 'Humbug',
+        'whitelist' => [],
+    ],
+
+    'Catch an internal class' => <<<'PHP'
+<?php
+
+try {
+    echo "foo";
+} catch (Throwable $t) {
+}
+----
+<?php
+
+namespace Humbug;
+
+try {
+    echo "foo";
+} catch (\Throwable $t) {
+}
+
+PHP
+    ,
+
+    'Catch an internal class in a namespace' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+try {
+    echo "foo";
+} catch (\Throwable $t) {
+}
+----
+<?php
+
+namespace Humbug\Acme;
+
+try {
+    echo "foo";
+} catch (\Throwable $t) {
+}
+
+PHP
+    ,
+
+    'Catch an custom exception class' => <<<'PHP'
+<?php
+
+try {
+    echo "foo";
+} catch (FooException $t) {
+}
+----
+<?php
+
+namespace Humbug;
+
+try {
+    echo "foo";
+} catch (\Humbug\FooException $t) {
+}
+
+PHP
+    ,
+
+    'Catch an custom exception class in a namespace' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+try {
+    echo "foo";
+} catch (FooException $t) {
+}
+----
+<?php
+
+namespace Humbug\Acme;
+
+try {
+    echo "foo";
+} catch (\Humbug\Acme\FooException $t) {
+}
+
+PHP
+    ,
+
+    'Catch an custom exception class in a namespace imported with a use statement' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+use X\FooException;
+
+try {
+    echo "foo";
+} catch (FooException $t) {
+}
+----
+<?php
+
+namespace Humbug\Acme;
+
+use Humbug\X\FooException;
+try {
+    echo "foo";
+} catch (\Humbug\X\FooException $t) {
+}
+
+PHP
+    ,
+
+    'Multiple catch statement' => <<<'PHP'
+<?php
+
+namespace Acme;
+
+use X\FooException;
+
+try {
+    echo "foo";
+} catch (FooException | \Throwable $t) {
+}
+----
+<?php
+
+namespace Humbug\Acme;
+
+use Humbug\X\FooException;
+try {
+    echo "foo";
+} catch (\Humbug\X\FooException|\Throwable $t) {
+}
+
+PHP
+    ,
+];
diff --git a/src/NodeVisitor/NameStmtPrefixer.php b/src/NodeVisitor/NameStmtPrefixer.php
index 211801db..ff87b5fa 100644
--- a/src/NodeVisitor/NameStmtPrefixer.php
+++ b/src/NodeVisitor/NameStmtPrefixer.php
@@ -26,6 +26,7 @@
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Param;
+use PhpParser\Node\Stmt\Catch_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
@@ -106,6 +107,7 @@ private function prefixName(Name $name): Node
                 || $parentNode instanceof New_
                 || $parentNode instanceof Class_
                 || $parentNode instanceof Interface_
+                || $parentNode instanceof Catch_
             )
         ) {
             return $name;