| @@ -6,7 +6,7 @@ | ||
| 6 | 6 | * @license code licensed under the BSD License: see file license.txt | 
| 7 | 7 | **/ | 
| 8 | 8 | |
| 9 | -$coverageFile = realpath(__DIR__ . "/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); | |
| 9 | +$coverageFile = realpath(__DIR__."/../vendor/phpunit/phpunit-selenium/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php"); | |
| 10 | 10 | |
| 11 | 11 | // has to be the same value as used in server.php | 
| 12 | 12 | $GLOBALS['PHPUNIT_COVERAGE_DATA_DIRECTORY'] = '/tmp/phpxmlrpc_coverage'; | 
| @@ -29,7 +29,7 @@ | ||
| 29 | 29 | return; | 
| 30 | 30 | } | 
| 31 | 31 | |
| 32 | -        if (is_file($file = __DIR__ . str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { | |
| 32 | +        if (is_file($file = __DIR__.str_replace(array('PhpXmlRpc\\', '\\'), '/', $class).'.php')) { | |
| 33 | 33 | require $file; | 
| 34 | 34 | } | 
| 35 | 35 | } | 
| @@ -141,9 +141,9 @@ | ||
| 141 | 141 | * @deprecated | 
| 142 | 142 | */ | 
| 143 | 143 | function build_remote_method_wrapper_code($client, $methodName, $xmlrpcFuncName, | 
| 144 | - $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc', | |
| 145 | - $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false, | |
| 146 | - $faultResponse = '', $namespace = '\\PhpXmlRpc\\') | |
| 144 | + $mSig, $mDesc = '', $timeout = 0, $protocol = '', $clientCopyMode = 0, $prefix = 'xmlrpc', | |
| 145 | + $decodePhpObjects = false, $encodePhpObjects = false, $decodeFault = false, | |
| 146 | + $faultResponse = '', $namespace = '\\PhpXmlRpc\\') | |
| 147 | 147 |  { | 
| 148 | 148 |      $code = "function $xmlrpcFuncName ("; | 
| 149 | 149 |      if ($clientCopyMode < 2) { | 
| @@ -41,10 +41,10 @@ discard block | ||
| 41 | 41 | * @param array $extraOptions | 
| 42 | 42 | * @return array|false | 
| 43 | 43 | */ | 
| 44 | -function wrap_php_function($funcName, $newFuncName='', $extraOptions=array()) | |
| 44 | +function wrap_php_function($funcName, $newFuncName = '', $extraOptions = array()) | |
| 45 | 45 |  { | 
| 46 | 46 | $wrapper = new PhpXmlRpc\Wrapper(); | 
| 47 | -    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) { | |
| 47 | +    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { | |
| 48 | 48 | // backwards compat: return string instead of callable | 
| 49 | 49 | $extraOptions['return_source'] = true; | 
| 50 | 50 | $wrapped = $wrapper->wrapPhpFunction($funcName, $newFuncName, $extraOptions); | 
| @@ -64,17 +64,17 @@ discard block | ||
| 64 | 64 | * @param array $extraOptions | 
| 65 | 65 | * @return array|false | 
| 66 | 66 | */ | 
| 67 | -function wrap_php_class($className, $extraOptions=array()) | |
| 67 | +function wrap_php_class($className, $extraOptions = array()) | |
| 68 | 68 |  { | 
| 69 | 69 | $wrapper = new PhpXmlRpc\Wrapper(); | 
| 70 | 70 | $fix = false; | 
| 71 | -    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) { | |
| 71 | +    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { | |
| 72 | 72 | // backwards compat: return string instead of callable | 
| 73 | 73 | $extraOptions['return_source'] = true; | 
| 74 | 74 | $fix = true; | 
| 75 | 75 | } | 
| 76 | 76 | $wrapped = $wrapper->wrapPhpClass($className, $extraOptions); | 
| 77 | -    foreach($wrapped as $name => $value) { | |
| 77 | +    foreach ($wrapped as $name => $value) { | |
| 78 | 78 |          if ($fix) { | 
| 79 | 79 | eval($value['source']); | 
| 80 | 80 | } | 
| @@ -93,7 +93,7 @@ discard block | ||
| 93 | 93 | * @param string $newFuncName deprecated, use an option in $extraOptions | 
| 94 | 94 | * @return array|callable|false | 
| 95 | 95 | */ | 
| 96 | -function wrap_xmlrpc_method($client, $methodName, $extraOptions=0, $timeout=0, $protocol='', $newFuncName='') | |
| 96 | +function wrap_xmlrpc_method($client, $methodName, $extraOptions = 0, $timeout = 0, $protocol = '', $newFuncName = '') | |
| 97 | 97 |  { | 
| 98 | 98 | if (!is_array($extraOptions)) | 
| 99 | 99 |      { | 
| @@ -108,7 +108,7 @@ discard block | ||
| 108 | 108 | |
| 109 | 109 | $wrapper = new PhpXmlRpc\Wrapper(); | 
| 110 | 110 | |
| 111 | -    if (!isset($extraOptions['return_source'])  || $extraOptions['return_source'] == false) { | |
| 111 | +    if (!isset($extraOptions['return_source']) || $extraOptions['return_source'] == false) { | |
| 112 | 112 | // backwards compat: return string instead of callable | 
| 113 | 113 | $extraOptions['return_source'] = true; | 
| 114 | 114 | $wrapped = $wrapper->wrapXmlrpcMethod($client, $methodName, $extraOptions); | 
| @@ -128,7 +128,7 @@ discard block | ||
| 128 | 128 | * @param array $extraOptions | 
| 129 | 129 | * @return mixed | 
| 130 | 130 | */ | 
| 131 | -function wrap_xmlrpc_server($client, $extraOptions=array()) | |
| 131 | +function wrap_xmlrpc_server($client, $extraOptions = array()) | |
| 132 | 132 |  { | 
| 133 | 133 | $wrapper = new PhpXmlRpc\Wrapper(); | 
| 134 | 134 | return $wrapper->wrapXmlrpcServer($client, $extraOptions); | 
| @@ -148,7 +148,7 @@ discard block | ||
| 148 | 148 | $faultResponse = '', $namespace = '\\PhpXmlRpc\\') | 
| 149 | 149 |  { | 
| 150 | 150 |      $code = "function $xmlrpcFuncName ("; | 
| 151 | -    if ($clientCopyMode < 2) { | |
| 151 | +    if ($clientCopyMode<2) { | |
| 152 | 152 | // client copy mode 0 or 1 == partial / full client copy in emitted code | 
| 153 | 153 | $innerCode = build_client_wrapper_code($client, $clientCopyMode, $prefix); | 
| 154 | 154 | $innerCode .= "\$client->setDebug(\$debug);\n"; | 
| @@ -162,7 +162,7 @@ discard block | ||
| 162 | 162 | |
| 163 | 163 |      if ($mDesc != '') { | 
| 164 | 164 | // take care that PHP comment is not terminated unwillingly by method description | 
| 165 | -        $mDesc = "/**\n* " . str_replace('*/', '* /', $mDesc) . "\n"; | |
| 165 | +        $mDesc = "/**\n* ".str_replace('*/', '* /', $mDesc)."\n"; | |
| 166 | 166 |      } else { | 
| 167 | 167 | $mDesc = "/**\nFunction $xmlrpcFuncName\n"; | 
| 168 | 168 | } | 
| @@ -171,7 +171,7 @@ discard block | ||
| 171 | 171 |      $innerCode .= "\$encoder = new {$namespace}Encoder();\n"; | 
| 172 | 172 | $plist = array(); | 
| 173 | 173 | $pCount = count($mSig); | 
| 174 | -    for ($i = 1; $i < $pCount; $i++) { | |
| 174 | +    for ($i = 1; $i<$pCount; $i++) { | |
| 175 | 175 | $plist[] = "\$p$i"; | 
| 176 | 176 | $pType = $mSig[$i]; | 
| 177 | 177 | if ($pType == 'i4' || $pType == 'i8' || $pType == 'int' || $pType == 'boolean' || $pType == 'double' || | 
| @@ -187,19 +187,19 @@ discard block | ||
| 187 | 187 | } | 
| 188 | 188 | } | 
| 189 | 189 | $innerCode .= "\$req->addparam(\$p$i);\n"; | 
| 190 | - $mDesc .= '* @param ' . xmlrpc_2_php_type($pType) . " \$p$i\n"; | |
| 190 | + $mDesc .= '* @param '.xmlrpc_2_php_type($pType)." \$p$i\n"; | |
| 191 | 191 | } | 
| 192 | -    if ($clientCopyMode < 2) { | |
| 192 | +    if ($clientCopyMode<2) { | |
| 193 | 193 | $plist[] = '$debug=0'; | 
| 194 | 194 |          $mDesc .= "* @param int \$debug when 1 (or 2) will enable debugging of the underlying {$prefix} call (defaults to 0)\n"; | 
| 195 | 195 | } | 
| 196 | 196 |      $plist = implode(', ', $plist); | 
| 197 | -    $mDesc .= '* @return ' . xmlrpc_2_php_type($mSig[0]) . " (or an {$namespace}Response obj instance if call fails)\n*/\n"; | |
| 197 | +    $mDesc .= '* @return '.xmlrpc_2_php_type($mSig[0])." (or an {$namespace}Response obj instance if call fails)\n*/\n"; | |
| 198 | 198 | |
| 199 | 199 |      $innerCode .= "\$res = \${$this_}client->send(\$req, $timeout, '$protocol');\n"; | 
| 200 | 200 |      if ($decodeFault) { | 
| 201 | 201 |          if (is_string($faultResponse) && ((strpos($faultResponse, '%faultCode%') !== false) || (strpos($faultResponse, '%faultString%') !== false))) { | 
| 202 | -            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '" . str_replace("'", "''", $faultResponse) . "')"; | |
| 202 | +            $respCode = "str_replace(array('%faultCode%', '%faultString%'), array(\$res->faultCode(), \$res->faultString()), '".str_replace("'", "''", $faultResponse)."')"; | |
| 203 | 203 |          } else { | 
| 204 | 204 | $respCode = var_export($faultResponse, true); | 
| 205 | 205 | } | 
| @@ -212,7 +212,7 @@ discard block | ||
| 212 | 212 | $innerCode .= "if (\$res->faultcode()) return $respCode; else return \$encoder->decode(\$res->value());"; | 
| 213 | 213 | } | 
| 214 | 214 | |
| 215 | -    $code = $code . $plist . ") {\n" . $innerCode . "\n}\n"; | |
| 215 | +    $code = $code.$plist.") {\n".$innerCode."\n}\n"; | |
| 216 | 216 | |
| 217 | 217 |      return array('source' => $code, 'docstring' => $mDesc); | 
| 218 | 218 | } | 
| @@ -220,10 +220,10 @@ discard block | ||
| 220 | 220 | /** | 
| 221 | 221 | * @deprecated | 
| 222 | 222 | */ | 
| 223 | -function build_client_wrapper_code($client, $verbatim_client_copy, $prefix='xmlrpc') | |
| 223 | +function build_client_wrapper_code($client, $verbatim_client_copy, $prefix = 'xmlrpc') | |
| 224 | 224 |  { | 
| 225 | 225 |      $code = "\$client = new {$prefix}_client('".str_replace("'", "\'", $client->path). | 
| 226 | -        "', '" . str_replace("'", "\'", $client->server) . "', $client->port);\n"; | |
| 226 | +        "', '".str_replace("'", "\'", $client->server)."', $client->port);\n"; | |
| 227 | 227 | |
| 228 | 228 | // copy all client fields to the client that will be generated runtime | 
| 229 | 229 | // (this provides for future expansion or subclassing of client obj) | 
| @@ -39,10 +39,10 @@ | ||
| 39 | 39 | $flags = ENT_COMPAT; | 
| 40 | 40 | // avoid warnings on php < 5.4... | 
| 41 | 41 |              if (defined('ENT_HTML401')) { | 
| 42 | - $flags = $flags | ENT_HTML401; | |
| 42 | + $flags = $flags | ENT_HTML401; | |
| 43 | 43 | } | 
| 44 | 44 |              if (defined('ENT_SUBSTITUTE')) { | 
| 45 | - $flags = $flags | ENT_SUBSTITUTE; | |
| 45 | + $flags = $flags | ENT_SUBSTITUTE; | |
| 46 | 46 | } | 
| 47 | 47 |              if ($encoding != null) { | 
| 48 | 48 | print "<PRE>\n".htmlentities($message, $flags, $encoding)."\n</PRE>"; | 
| @@ -43,7 +43,7 @@ discard block | ||
| 43 | 43 | |
| 44 | 44 | // check for command line (env vars) vs. web page input params | 
| 45 | 45 |          if (!isset($_SERVER['REQUEST_METHOD'])) { | 
| 46 | -            foreach($_SERVER as $key => $val) { | |
| 46 | +            foreach ($_SERVER as $key => $val) { | |
| 47 | 47 |                  if (array_key_exists($key, $args)) { | 
| 48 | 48 | $$key = $val; | 
| 49 | 49 | } | 
| @@ -87,7 +87,7 @@ discard block | ||
| 87 | 87 | } | 
| 88 | 88 | } | 
| 89 | 89 |          if ($HTTPURI[0] != '/') { | 
| 90 | - $HTTPURI = '/' . $HTTPURI; | |
| 90 | + $HTTPURI = '/'.$HTTPURI; | |
| 91 | 91 | } | 
| 92 | 92 | $args['HTTPURI'] = $HTTPURI; | 
| 93 | 93 | |
| @@ -101,21 +101,21 @@ discard block | ||
| 101 | 101 | } | 
| 102 | 102 | |
| 103 | 103 |          if (isset($HTTPSIGNOREPEER)) { | 
| 104 | - $args['HTTPSIGNOREPEER'] = (bool)$HTTPSIGNOREPEER; | |
| 104 | + $args['HTTPSIGNOREPEER'] = (bool) $HTTPSIGNOREPEER; | |
| 105 | 105 | } | 
| 106 | 106 | |
| 107 | 107 |          if (isset($HTTPSVERIFYHOST)) { | 
| 108 | - $args['HTTPSVERIFYHOST'] = (int)$HTTPSVERIFYHOST; | |
| 108 | + $args['HTTPSVERIFYHOST'] = (int) $HTTPSVERIFYHOST; | |
| 109 | 109 | } | 
| 110 | 110 | |
| 111 | 111 |          if (isset($SSLVERSION)) { | 
| 112 | - $args['SSLVERSION'] = (int)$SSLVERSION; | |
| 112 | + $args['SSLVERSION'] = (int) $SSLVERSION; | |
| 113 | 113 | } | 
| 114 | 114 | |
| 115 | 115 |          if (isset($PROXYSERVER)) { | 
| 116 | 116 |              $arr = explode(':', $PROXYSERVER); | 
| 117 | 117 | $args['PROXYSERVER'] = $arr[0]; | 
| 118 | -            if (count($arr) > 1) { | |
| 118 | +            if (count($arr)>1) { | |
| 119 | 119 | $args['PROXYPORT'] = $arr[1]; | 
| 120 | 120 |              } else { | 
| 121 | 121 | $args['PROXYPORT'] = 8080; | 
| @@ -1,10 +1,10 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; | |
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; | |
| 4 | 4 | |
| 5 | -include_once __DIR__ . '/parse_args.php'; | |
| 5 | +include_once __DIR__.'/parse_args.php'; | |
| 6 | 6 | |
| 7 | -include_once __DIR__ . '/PolyfillTestCase.php'; | |
| 7 | +include_once __DIR__.'/PolyfillTestCase.php'; | |
| 8 | 8 | |
| 9 | 9 | use PHPUnit\Runner\BaseTestRunner; | 
| 10 | 10 | |
| @@ -58,7 +58,7 @@ discard block | ||
| 58 | 58 | $this->client->server .= 'XXX'; | 
| 59 | 59 | $dnsinfo = @dns_get_record($this->client->server); | 
| 60 | 60 |          if ($dnsinfo) { | 
| 61 | -            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host ' . $this->client->server . ' found'); | |
| 61 | +            $this->markTestSkipped('Seems like there is a catchall DNS in effect: host '.$this->client->server.' found'); | |
| 62 | 62 |          } else { | 
| 63 | 63 | $r = $this->client->send($m, 5); | 
| 64 | 64 | // make sure there's no freaking catchall DNS in effect | 
| @@ -85,7 +85,7 @@ discard block | ||
| 85 | 85 | |
| 86 | 86 | // now test a successful connection | 
| 87 | 87 |          $server = explode(':', $this->args['HTTPSERVER']); | 
| 88 | -        if (count($server) > 1) { | |
| 88 | +        if (count($server)>1) { | |
| 89 | 89 | $this->client->port = $server[1]; | 
| 90 | 90 | } | 
| 91 | 91 | $this->client->server = $server[0]; | 
| @@ -3,7 +3,7 @@ discard block | ||
| 3 | 3 | * @author JoakimLofgren | 
| 4 | 4 | */ | 
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/PolyfillTestCase.php'; | |
| 6 | +include_once __DIR__.'/PolyfillTestCase.php'; | |
| 7 | 7 | |
| 8 | 8 | use PhpXmlRpc\Helper\Charset; | 
| 9 | 9 | |
| @@ -32,10 +32,10 @@ discard block | ||
| 32 | 32 |      { | 
| 33 | 33 | // construct a latin string with all chars (except control ones) | 
| 34 | 34 | $this->latinString = "\n\r\t"; | 
| 35 | -        for($i = 32; $i < 127; $i++) { | |
| 35 | +        for ($i = 32; $i<127; $i++) { | |
| 36 | 36 | $this->latinString .= chr($i); | 
| 37 | 37 | } | 
| 38 | -        for($i = 160; $i < 256; $i++) { | |
| 38 | +        for ($i = 160; $i<256; $i++) { | |
| 39 | 39 | $this->latinString .= chr($i); | 
| 40 | 40 | } | 
| 41 | 41 | } | 
| @@ -1,11 +1,11 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; | |
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; | |
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; | |
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; | |
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; | |
| 6 | +include_once __DIR__.'/parse_args.php'; | |
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; | |
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; | |
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; | 
| 11 | 11 | |
| @@ -1,11 +1,11 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -include_once __DIR__ . '/../lib/xmlrpc.inc'; | |
| 4 | -include_once __DIR__ . '/../lib/xmlrpcs.inc'; | |
| 3 | +include_once __DIR__.'/../lib/xmlrpc.inc'; | |
| 4 | +include_once __DIR__.'/../lib/xmlrpcs.inc'; | |
| 5 | 5 | |
| 6 | -include_once __DIR__ . '/parse_args.php'; | |
| 6 | +include_once __DIR__.'/parse_args.php'; | |
| 7 | 7 | |
| 8 | -include_once __DIR__ . '/PolyfillTestCase.php'; | |
| 8 | +include_once __DIR__.'/PolyfillTestCase.php'; | |
| 9 | 9 | |
| 10 | 10 | use PHPUnit\Runner\BaseTestRunner; | 
| 11 | 11 | |
| @@ -128,7 +128,7 @@ discard block | ||
| 128 | 128 | $this->assertequals(1, count($v1)); | 
| 129 | 129 |          $out = array('me' => array(), 'mytype' => 2, '_php_class' => null); | 
| 130 | 130 | |
| 131 | - foreach($v1 as $key => $val) | |
| 131 | + foreach ($v1 as $key => $val) | |
| 132 | 132 |          { | 
| 133 | 133 | $this->assertArrayHasKey($key, $out); | 
| 134 | 134 | $expected = $out[$key]; | 
| @@ -143,7 +143,7 @@ discard block | ||
| 143 | 143 | $this->assertequals(2, count($v2)); | 
| 144 | 144 |          $out = array(array('key' => 0, 'value'  => 'object'), array('key' => 1, 'value'  => 'object')); | 
| 145 | 145 | $i = 0; | 
| 146 | - foreach($v2 as $key => $val) | |
| 146 | + foreach ($v2 as $key => $val) | |
| 147 | 147 |          { | 
| 148 | 148 | $expected = $out[$i]; | 
| 149 | 149 | $this->assertequals($expected['key'], $key); | 
| @@ -157,7 +157,7 @@ discard block | ||
| 157 | 157 |      { | 
| 158 | 158 | // nb: make sure that the serialized xml corresponding to this is > 10MB in size | 
| 159 | 159 | $data = array(); | 
| 160 | -        for ($i = 0; $i < 500000; $i++ ) { | |
| 160 | +        for ($i = 0; $i<500000; $i++) { | |
| 161 | 161 | $data[] = 'hello world'; | 
| 162 | 162 | } | 
| 163 | 163 | |