svn: /pear2/sandbox/Text_Markdown/trunk/ src/Text/Markdown/Apidoc.php src/Text/Markdown/Extra.php src/Text/Markdown/Main.php src/Text/Markdown/Wiki.php tests/mdtest/Implementations/PEAR2_Text_Markdown_Extra.php

saltybeagle                              Fri, 18 Jun 2010 15:34:12 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300578

Log:
Correct class extends declarations, and configuration defaults for extended classes. Add PEAR2\Text\Markdown_Extra test implementation.

Changed paths:
    U   pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Apidoc.php
    U   pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Extra.php
    U   pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Main.php
    U   pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Wiki.php
    A   pear2/sandbox/Text_Markdown/trunk/tests/mdtest/Implementations/PEAR2_Text_Markdown_Extra.php

Modified: pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Apidoc.php
===================================================================
--- pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Apidoc.php	2010-06-18 15:11:08 UTC (rev 300577)
+++ pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Apidoc.php	2010-06-18 15:34:12 UTC (rev 300578)
@@ -24,7 +24,7 @@
  */
 namespace PEAR2\Text;

-class Markdown_Apidoc extends Markdown
+class Markdown_Apidoc extends Markdown_Main
 {
     /**
      *
@@ -65,4 +65,10 @@
             'Markdown_Wiki_Escape',
         ),
     );
+
+    function __construct()
+    {
+        $this->_config = $this->_config + $this->_Markdown_Apidoc + $this->_Markdown;
+        $this->_postConstruct();
+    }
 }

Modified: pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Extra.php
===================================================================
--- pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Extra.php	2010-06-18 15:11:08 UTC (rev 300577)
+++ pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Extra.php	2010-06-18 15:34:12 UTC (rev 300578)
@@ -26,7 +26,7 @@
  */
 namespace PEAR2\Text;

-class Markdown_Extra extends Markdown
+class Markdown_Extra extends Markdown_Main
 {
     /**
      *
@@ -66,4 +66,10 @@
             'Markdown_Plugin_Break',
         ),
     );
+
+    function __construct()
+    {
+        $this->_config = $this->_config + $this->_Markdown_Extra + $this->_Markdown;
+        $this->_postConstruct();
+    }
 }

Modified: pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Main.php
===================================================================
--- pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Main.php	2010-06-18 15:11:08 UTC (rev 300577)
+++ pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Main.php	2010-06-18 15:34:12 UTC (rev 300578)
@@ -256,35 +256,10 @@
      */
     protected $_chars = '.{}\\';

-/**
+    /**
      *
      * Collection point for configuration values.
      *
-     * Note that you do not define config defaults in $_config directly.
-     *
-     * {{code: php
-     *     // DO NOT DO THIS
-     *     protected $_config = array(
-     *         'foo' => 'bar',
-     *         'baz' => 'dib',
-     *     );
-     * }}
-     *
-     * Instead, define config defaults in a protected property named for the
-     * class, withan underscore prefix.
-     *
-     * For exmple, a "Vendor_Class_Name" class would define the default
-     * config array in "$_Vendor_Class_Name".  This convention lets
-     * child classes inherit parent config keys and values.
-     *
-     * {{code: php
-     *     // DO THIS INSTEAD
-     *     protected $_Vendor_Class_Name = array(
-     *         'foo' => 'bar',
-     *         'baz' => 'dib',
-     *     );
-     * }}
-     *
      * @var array
      *
      */

Modified: pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Wiki.php
===================================================================
--- pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Wiki.php	2010-06-18 15:11:08 UTC (rev 300577)
+++ pear2/sandbox/Text_Markdown/trunk/src/Text/Markdown/Wiki.php	2010-06-18 15:34:12 UTC (rev 300578)
@@ -24,7 +24,7 @@
  */
 namespace PEAR2\Text;

-class Markdown_Wiki extends Markdown
+class Markdown_Wiki extends Markdown_Main
 {
     /**
      *
@@ -68,4 +68,10 @@
             'Markdown_Wiki_Escape',
         ),
     );
+
+    function __construct()
+    {
+        $this->_config = $this->_config + $this->_Markdown_Wiki + $this->_Markdown;
+        $this->_postConstruct();
+    }
 }

Added: pear2/sandbox/Text_Markdown/trunk/tests/mdtest/Implementations/PEAR2_Text_Markdown_Extra.php
===================================================================
--- pear2/sandbox/Text_Markdown/trunk/tests/mdtest/Implementations/PEAR2_Text_Markdown_Extra.php	                        (rev 0)
+++ pear2/sandbox/Text_Markdown/trunk/tests/mdtest/Implementations/PEAR2_Text_Markdown_Extra.php	2010-06-18 15:34:12 UTC (rev 300578)
@@ -0,0 +1,20 @@
+<?php
+function autoload($class)
+{
+    $class = str_replace(array('PEAR2\\Text\\', '_'), array('', '/'), $class);
+    include $class . '.php';
+}
+
+spl_autoload_register("autoload");
+
+set_include_path(dirname(dirname(dirname(dirname(__FILE__)))).'/src/Text');
+
+ini_set('display_errors', true);
+error_reporting(E_ALL);
+
+
+
+function Markdown($text) {
+    $markdown = new \PEAR2\Text\Markdown_Extra();
+    return $markdown->transform($text);
+}
\ No newline at end of file