Update dependencies.

horde · Sep 6, 2017 · 5aa0f3a · 5aa0f3a
1 parent d0e34d9
commit 5aa0f3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 31 deletions.
diff --git a/wicked/docs/INSTALL b/wicked/docs/INSTALL
@@ -41,18 +41,21 @@ To function properly, Wicked **requires** the following:
    Wicked stores its data in an SQL database. Build PHP with whichever
    SQL driver you require; see the Horde INSTALL file for details.
 
-3. The following PEAR packages:
+The following items are not required, but if present will enable advanced
+features in Wicked:
+
+1. The following PEAR packages:
    (See `horde/docs/INSTALL`_ for instructions on installing PEAR packages)
 
    .. Important:: If you are going to install Wicked the recommended way,
                   i.e. using the PEAR installer, you can skip the remainder of
                   this section. Installing Wicked through PEAR will
                   automatically download and install all required PEAR modules.
 
-   a. The Text_Wiki PEAR module (>= 1.2.0)
+   a. Text_Figlet
 
-      Text_Wiki is responsible for all parsing of wiki markup and rendering
-      into the different output formats.
+      Text_Figlet can be used to require unauthenticated users to enter a
+      CAPTCHA when updating pages.
 
 
 Installing Wicked

diff --git a/wicked/lib/Test.php b/wicked/lib/Test.php
@@ -41,21 +41,8 @@ class Wicked_Test extends Horde_Test
      * @var array
      */
     protected $_pearList = array(
-        'Text_Wiki' => array(
-            'error' => 'The Text_Wiki module is required to parse and render the wiki markup in Wicked.',
-            'required' => true,
-            'function' => '_checkPearTextWikiVersion'
-        ),
-        'Text_Wiki_Creole' => array(
-            'error' => 'The Text_Wiki_Creole module is required if you plan on using Creole formatting.',
-            'required' => false,
-        ),
-        'Text_Wiki_Mediawiki' => array(
-            'error' => 'The Text_Wiki_Mediawiki module is required if you plan on using Mediawiki formatting.',
-            'required' => false,
-        ),
-        'Text_Wiki_Tiki' => array(
-            'error' => 'The Text_Wiki_Tiki module is required if you plan on using Tiki formatting.',
+        'Text_Figlet' => array(
+            'error' => 'The Text_Figlet module can be used to require unauthenticated users to enter a CAPTCHA when updating pages.',
             'required' => false,
         ),
     );
@@ -67,18 +54,6 @@ class Wicked_Test extends Horde_Test
      */
     protected $_appList = array();
 
-    /**
-     * Additional check for PEAR Text_Wiki module for its version.
-     *
-     * @return string  Returns error string on error.
-     */
-    protected function _checkPearTextWikiVersion()
-    {
-        if (!is_callable(array('Text_Wiki', 'setRenderConf'))) {
-            return 'Your version of Text_Wiki is not recent enough.';
-        }
-    }
-
     /**
      * Any application specific tests that need to be done.
      *