From d8751362c943c07438a1e804b6559f4af193fb8f Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Wed, 15 Jul 2009 23:39:58 -0400
Subject: [PATCH] these are stream filters, so put them in a
 Horde_Stream_Filter package instead of in Util::

---
 framework/Mime/lib/Horde/Mime/Part.php             |  2 +-
 .../lib/Horde/Stream}/Filter/Eol.php               |  6 +-
 framework/Stream_Filter/package.xml                | 70 ++++++++++++++++++++++
 .../test/Horde/Stream/Filter/AllTests.php          | 62 +++++++++++++++++++
 .../test/Horde/Stream/Filter/EolTest.php}          | 10 +++-
 framework/Util/package.xml                         |  9 +--
 6 files changed, 144 insertions(+), 15 deletions(-)
 rename framework/{Util/lib/Horde/Util => Stream_Filter/lib/Horde/Stream}/Filter/Eol.php (90%)
 create mode 100644 framework/Stream_Filter/package.xml
 create mode 100644 framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
 rename framework/{Util/test/Horde/Util/eol_filter.phpt => Stream_Filter/test/Horde/Stream/Filter/EolTest.php} (66%)

diff --git a/framework/Mime/lib/Horde/Mime/Part.php b/framework/Mime/lib/Horde/Mime/Part.php
index d659922ea..e60bd54d1 100644
--- a/framework/Mime/lib/Horde/Mime/Part.php
+++ b/framework/Mime/lib/Horde/Mime/Part.php
@@ -1155,7 +1155,7 @@ class Horde_Mime_Part
 
         $fp = $this->_writeStream($text);
 
-        stream_filter_register('horde_eol', 'Horde_Util_Filter_Eol');
+        stream_filter_register('horde_eol', 'Horde_Stream_Filter_Eol');
         stream_filter_append($fp, 'horde_eol', STREAM_FILTER_READ, array('eol' => $eol));
 
         return $stream ? $fp : $this->_readStream($fp, true);
diff --git a/framework/Util/lib/Horde/Util/Filter/Eol.php b/framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php
similarity index 90%
rename from framework/Util/lib/Horde/Util/Filter/Eol.php
rename to framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php
index b2f02f7ff..ee031ad1f 100644
--- a/framework/Util/lib/Horde/Util/Filter/Eol.php
+++ b/framework/Stream_Filter/lib/Horde/Stream/Filter/Eol.php
@@ -3,7 +3,7 @@
  * Stream filter class to convert EOL characters.
  *
  * Usage:
- *   stream_filter_register('horde_eol', 'Horde_Util_Filter_Eol');
+ *   stream_filter_register('horde_eol', 'Horde_Stream_Filter_Eol');
  *   stream_filter_[app|pre]pend($stream, 'horde_eol', $params);
  *
  * $params can contain the following:
@@ -18,9 +18,9 @@
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Michael Slusarz <slusarz@horde.org>
- * @package Horde_Util
+ * @package Horde_Stream_Filter
  */
-class Horde_Util_Filter_Eol extends php_user_filter
+class Horde_Stream_Filter_Eol extends php_user_filter
 {
     protected $_search;
     protected $_replace;
diff --git a/framework/Stream_Filter/package.xml b/framework/Stream_Filter/package.xml
new file mode 100644
index 000000000..f6a208ba8
--- /dev/null
+++ b/framework/Stream_Filter/package.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.9" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+http://pear.php.net/dtd/tasks-1.0.xsd
+http://pear.php.net/dtd/package-2.0
+http://pear.php.net/dtd/package-2.0.xsd">
+ <name>Stream_Filter</name>
+ <channel>pear.horde.org</channel>
+ <summary>Horde Stream filters</summary>
+ <description>This package provides various stream filters.
+ </description>
+ <lead>
+  <name>Chuck Hagenbuch</name>
+  <user>chuck</user>
+  <email>chuck@horde.org</email>
+  <active>yes</active>
+ </lead>
+ <lead>
+  <name>Jan Schneider</name>
+  <user>jan</user>
+  <email>jan@horde.org</email>
+  <active>yes</active>
+ </lead>
+ <lead>
+  <name>Michael Slusarz</name>
+  <user>slusarz</user>
+  <email>slusarz@horde.org</email>
+  <active>yes</active>
+ </lead>
+ <date>2009-07-08</date>
+ <version>
+  <release>0.1.0</release>
+  <api>0.1.0</api>
+ </version>
+ <stability>
+  <release>beta</release>
+  <api>beta</api>
+ </stability>
+ <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+ <notes>* Initial release.
+ </notes>
+ <contents>
+  <dir name="/">
+   <dir name="lib">
+    <dir name="Horde">
+     <dir name="Stream">
+      <dir name="Filter">
+       <file name="Eol.php" role="php" />
+      </dir> <!-- /lib/Horde/Stream/Filter -->
+     </dir> <!-- /lib/Horde/Stream -->
+    </dir> <!-- /lib/Horde -->
+   </dir> <!-- /lib -->
+  </dir> <!-- / -->
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.2.0</min>
+   </php>
+   <pearinstaller>
+    <min>1.7.0</min>
+   </pearinstaller>
+  </required>
+  <optional/>
+ </dependencies>
+ <phprelease>
+  <filelist>
+   <install name="lib/Horde/Stream/Filter/Eol.php" as="Horde/Stream/Filter/Eol.php" />
+  </filelist>
+ </phprelease>
+</package>
diff --git a/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php b/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
new file mode 100644
index 000000000..a004b7494
--- /dev/null
+++ b/framework/Stream_Filter/test/Horde/Stream/Filter/AllTests.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Horde_Stream_Filter test suite
+ *
+ * @category   Horde
+ * @package    Horde_Stream_Filter
+ * @subpackage UnitTests
+ */
+
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Horde_Stream_Filter_AllTests::main');
+}
+
+require_once 'PHPUnit/Framework/TestSuite.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+
+/**
+ * @package    Horde_Stream_Filter
+ * @subpackage UnitTests
+ */
+class Horde_Stream_Filter_AllTests {
+
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        // Catch strict standards
+        error_reporting(E_ALL | E_STRICT);
+
+        // Set up autoload
+        set_include_path(dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'lib' . PATH_SEPARATOR . get_include_path());
+        if (!spl_autoload_functions()) {
+            spl_autoload_register(create_function('$class', '$filename = str_replace(array(\'::\', \'_\'), \'/\', $class); include "$filename.php";'));
+        }
+
+        $suite = new PHPUnit_Framework_TestSuite('Horde Framework - Horde_Stream_Filter');
+
+        $basedir = dirname(__FILE__);
+        $baseregexp = preg_quote($basedir . DIRECTORY_SEPARATOR, '/');
+
+        foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($basedir)) as $file) {
+            if ($file->isFile() && preg_match('/Test.php$/', $file->getFilename())) {
+                $pathname = $file->getPathname();
+                require $pathname;
+
+                $class = str_replace(DIRECTORY_SEPARATOR, '_',
+                                     preg_replace("/^$baseregexp(.*)\.php/", '\\1', $pathname));
+                $suite->addTestSuite('Horde_Stream_Filter_' . $class);
+            }
+        }
+
+        return $suite;
+    }
+
+}
+
+if (PHPUnit_MAIN_METHOD == 'Horde_Stream_Filter_AllTests::main') {
+    Horde_Stream_Filter_AllTests::main();
+}
diff --git a/framework/Util/test/Horde/Util/eol_filter.phpt b/framework/Stream_Filter/test/Horde/Stream/Filter/EolTest.php
similarity index 66%
rename from framework/Util/test/Horde/Util/eol_filter.phpt
rename to framework/Stream_Filter/test/Horde/Stream/Filter/EolTest.php
index b2f55824e..d8acfe41d 100644
--- a/framework/Util/test/Horde/Util/eol_filter.phpt
+++ b/framework/Stream_Filter/test/Horde/Stream/Filter/EolTest.php
@@ -1,11 +1,15 @@
+/**
+ * @package    Horde_Stream_Filter
+ * @subpackage UnitTests
+ */
 --TEST--
-Horde_Util_Filter_Eol:: tests
+Horde_Stream_Filter_Eol:: tests
 --FILE--
 <?php
 
-require_once dirname(__FILE__) . '/../../../lib/Horde/Util/Filter/Eol.php';
+require_once dirname(__FILE__) . '/../../../lib/Horde/Stream/Filter/Eol.php';
 
-stream_filter_register('horde_eol', 'Horde_Util_Filter_Eol');
+stream_filter_register('horde_eol', 'Horde_Stream_Filter_Eol');
 
 $test = fopen('php://temp', 'r+');
 fwrite($test, "A\r\nB\rC\nD\r\n\r\nE\r\rF\n\nG\r\n\n\r\nH\r\n\r\r\nI");
diff --git a/framework/Util/package.xml b/framework/Util/package.xml
index fa2fe8d54..595c00e86 100644
--- a/framework/Util/package.xml
+++ b/framework/Util/package.xml
@@ -29,7 +29,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Added Horde_Util_Filter_Eol.
+ <notes>
  * Removed Horde_Array::combine() and Horde_Util::hmac().
  * Initial Horde 4 package.
  </notes>
@@ -42,11 +42,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
        <file name="Helper.php" role="php" />
       </dir> <!-- /lib/Horde/Array/Sort -->
      </dir> <!-- /lib/Horde/Array -->
-     <dir name="Util">
-      <dir name="Filter">
-       <file name="Eol.php" role="php" />
-      </dir> <!-- /lib/Horde/Util/Filter -->
-     </dir> <!-- /lib/Horde/Util -->
      <file name="Array.php" role="php" />
      <file name="String.php" role="php" />
      <file name="Util.php" role="php" />
@@ -61,7 +56,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <file name="addParameter.phpt" role="test" />
       <file name="case.phpt" role="test" />
       <file name="case_php6.phpt" role="test" />
-      <file name="eol_filter.phpt" role="test" />
       <file name="length.phpt" role="test" />
       <file name="pad.phpt" role="test" />
       <file name="removeParameter.phpt" role="test" />
@@ -103,7 +97,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="lib/Horde/Array/Sort/Helper.php" as="Horde/Array/Sort/Helper.php" />
    <install name="lib/Horde/String.php" as="Horde/String.php" />
    <install name="lib/Horde/Util.php" as="Horde/Util.php" />
-   <install name="lib/Horde/Util/Filter/Eol.php" as="Horde/Util/Filter/Eol.php" />
    <install name="lib/Horde/Variables.php" as="Horde/Variables.php" />
   </filelist>
  </phprelease>
-- 
2.11.0