From 15f2c21993ccd86bcb4b617d4330bbe907449996 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Tue, 28 Feb 2017 11:14:15 +0100
Subject: [PATCH] Use a common base exception.

---
 framework/Refactor/Test.php                   | 13 ---------
 framework/Refactor/bin/horde-refactor         |  1 +
 .../Refactor/lib/Horde/Refactor/Exception.php | 27 +++++++++++++++++++
 .../lib/Horde/Refactor/Exception/NotFound.php |  3 ++-
 .../Refactor/Exception/UnexpectedToken.php    |  3 ++-
 framework/Refactor/package.xml                |  8 +++---
 6 files changed, 36 insertions(+), 19 deletions(-)
 delete mode 100644 framework/Refactor/Test.php
 create mode 100644 framework/Refactor/lib/Horde/Refactor/Exception.php

diff --git a/framework/Refactor/Test.php b/framework/Refactor/Test.php
deleted file mode 100644
index 22eaa23e203..00000000000
--- a/framework/Refactor/Test.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Class phpdoc
- */
-class Test
-{
-    /**
-     * Constructor.
-     */
-    function Test(Baz $bar, $foo = null)
-    {
-    }
-}
diff --git a/framework/Refactor/bin/horde-refactor b/framework/Refactor/bin/horde-refactor
index b89e9ff7ed9..08ee58b4c6b 100755
--- a/framework/Refactor/bin/horde-refactor
+++ b/framework/Refactor/bin/horde-refactor
@@ -23,4 +23,5 @@
  */
 
 require_once 'Horde/Autoloader/Default.php';
+throw new Horde\Refactor\Exception\NotFound();
 Horde\Refactor\Cli::main();
diff --git a/framework/Refactor/lib/Horde/Refactor/Exception.php b/framework/Refactor/lib/Horde/Refactor/Exception.php
new file mode 100644
index 00000000000..6583e6e588c
--- /dev/null
+++ b/framework/Refactor/lib/Horde/Refactor/Exception.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright 2017 Horde LLC (http://www.horde.org/)
+ *
+ * See the enclosed file LICENSE for license information (BSD). If you
+ * did not receive this file, see http://www.horde.org/licenses/bsd.
+ *
+ * @author   Jan Schneider <jan@horde.org>
+ * @category Horde
+ * @license  http://www.horde.org/licenses/bsd BSD
+ * @package  Refactor
+ */
+
+namespace Horde\Refactor;
+
+/**
+ * Exception thrown if an unexpected token was found.
+ *
+ * @author    Jan Schneider <jan@horde.org>
+ * @category  Horde
+ * @copyright 2017 Horde LLC
+ * @license   http://www.horde.org/licenses/bsd BSD
+ * @package   Refactor
+ */
+class Exception extends \Horde_Exception_Wrapped
+{
+}
\ No newline at end of file
diff --git a/framework/Refactor/lib/Horde/Refactor/Exception/NotFound.php b/framework/Refactor/lib/Horde/Refactor/Exception/NotFound.php
index 584f02aa111..011ad7549b5 100644
--- a/framework/Refactor/lib/Horde/Refactor/Exception/NotFound.php
+++ b/framework/Refactor/lib/Horde/Refactor/Exception/NotFound.php
@@ -12,6 +12,7 @@
  */
 
 namespace Horde\Refactor\Exception;
+use Horde\Refactor\Exception;
 use Horde\Refactor\Translation;
 
 /**
@@ -23,7 +24,7 @@
  * @license   http://www.horde.org/licenses/bsd BSD
  * @package   Refactor
  */
-class NotFound extends \Horde_Exception_NotFound
+class NotFound extends Exception
 {
     /**
      * Constructor.
diff --git a/framework/Refactor/lib/Horde/Refactor/Exception/UnexpectedToken.php b/framework/Refactor/lib/Horde/Refactor/Exception/UnexpectedToken.php
index 090e91cf27d..7daac5f14dd 100644
--- a/framework/Refactor/lib/Horde/Refactor/Exception/UnexpectedToken.php
+++ b/framework/Refactor/lib/Horde/Refactor/Exception/UnexpectedToken.php
@@ -12,6 +12,7 @@
  */
 
 namespace Horde\Refactor\Exception;
+use Horde\Refactor\Exception;
 use Horde\Refactor\Translation;
 
 /**
@@ -23,7 +24,7 @@
  * @license   http://www.horde.org/licenses/bsd BSD
  * @package   Refactor
  */
-class UnexpectedToken extends \Horde_Exception
+class UnexpectedToken extends Exception
 {
     /**
      * Constructor.
diff --git a/framework/Refactor/package.xml b/framework/Refactor/package.xml
index 12638626211..91fb1e6acbf 100644
--- a/framework/Refactor/package.xml
+++ b/framework/Refactor/package.xml
@@ -10,7 +10,7 @@
   <email>jan@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2017-02-27</date>
+ <date>2017-02-28</date>
  <version>
   <release>1.0.0alpha1</release>
   <api>1.0.0alpha1</api>
@@ -48,6 +48,7 @@
        <file name="Php4Constructor.php" role="php" />
       </dir> <!-- /lib/Horde/Refactor/Rule -->
       <file name="Cli.php" role="php" />
+      <file name="Exception.php" role="php" />
       <file name="Regexp.php" role="php" />
       <file name="Rule.php" role="php" />
       <file name="Tokens.php" role="php" />
@@ -65,7 +66,6 @@
     </dir> <!-- /locale/de -->
     <file name="Horde_Refactor.pot" role="data" />
    </dir> <!-- /locale -->
-   <file name="Test.php" role="php" />
   </dir> <!-- / -->
  </contents>
  <dependencies>
@@ -94,10 +94,10 @@
  </dependencies>
  <phprelease>
   <filelist>
-   <install as="" name="Test.php" />
    <install as="horde-refactor" name="bin/horde-refactor" />
    <install as="Horde/Refactor/LICENSE" name="docs/Horde/Refactor/LICENSE" />
    <install as="Horde/Refactor/Cli.php" name="lib/Horde/Refactor/Cli.php" />
+   <install as="Horde/Refactor/Exception.php" name="lib/Horde/Refactor/Exception.php" />
    <install as="Horde/Refactor/Regexp.php" name="lib/Horde/Refactor/Regexp.php" />
    <install as="Horde/Refactor/Rule.php" name="lib/Horde/Refactor/Rule.php" />
    <install as="Horde/Refactor/Tokens.php" name="lib/Horde/Refactor/Tokens.php" />
@@ -119,7 +119,7 @@
     <release>alpha</release>
     <api>alpha</api>
    </stability>
-   <date>2017-02-27</date>
+   <date>2017-02-28</date>
    <license uri="TODO">TODO</license>
    <notes>
 * Initial release.