backported all related changes up to 3229 to branch/3.2

1 files changed, 0 insertions, 220 deletions

diff --git a/buildscripts/PHPUnit2/Util/Log/PEAR.php b/buildscripts/PHPUnit2/Util/Log/PEAR.php
deleted file mode 100644
index 822b34c4..00000000
--- a/buildscripts/PHPUnit2/Util/Log/PEAR.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP Version 5
- *
- * Copyright (c) 2002-2006, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Testing
- * @package    PHPUnit2
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    CVS: $Id: PEAR.php,v 1.2.2.3 2005/12/17 16:04:58 sebastian Exp $
- * @link       http://pear.php.net/package/PHPUnit2
- * @since      File available since Release 2.3.0
- */
-
-require_once 'PHPUnit2/Framework/TestListener.php';
-
-@include_once 'Log.php';
-
-/**
- * A TestListener that logs to a PEAR_Log sink.
- *
- * @category   Testing
- * @package    PHPUnit2
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/PHPUnit2
- * @since      Class available since Release 2.1.0
- */
-class PHPUnit2_Util_Log_PEAR implements PHPUnit2_Framework_TestListener {
-    /**
-     * Log.
-     *
-     * @var    Log
-     * @access private
-     */
-    private $log;
-
-    /**
-     * @param string $type      The type of concrete Log subclass to use.
-     *                          Currently, valid values are 'console',
-     *                          'syslog', 'sql', 'file', and 'mcal'.
-     * @param string $name      The name of the actually log file, table, or
-     *                          other specific store to use. Defaults to an
-     *                          empty string, with which the subclass will
-     *                          attempt to do something intelligent.
-     * @param string $ident     The identity reported to the log system.
-     * @param array  $conf      A hash containing any additional configuration
-     *                          information that a subclass might need.
-     * @param int $maxLevel     Maximum priority level at which to log.
-     * @access public
-     */
-    public function __construct($type, $name = '', $ident = '', $conf = array(), $maxLevel = PEAR_LOG_DEBUG) {
-        $this->log = Log::factory($type, $name, $ident, $conf, $maxLevel);
-    }
-
-    /**
-     * An error occurred.
-     *
-     * @param  PHPUnit2_Framework_Test $test
-     * @param  Exception               $e
-     * @access public
-     */
-    public function addError(PHPUnit2_Framework_Test $test, Exception $e) {
-        $this->log->crit(
-          sprintf(
-            'Test "%s" failed: %s',
-
-            $test->getName(),
-            $e->getMessage()
-          )
-        );
-    }
-
-    /**
-     * A failure occurred.
-     *
-     * @param  PHPUnit2_Framework_Test                 $test
-     * @param  PHPUnit2_Framework_AssertionFailedError $e
-     * @access public
-     */
-    public function addFailure(PHPUnit2_Framework_Test $test, PHPUnit2_Framework_AssertionFailedError $e) {
-        $this->log->err(
-          sprintf(
-            'Test "%s" failed: %s',
-
-            $test->getName(),
-            $e->getMessage()
-          )
-        );
-    }
-
-    /**
-     * Incomplete test.
-     *
-     * @param  PHPUnit2_Framework_Test $test
-     * @param  Exception               $e
-     * @access public
-     */
-    public function addIncompleteTest(PHPUnit2_Framework_Test $test, Exception $e) {
-        $this->log->info(
-          sprintf(
-            'Test "%s" incomplete: %s',
-
-            $test->getName(),
-            $e->getMessage()
-          )
-        );
-    }
-
-    /**
-     * A test suite started.
-     *
-     * @param  PHPUnit2_Framework_TestSuite $suite
-     * @access public
-     * @since  Method available since Release 2.2.0
-     */
-    public function startTestSuite(PHPUnit2_Framework_TestSuite $suite) {
-        $this->log->info(
-          sprintf(
-            'TestSuite "%s" started.',
-
-            $suite->getName()
-          )
-        );
-    }
-
-    /**
-     * A test suite ended.
-     *
-     * @param  PHPUnit2_Framework_TestSuite $suite
-     * @access public
-     * @since  Method available since Release 2.2.0
-     */
-    public function endTestSuite(PHPUnit2_Framework_TestSuite $suite) {
-        $this->log->info(
-          sprintf(
-            'TestSuite "%s" ended.',
-
-            $suite->getName()
-          )
-        );
-    }
-
-    /**
-     * A test started.
-     *
-     * @param  PHPUnit2_Framework_Test $test
-     * @access public
-     */
-    public function startTest(PHPUnit2_Framework_Test $test) {
-        $this->log->info(
-          sprintf(
-            'Test "%s" started.',
-
-            $test->getName()
-          )
-        );
-    }
-
-    /**
-     * A test ended.
-     *
-     * @param  PHPUnit2_Framework_Test $test
-     * @access public
-     */
-    public function endTest(PHPUnit2_Framework_Test $test) {
-        $this->log->info(
-          sprintf(
-            'Test "%s" ended.',
-
-            $test->getName()
-          )
-        );
-    }
-}
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * c-hanging-comment-ender-p: nil
- * End:
- */
-?>