Build and test again

The `pear run-tests -r tests/` command executes the .phpt tests of which
there are none for Net/URL2:

    pear run-tests -r tests/
    Running 0 tests
    TOTAL TIME: 00:00
    0 PASSED TESTS
    0 SKIPPED TESTS

Running with `-u` for the Phpunit test-cases fails with the pear test
runner as long as it is not possible to install Phpunit via pear.

As an intermediate, use the phpunit test runner from the project
configuration (composer.json) and bootstrap across PHP versions.

Additionally, touch the test-cases for updates of PhpUnit since versions
3/4/5 up to 12.0.2 (tested with PHP 5.3-8.4).

Author: ktomk

.editorconfig

@@ -0,0 +1,21 @@
+# https://editorconfig.org/
+
+root = true
+
+[Makefile]
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+
+[*.php]
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+charset = utf-8
+indent_size = 4
+indent_style = space
+
+[*.xml]
+end_of_line = lf
+indent_size = 2
+indent_style = space

.gitattributes

@@ -1,4 +1,5 @@
 /.* export-ignore
+/Makefile export-ignore
 /docs/*.php export-ignore
 /tests/ export-ignore
 /package.xml export-ignore

.github/workflows/ci.yml

@@ -24,6 +24,6 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           ini-values: include_path=.:/usr/share/php:pear/usr/share/php
-      - name: Run tests
-        run: |
-          pear run-tests -r tests/
+          tools: composer:2.2
+      - name: Make
+        run: make

.gitignore

@@ -1,6 +1,9 @@
 # pear related
 /Net_URL2-*.tgz
 
+# php build related
+/.php*
+
 # composer related
 vendor/
 /composer.lock

Makefile

@@ -0,0 +1,28 @@
+PHP ?= php
+export PHP_PEAR_PHP_BIN ?= $(PHP)
+export PHP_BINARY ?= $(PHP)
+COMPOSERCMD ?= $(PHP) "$(shell command -v composer)" -qn
+
+all:
+.PHONY: all clean build dist distclean
+
+vendor/bin/php% : composer.json
+	$(COMPOSERCMD) install
+	touch -c $@
+
+build: vendor/bin/phpunit
+	pear version
+	$(PHP) $<
+	pear run-tests -r tests/
+
+all: build
+
+clean:
+	rm -f -- $(wildcard .php*)
+
+distclean: clean
+	rm -rf -- $(wildcard vendor composer.lock Net_URL2-?.?.?.tgz)
+
+dist:
+	pear version
+	pear package

composer.json

@@ -46,5 +46,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": ">=3.3.0"
+    },
+    "scripts": {
+        "test": "phpunit"
     }
 }

phpunit.xml.dist

@@ -1,4 +1,4 @@
-<phpunit bootstrap="Net/URL2.php"
+<phpunit bootstrap="tests/bootstrap.php"
          colors="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

tests/Net/URL2Test.php

@@ -212,7 +212,7 @@ public function testSetFragment()
      * @see testResolveUrls
      * @return array
      */
-    public function provideResolveUrls()
+    public static function provideResolveUrls()
     {
         return array(
             array(
@@ -283,6 +283,7 @@ public function provideResolveUrls()
      * @covers Net_URL2::resolve
      * @return void
      */
+    #[PHPUnit\Framework\Attributes\DataProvider('provideResolveUrls')]
     public function testResolveUrls($baseURL, array $relativeAbsolutePairs,
         array $options = array()
     ) {
@@ -468,7 +469,7 @@ public function testDontUseBrackets()
      * @link http://tools.ietf.org/html/rfc3986#section-1.1.2
      * @see  testExampleUri
      */
-    public function provideExampleUri()
+    public static function provideExampleUri()
     {
         return array(
             array('ftp://ftp.is.co.za/rfc/rfc1808.txt'),
@@ -492,6 +493,7 @@ public function provideExampleUri()
      * @link         http://tools.ietf.org/html/rfc3986#section-1.1.2
      * @see          testComponentRecompositionAndNormalization
      */
+    #[PHPUnit\Framework\Attributes\DataProvider('provideExampleUri')]
     public function testExampleUri($uri)
     {
         $url = new Net_URL2($uri);
@@ -507,7 +509,7 @@ public function testExampleUri($uri)
      * @see testRemoveDotSegments
      * @return array
      */
-    public function providePath()
+    public static function providePath()
     {
         // The numbers behind are in reference to sections
         // in RFC 3986 5.2.4. Remove Dot Segments
@@ -542,6 +544,7 @@ public function providePath()
      * @covers Net_URL2::removeDotSegments
      * @return void
      */
+    #[PHPUnit\Framework\Attributes\DataProvider('providePath')]
     public function testRemoveDotSegments($path, $assertion)
     {
         $this->assertEquals($assertion, Net_URL2::removeDotSegments($path));
@@ -570,7 +573,7 @@ public function testRemoveDotSegmentsLoopLimit()
      * @see testGetQueryVariables
      * @return array
      */
-    public function provideQueryStrings()
+    public static function provideQueryStrings()
     {
         // If the second (expected) value is set or not null, parse_str() differs.
         // Notes on PHP differences with each entry/block
@@ -632,6 +635,7 @@ public function provideQueryStrings()
      * @covers       Net_URL2::_queryKeyBracketOffset
      * @return void
      */
+    #[PHPUnit\Framework\Attributes\DataProvider('provideQueryStrings')]
     public function testGetQueryVariables($query, $expected = null,
         array $options = array()
     ) {
@@ -663,7 +667,7 @@ public function testGetQueryVariables($query, $expected = null,
      * @return array
      * @see testHostAndPort
      */
-    public function provideHostAndPort()
+    public static function provideHostAndPort()
     {
         return array(
             array('[::1]', '[::1]', false),
@@ -699,6 +703,7 @@ public function provideHostAndPort()
      * @link         http://tools.ietf.org/html/rfc3986#section-3.2
      * @link         http://tools.ietf.org/html/rfc3986#section-3.2.3
      */
+    #[PHPUnit\Framework\Attributes\DataProvider('provideHostAndPort')]
     public function testHostAndPort($authority, $expectedHost, $expectedPort)
     {
         $uri = "http://{$authority}";
@@ -762,6 +767,8 @@ public function test19315()
             Net_URL2::removeDotSegments($nonStringObject);
         } catch (PHPUnit_Framework_Error $error) {
             $this->addToAssertionCount(1);
+        } catch (Throwable $error) {
+            $this->addToAssertionCount(1);
         }
 
         if (!isset($error)) {
@@ -816,7 +823,7 @@ public function test19684()
      * @see testConstructSelf
      * @return array
      */
-    public function provideEquivalentUrlLists()
+    public static function provideEquivalentUrlLists()
     {
         return array(
             // String equivalence:
@@ -853,6 +860,7 @@ public function provideEquivalentUrlLists()
      *
      * @dataProvider provideEquivalentUrlLists
      */
+    #[PHPUnit\Framework\Attributes\DataProvider('provideEquivalentUrlLists')]
     public function testNormalize()
     {
         $urls = func_get_args();
@@ -897,7 +905,7 @@ public function testMagicSetGet()
      * @return array
      * @see testComponentRecompositionAndNormalization
      */
-    public function provideComposedAndNormalized()
+    public static function provideComposedAndNormalized()
     {
         return array(
             array(''),
@@ -926,6 +934,7 @@ public function provideComposedAndNormalized()
      * @link         https://pear.php.net/bugs/bug.php?id=20418
      * @see          testExampleUri
      */
+    #[PHPUnit\Framework\Attributes\DataProvider('provideComposedAndNormalized')]
     public function testComponentRecompositionAndNormalization($uri)
     {
         $url = new Net_URL2($uri);
@@ -942,6 +951,7 @@ public function testComponentRecompositionAndNormalization($uri)
      * @coversNothing
      * @return void
      */
+    #[PHPUnit\Framework\Attributes\DataProvider('provideEquivalentUrlLists')]
     public function testConstructSelf()
     {
         $urls = func_get_args();

tests/bootstrap.php

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Net_URL2, a class representing a URL as per RFC 3986.
+ *
+ * PHP version 5
+ *
+ * @category Networking
+ * @package  Net_URL2
+ * @author   Some Pear Developers <pear@php.net>
+ * @license  https://spdx.org/licenses/BSD-3-Clause BSD-3-Clause
+ * @link     https://tools.ietf.org/html/rfc3986
+ */
+
+if (!class_exists('PHPUnit_Framework_TestCase'))
+{
+    class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
+}
+
+function shutdown($error_log)
+{
+    if (is_file($error_log))
+    {
+        printf("%s:\n", $error_log);
+        fpassthru(fopen($error_log, 'r'));
+        printf("%s: found. STOP.\n", $error_log);
+        exit(1);
+    }
+}
+
+ini_set('error_reporting', '-1');
+ini_set('error_log', dirname(dirname(__FILE__)) . vsprintf('/.php-%d.%d.%d-error.log', sscanf(PHP_VERSION, '%d.%d.%d')));
+ini_set('log_errors', '1');
+shutdown(ini_get('error_log'));
+register_shutdown_function('shutdown', ini_get('error_log'));
+ini_set('display_errors', 'stderr');
+
+require dirname(__FILE__) . '/../Net/URL2.php';