Changeset 2289

Timestamp:

03/12/08 10:32:25 (6 months ago)

Author:

Geert

Message:

Extending Exception the way it should be done. Calling parent's constructor now and got rid of magic get. http://php.net/exceptions

Location:

trunk/modules/unit_test

Files:

• libraries/Unit_Test.php (modified) (3 diffs)
• views/kohana_unit_test.php (modified) (1 diff)

trunk/modules/unit_test/libraries/Unit_Test.php

@@ -390 +390 @@
 class Kohana_Unit_Test_Exception extends Exception {
 
-    protected $message = '';
     protected $debug = NULL;
-    protected $file = '';
-    protected $line = '';
-
-    /**
-     * Set exception message and debug
+
+    /**
+     * Sets exception message and debug info.
      *
      * @param   string  message
@@ -405 +402 @@
     {
         // Failure message
-        $this->message = (string) $message;
+        parent::__construct($message);
 
         // Extra user-defined debug info
         $this->debug = $debug;
 
-        // Retrieve failure location
+        // Overwrite failure location
         $trace = $this->getTrace();
         $this->file = $trace[0]['file'];
@@ -417 +414 @@
 
     /**
-     * Magically gets an object property.
-     *
-     * @param   string  property key
-     * @return  mixed   variable value if the key is found
-     * @return  void    if the key is not found
-     */
-    public function __get($key)
-    {
-        if (isset($this->$key))
-            return $this->$key;
+     * Returns the user-defined debug info
+     *
+     * @return  mixed  debug property
+     */
+    public function getDebug()
+    {
+        return $this->debug;
     }
 

trunk/modules/unit_test/views/kohana_unit_test.php

@@ -136 +136 @@
                         <td class="k-failed">
                             <strong><?php echo Kohana::lang('unit_test.failed') ?></strong>
-                            <pre><?php echo html::specialchars($result->message) ?></pre>
-                            <?php echo html::specialchars($result->file) ?> (<?php echo Kohana::lang('unit_test.line') ?>&nbsp;<?php echo $result->line ?>)
+                            <pre><?php echo html::specialchars($result->getMessage()) ?></pre>
+                            <?php echo html::specialchars($result->getFile()) ?> (<?php echo Kohana::lang('unit_test.line') ?>&nbsp;<?php echo $result->getLine() ?>)
 
-                            <?php if ($result->debug !== NULL): ?>
-                                <pre class="k-debug" title="Debug info"><?php echo '(', gettype($result->debug), ') ', html::specialchars(var_export($result->debug, TRUE)) ?></pre>
+                            <?php if ($result->getDebug() !== NULL): ?>
+                                <pre class="k-debug" title="Debug info"><?php echo '(', gettype($result->getDebug()), ') ', html::specialchars(var_export($result->getDebug(), TRUE)) ?></pre>
                             <?php endif ?>