From 593e7257e3c1c33620866f274cd1fe0e103ff773 Mon Sep 17 00:00:00 2001 From: Erik Bernhardson Date: Fri, 25 Sep 2015 10:58:35 -0700 Subject: [PATCH] Include phpunit license for backported classes Bug: T113765 Change-Id: I3f4242d4323d447097b2de42bfade969a6e3fd9d --- .../debug/logger/monolog/KafkaHandlerTest.php | 2 +- .../ConsecutiveParametersMatcher.php | 0 tests/phpunit/includes/phpunit/LICENSE | 33 +++++++++++++++++++ tests/phpunit/includes/phpunit/README | 2 ++ 4 files changed, 36 insertions(+), 1 deletion(-) rename tests/phpunit/includes/{ => phpunit}/ConsecutiveParametersMatcher.php (100%) create mode 100644 tests/phpunit/includes/phpunit/LICENSE create mode 100644 tests/phpunit/includes/phpunit/README diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php index 090f439ec6..ef6f8475a4 100644 --- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php +++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php @@ -24,7 +24,7 @@ use MediaWikiTestCase; use Monolog\Logger; // not available in the version of phpunit mw uses, so copied into repo -require_once __DIR__ . '/../../../ConsecutiveParametersMatcher.php'; +require_once __DIR__ . '/../../../phpunit/ConsecutiveParametersMatcher.php'; class KafkaHandlerTest extends MediaWikiTestCase { diff --git a/tests/phpunit/includes/ConsecutiveParametersMatcher.php b/tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php similarity index 100% rename from tests/phpunit/includes/ConsecutiveParametersMatcher.php rename to tests/phpunit/includes/phpunit/ConsecutiveParametersMatcher.php diff --git a/tests/phpunit/includes/phpunit/LICENSE b/tests/phpunit/includes/phpunit/LICENSE new file mode 100644 index 0000000000..fe178b0835 --- /dev/null +++ b/tests/phpunit/includes/phpunit/LICENSE @@ -0,0 +1,33 @@ +PHPUnit + +Copyright (c) 2001-2014, Sebastian Bergmann . +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, STRICT +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. diff --git a/tests/phpunit/includes/phpunit/README b/tests/phpunit/includes/phpunit/README new file mode 100644 index 0000000000..3ec3fd9274 --- /dev/null +++ b/tests/phpunit/includes/phpunit/README @@ -0,0 +1,2 @@ +This directory contains classes duplicated from new versions of phpunit +that also work in the older php 3.7.37 used by wmf CI servers. -- 2.20.1