From 4a68a7012f5f46f798fe8ceb259e80e3f83fbf6c Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Fri, 16 Feb 2018 16:58:10 -0500
Subject: dev-php/PEAR-HTML_CSS: Revbump with tests, EAPI and eclass changes

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 .../PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild    |  15 ---
 .../PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild    |  27 +++++
 .../files/HTML_CSS-1.5.4-fix-tests.patch           | 112 +++++++++++++++++++++
 3 files changed, 139 insertions(+), 15 deletions(-)
 delete mode 100644 dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild
 create mode 100644 dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
 create mode 100644 dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch

diff --git a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild
deleted file mode 100644
index 0819717f0bbc..000000000000
--- a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides a simple interface for generating a stylesheet declaration"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.4
-	!minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0
-		    >=dev-php/phpunit-3.2.0 )"
diff --git a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..c9b8063f636f
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides a simple interface for generating a stylesheet declaration"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal test"
+RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.4
+	!minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0 )"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-3.7 )"
+PATCHES=( "${FILESDIR}/HTML_CSS-1.5.4-fix-tests.patch" )
+
+src_prepare() {
+	mkdir HTML || die
+	mv CSS CSS.php HTML || die
+	default
+}
+
+src_test() {
+	ln -s ../HTML tests/HTML || die
+	phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch b/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch
new file mode 100644
index 000000000000..410ad7593ec3
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch
@@ -0,0 +1,112 @@
+diff -aurN a/tests/AllTests.php b/tests/AllTests.php
+--- a/tests/AllTests.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/AllTests.php	2018-02-16 16:28:52.565010362 -0500
+@@ -24,7 +24,6 @@
+ 
+ require_once 'HTML_CSS_TestSuite_Standard.php';
+ require_once 'HTML_CSS_TestSuite_Output.php';
+-require_once 'HTML_CSS_TestSuite_Bugs.php';
+ 
+ /**
+  * Class for running all test suites for HTML_CSS package.
+@@ -79,7 +78,6 @@
+         $suite = new PHPUnit_Framework_TestSuite('HTML_CSS Test Suite');
+         $suite->addTestSuite('HTML_CSS_TestSuite_Standard');
+         $suite->addTestSuite('HTML_CSS_TestSuite_Output');
+-        $suite->addTestSuite('HTML_CSS_TestSuite_Bugs');
+         return $suite;
+     }
+ 
+@@ -126,4 +124,4 @@
+ if (PHPUnit_MAIN_METHOD == 'HTML_CSS_AllTests::main') {
+     HTML_CSS_AllTests::main();
+ }
+-?>
+\ No newline at end of file
++?>
+diff -aurN a/tests/HTML_CSS_TestSuite_Output.php b/tests/HTML_CSS_TestSuite_Output.php
+--- a/tests/HTML_CSS_TestSuite_Output.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/HTML_CSS_TestSuite_Output.php	2018-02-16 16:36:35.283820690 -0500
+@@ -18,7 +18,6 @@
+ 
+ require_once "PHPUnit/Framework/TestCase.php";
+ require_once "PHPUnit/Framework/TestSuite.php";
+-require_once "PHPUnit/Extensions/OutputTestCase.php";
+ 
+ require_once 'HTML/CSS.php';
+ require_once 'PEAR.php';
+@@ -34,7 +33,7 @@
+  * @link     http://pear.php.net/package/HTML_CSS
+  * @since    File available since Release 1.5.2
+  */
+-class HTML_CSS_TestSuite_Output extends PHPUnit_Extensions_OutputTestCase
++class HTML_CSS_TestSuite_Output extends PHPUnit_Framework_TestCase
+ {
+     /**
+      * A CSS object
+@@ -70,7 +69,12 @@
+ 
+         $this->css = new HTML_CSS($attrs, $prefs);
+ 
+-        $this->setOutputCallback(array(&$this, 'normalizeOutput'));
++        $this->setOutputCallback(array($this, 'normalizeOutput'));
++    }
++
++    protected function normalizeOutput($buffer)
++    {
++        return str_replace("\r", '', $buffer);
+     }
+ 
+     /**
+@@ -153,4 +157,4 @@
+ if (PHPUnit_MAIN_METHOD == "HTML_CSS_TestSuite_Output::main") {
+     HTML_CSS_TestSuite_Output::main();
+ }
+-?>
+\ No newline at end of file
++?>
+diff -aurN a/tests/HTML_CSS_TestSuite_Standard.php b/tests/HTML_CSS_TestSuite_Standard.php
+--- a/tests/HTML_CSS_TestSuite_Standard.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/HTML_CSS_TestSuite_Standard.php	2018-02-16 16:47:01.837374212 -0500
+@@ -117,12 +117,10 @@
+      */
+     public function catchError($error, $code, $level)
+     {
+-        $this->assertType(PHPUnit_Framework_Constraint_IsType::TYPE_OBJECT, $error);
+-        if ($error instanceof PEAR_Error) {
+-            $this->assertEquals($error->getCode(), $code);
+-            $user_info = $error->getUserInfo();
+-            $this->assertEquals($user_info['level'], $level);
+-        }
++        $this->assertInstanceOf(PEAR_Error::class, $error);
++        $this->assertEquals($error->getCode(), $code);
++        $user_info = $error->getUserInfo();
++        $this->assertEquals($user_info['level'], $level);
+     }
+ 
+     /**
+@@ -724,7 +722,7 @@
+         $css_data = array($fn, $strcss);
+         $messages = array();
+ 
+-        $stub = $this->getMock('HTML_CSS', array('validate'));
++        $stub = $this->createMock(HTML_CSS::class);
+         $stub->expects($this->any())
+              ->method('validate')
+              ->will($this->returnValue(true));
+@@ -1578,7 +1576,7 @@
+         $this->catchError($r, HTML_CSS_ERROR_INVALID_INPUT, 'exception');
+ 
+         // validate
+-        $stub = $this->getMock('HTML_CSS', array('validate'));
++        $stub = $this->createMock(HTML_CSS::class);
+         $stub->expects($this->any())
+              ->method('validate')
+              ->will($this->returnCallback(array(&$this, 'cbMockValidator')));
+@@ -1680,4 +1678,4 @@
+ if (PHPUnit_MAIN_METHOD == "HTML_CSS_TestSuite_Standard::main") {
+     HTML_CSS_TestSuite_Standard::main();
+ }
+-?>
+\ No newline at end of file
++?>
-- 
cgit v1.2.3-65-gdbad