Use a common base exception.

horde · Feb 28, 2017 · 15f2c21 · 15f2c21
1 parent b3732a6
commit 15f2c21
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 19 deletions.
diff --git a/framework/Refactor/Test.php b/framework/Refactor/Test.php
diff --git 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
@@ -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
+{
+}
diff --git 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
@@ -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
@@ -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.