more namespacing in tests

Author: gggeek

tests/02ValueTest.php

@@ -2,6 +2,11 @@
 
 include_once __DIR__ . '/LoggerAwareTestCase.php';
 
+use PhpXmlRpc\Encoder;
+use PhpXmlRpc\Helper\XMLParser;
+use PhpXmlRpc\Request;
+use PhpXmlRpc\Value;
+
 /**
  * Tests involving the Value class.
  * NB: these tests do not involve the parsing of xml into Value objects - look in 04ParsingTest for that
@@ -170,7 +175,7 @@ public function testArrayAccess()
             }
         }
 
-        $v2 = new \PhpXmlRpc\Value(array(new \PhpXmlRpc\Value('one'), new \PhpXmlRpc\Value('two')), 'array');
+        $v2 = new Value(array(new Value('one'), new Value('two')), 'array');
         $this->assertequals(2, count($v2));
         $out = array(array('key' => 0, 'value'  => 'object'), array('key' => 1, 'value'  => 'object'));
         $i = 0;
@@ -182,7 +187,7 @@ public function testArrayAccess()
             $i++;
         }
 
-        $v3 = new \PhpXmlRpc\Value(10, 'i4');
+        $v3 = new Value(10, 'i4');
         $this->assertEquals(1, count($v3));
         $this->assertEquals(true, isset($v3['int']));
         $this->assertEquals(true, isset($v3['i4']));
@@ -196,7 +201,7 @@ public function testArrayAccess()
         $this->assertEquals(1000, $v3['i4']);
     }
 
-    /// @todo do not use \PhpXmlRpc\Encoder for this test
+    /// @todo do not use Encoder for this test
     public function testBigXML()
     {
         // nb: make sure that  the serialized xml corresponding to this is > 10MB in size
@@ -205,11 +210,11 @@ public function testBigXML()
             $data[] = 'hello world';
         }
 
-        $encoder = new \PhpXmlRpc\Encoder();
+        $encoder = new Encoder();
         $val = $encoder->encode($data);
-        $req = new \PhpXmlRpc\Request('test', array($val));
+        $req = new Request('test', array($val));
         $xml = $req->serialize();
-        $parser = new \PhpXmlRpc\Helper\XMLParser();
+        $parser = new XMLParser();
         $_xh = $parser->parse($xml);
 
         $this->assertequals(0, $_xh['isf']);
@@ -222,7 +227,7 @@ public function testLatin15InternalEncoding()
         }
 
         $string = chr(164);
-        $v = new \PhpXmlRpc\Value($string);
+        $v = new Value($string);
 
         $originalEncoding = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding;
         \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'ISO-8859-15';

tests/03MessagesTest.php

@@ -2,14 +2,16 @@
 
 include_once __DIR__ . '/LoggerAwareTestCase.php';
 
+use PhpXmlRpc\Response;
+
 /**
  * Tests involving Requests and Responses, except for the parsing part
  */
 class MessagesTest extends PhpXmlRpc_LoggerAwareTestCase
 {
     public function testSerializePHPValResponse()
     {
-        $r = new \PhpXmlRpc\Response(array('hello' => 'world'), 0, '', 'phpvals');
+        $r = new Response(array('hello' => 'world'), 0, '', 'phpvals');
         $v = $r->serialize();
         $this->assertStringContainsString('<member><name>hello</name>', $v);
         $this->assertStringContainsString('<value><string>world</string></value>', $v);

tests/04ParsingTest.php

@@ -2,6 +2,8 @@
 
 include_once __DIR__ . '/LoggerAwareTestCase.php';
 
+use \PhpXmlRpc\Request;
+
 /**
  * Tests involving xml parsing.
  *
@@ -727,7 +729,7 @@ public function testXXE()
     </params>
 </methodResponse>
 ';
-        $req = new \PhpXmlRpc\Request('hi');
+        $req = new Request('hi');
         $resp = $req->parseResponse($xml, true);
         $val = $resp->value();
         if (version_compare(PHP_VERSION, '5.6.0', '>=')) {

tests/05LoggerTest.php

@@ -5,6 +5,7 @@
 use PhpXmlRpc\Helper\Charset;
 use PhpXmlRpc\Helper\Http;
 use PhpXmlRpc\Helper\XMLParser;
+use PhpXmlRpc\Value;
 
 class LoggerTest extends PhpXmlRpc_PolyfillTestCase
 {
@@ -69,13 +70,13 @@ public function testXPAltLogger()
 
     public function testDeprecations()
     {
-        $v = new \PhpXmlRpc\Value(array(), \PhpXmlRpc\Value::$xmlrpcStruct);
+        $v = new Value(array(), Value::$xmlrpcStruct);
         $l = $v->getLogger();
-        \PhpXmlRpc\Value::setLogger($this);
+        Value::setLogger($this);
         \PhpXmlRpc\PhpXmlRpc::$xmlrpc_silence_deprecations = false;
         $c = $v->structSize();
         \PhpXmlRpc\PhpXmlRpc::$xmlrpc_silence_deprecations = true;
-        \PhpXmlRpc\Value::setLogger($l);
+        Value::setLogger($l);
         $this->assertStringContainsString("Method PhpXmlRpc\Value::structSize is deprecated", $this->warningBuffer);
     }
 

tests/06EncoderTest.php

@@ -2,6 +2,10 @@
 
 include_once __DIR__ . '/LoggerAwareTestCase.php';
 
+use PhpXmlRpc\Encoder;
+use PhpXmlRpc\Request;
+use PhpXmlRpc\Response;
+
 /**
  * Tests involving automatic encoding/decoding of php values into xmlrpc values (the Encoder class).
  *
@@ -46,11 +50,11 @@ public function testAutoCoDec()
         $v1 = php_xmlrpc_encode($data, array('auto_dates'));
         $v2 = php_xmlrpc_decode_xml($v1->serialize());
         $this->assertEquals($v1, $v2);
-        $r1 = new PhpXmlRpc\Response($v1);
+        $r1 = new Response($v1);
         $r2 = php_xmlrpc_decode_xml($r1->serialize());
         $r2->serialize(); // needed to set internal member payload
         $this->assertEquals($r1, $r2);
-        $m1 = new PhpXmlRpc\Request('hello dolly', array($v1));
+        $m1 = new Request('hello dolly', array($v1));
         $m2 = php_xmlrpc_decode_xml($m1->serialize());
         $m2->serialize(); // needed to set internal member payload
         $this->assertEquals($m1, $m2);
@@ -63,7 +67,7 @@ public function testLatin15InternalEncoding()
         }
 
         $string = chr(164);
-        $e = new \PhpXmlRpc\Encoder();
+        $e = new Encoder();
 
         $originalEncoding = \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding;
         \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding = 'ISO-8859-15';

tests/07ClientTest.php

@@ -2,6 +2,8 @@
 
 include_once __DIR__ . '/ServerAwareTestCase.php';
 
+use PhpXmlRpc\Client;
+
 /**
  * Tests involving the Client class features (and mostly no server).
  * @todo review: are there any tests which belong to the ServerTest class?
@@ -50,9 +52,9 @@ public function testUnsupportedAuth()
         $m = new xmlrpcmsg('examples.echo', array(
             new xmlrpcval('hello', 'string'),
         ));
-        $this->client->setOption(\PhpXmlRpc\Client::OPT_USERNAME, 'user');
-        $this->client->setOption(\PhpXmlRpc\Client::OPT_AUTH_TYPE, 2);
-        $this->client->setOption(\PhpXmlRpc\Client::OPT_USE_CURL, \PhpXmlRpc\Client::USE_CURL_NEVER);
+        $this->client->setOption(Client::OPT_USERNAME, 'user');
+        $this->client->setOption(Client::OPT_AUTH_TYPE, 2);
+        $this->client->setOption(Client::OPT_USE_CURL, Client::USE_CURL_NEVER);
         $r = $this->client->send($m);
         $this->assertEquals(\PhpXmlRpc\PhpXmlRpc::$xmlrpcerr['unsupported_option'], $r->faultCode());
     }
@@ -108,8 +110,8 @@ public function testCurlKAErr()
      */
     public function testCustomHeaders($curlOpt)
     {
-        $this->client->setOption(\PhpXmlRpc\Client::OPT_USE_CURL, $curlOpt);
-        $this->client->setOption(\PhpXmlRpc\Client::OPT_EXTRA_HEADERS, array('X-PXR-Test: yes'));
+        $this->client->setOption(Client::OPT_USE_CURL, $curlOpt);
+        $this->client->setOption(Client::OPT_EXTRA_HEADERS, array('X-PXR-Test: yes'));
         $r = new \PhpXmlRpc\Request('tests.getallheaders');
         $r = $this->client->send($r);
         $this->assertEquals(0, $r->faultCode());

tests/ServerAwareTestCase.php

@@ -4,6 +4,7 @@
 
 use PHPUnit\Extensions\SeleniumCommon\RemoteCoverage;
 use PHPUnit\Framework\TestResult;
+use PhpXmlRpc\Client;
 
 abstract class PhpXmlRpc_ServerAwareTestCase extends PhpXmlRpc_LoggerAwareTestCase
 {
@@ -110,10 +111,10 @@ protected function getClient()
      */
     public function getAvailableUseCurlOptions()
     {
-        $opts = array(array(\PhpXmlRpc\Client::USE_CURL_NEVER));
+        $opts = array(array(Client::USE_CURL_NEVER));
         if (function_exists('curl_init'))
         {
-            $opts[] = array(\PhpXmlRpc\Client::USE_CURL_ALWAYS);
+            $opts[] = array(Client::USE_CURL_ALWAYS);
         }
 
         return $opts;

tests/WebTestCase.php

@@ -2,6 +2,8 @@
 
 include_once __DIR__ . '/ServerAwareTestCase.php';
 
+use PhpXmlRpc\Client;
+
 abstract class PhpXmlRpc_WebTestCase extends PhpXmlRpc_ServerAwareTestCase
 {
     /**
@@ -58,11 +60,11 @@ protected function request($path, $method = 'GET', $payload = '', $emptyPageOk =
      * @see also ServerTest::set_up
      *
      * @param string $path
-     * @return \PhpXmlRpc\Client
+     * @return Client
      */
     protected function newClient($path)
     {
-        $client = new \PhpXmlRpc\Client($this->baseUrl . $path);
+        $client = new Client($this->baseUrl . $path);
         $client->setCookie('PHPUNIT_RANDOM_TEST_ID', static::$randId);
         if ($this->collectCodeCoverageInformation) {
             $client->setCookie('PHPUNIT_SELENIUM_TEST_ID', $this->testId);

tests/ci/setup/setup_php.sh

@@ -106,9 +106,25 @@ install_shivammatur() {
 
         # @todo check if this script works with all php versions from 5.6 onwards
         # @todo the amount of cleanup and hacks required to get shivammathur/php-ubuntu working is huge. Can we find a better installer?
-        #       It seems that https://github.com/shivammathur/php-builder might in fact be the one to use!
+        #       It seems that https://github.com/shivammathur/php-builder might in fact be the one to use...
         echo "Using PHP from shivammathur/php-ubuntu..."
 
+###!!!
+#        @todo this atm fails on focal/5.6, with `108.9 Reading package lists...zstd: /*stdin*\: unsupported format
+#                                                 109.2 tar: Child returned status 1
+#                                                 109.2 tar: Error is not recoverable: exiting now`
+#              Try running manually install.sh and see if we can fix it
+#
+#        apt-get install -y \
+#            apt-utils \
+#            curl \
+#            zstd
+#
+#        set +e
+#        curl -sSL https://github.com/shivammathur/php-builder/releases/latest/download/install.sh | bash -s "${PHP_VERSION}"
+#        set -e
+###!!!
+
         # Some of these packages create issues on GHA ubuntu containers...
         if [ -z "${GITHUB_ACTIONS}" ]; then
             # @todo this set of packages has only been tested on Noble so far (it should work on Jammy too)