gggeek / phpxmlrpc

demo/server/methodProviders/functions.php

Spacing +11 added lines, -11 removed lines

@@ -53,11 +53,11 @@ 
         $snv = $sno->scalarval();
 
         // look it up in our array (zero-based)
-        if (isset(self::$stateNames[$snv - 1])) {
-            $stateName = self::$stateNames[$snv - 1];
+        if (isset(self::$stateNames[$snv-1])) {
+            $stateName = self::$stateNames[$snv-1];
         } else {
             // not there, so complain
-            $err = "I don't have a state for the index '" . $snv . "'";
+            $err = "I don't have a state for the index '".$snv."'";
         }
 
         if ($err != '') {
@@ -131,7 +131,7 @@ 
         $s = $req->getParam(0);
         $t = $req->getParam(1);
 
-        return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcInt));
+        return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcInt));
     }
 
     public static $addtwodouble_sig = array(array('double', 'double', 'double'));
@@ -141,7 +141,7 @@ 
         $s = $req->getParam(0);
         $t = $req->getParam(1);
 
-        return new Response(new Value($s->scalarval() + $t->scalarval(), Value::$xmlrpcDouble));
+        return new Response(new Value($s->scalarval()+$t->scalarval(), Value::$xmlrpcDouble));
     }
 
     public static $stringecho_sig = array(array('string', 'string'));
@@ -157,7 +157,7 @@ 
     public static function echoBack($req)
     {
         // just sends back a string with what I got sent to me, that's all (escaping for xml is automatic)
-        $s = "I got the following message:\n" . $req->serialize();
+        $s = "I got the following message:\n".$req->serialize();
 
         return new Response(new Value($s));
     }
@@ -230,17 +230,17 @@ 
 
         /// @todo in real life, we should check for presence of return characters to avoid header injection!
 
-        $msgHdr = "From: " . $mFrom->scalarval() . "\n";
-        $msgHdr .= "To: " . $mTo->scalarval() . "\n";
+        $msgHdr = "From: ".$mFrom->scalarval()."\n";
+        $msgHdr .= "To: ".$mTo->scalarval()."\n";
 
         if ($mCc->scalarval() != "") {
-            $msgHdr .= "Cc: " . $mCc->scalarval() . "\n";
+            $msgHdr .= "Cc: ".$mCc->scalarval()."\n";
         }
         if ($mBcc->scalarval() != "") {
-            $msgHdr .= "Bcc: " . $mBcc->scalarval() . "\n";
+            $msgHdr .= "Bcc: ".$mBcc->scalarval()."\n";
         }
         if ($mMime->scalarval() != "") {
-            $msgHdr .= "Content-type: " . $mMime->scalarval() . "\n";
+            $msgHdr .= "Content-type: ".$mMime->scalarval()."\n";
         }
         $msgHdr .= "X-Mailer: XML-RPC for PHP mailer 1.0";
 

demo/client/codegen.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 /**
  * Demoing the code-generation capabilities of the library: create a client class which exposes a bunch of methods
@@ -21,12 +21,12 @@ 
 );
 
 // the generated code does not have an autoloader included - we need to add in one
-$autoloader = __DIR__ . "/_prepend.php";
+$autoloader = __DIR__."/_prepend.php";
 
 $targetFile = '/tmp/MyClient.php';
 $generated = file_put_contents($targetFile,
-    "<?php\n\n" .
-    "require_once '$autoloader';\n\n" .
+    "<?php\n\n".
+    "require_once '$autoloader';\n\n".
     $code['code']
 );
 
@@ -46,8 +46,8 @@ 
 $client = new MyClient();
 $sorted = $client->examples_sortByAge(array(
     array('name' => 'Dave', 'age' => 24),
-    array('name' => 'Edd',  'age' => 45),
-    array('name' => 'Joe',  'age' => 37),
+    array('name' => 'Edd', 'age' => 45),
+    array('name' => 'Joe', 'age' => 37),
     array('name' => 'Fred', 'age' => 27),
 ));
 

demo/server/codegen.php

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 require_once __DIR__.'/methodProviders/CommentManager.php';
 
@@ -22,19 +22,19 @@ 
 // generate a file with a class definition
 
 // the generated code does not have an autoloader included - we need to add in one
-$autoloader = __DIR__ . "/_prepend.php";
+$autoloader = __DIR__."/_prepend.php";
 
 file_put_contents($targetClassFile,
-    "<?php\n\n" .
-    "require_once '$autoloader';\n\n" .
+    "<?php\n\n".
+    "require_once '$autoloader';\n\n".
     "class MyServerClass {\n\n"
 ) || die('uh oh');
 
 // we mangle a bit the code we get from wrapPhpClass to generate a php class instead of a bunch of functions
 
-foreach($code as $methodName => $methodDef) {
-    file_put_contents($targetClassFile, 'public static ' . $methodDef['source'] . "\n\n", FILE_APPEND) || die('uh oh');
-    $code[$methodName]['function'] = 'MyServerClass::' . $methodDef['function'];
+foreach ($code as $methodName => $methodDef) {
+    file_put_contents($targetClassFile, 'public static '.$methodDef['source']."\n\n", FILE_APPEND) || die('uh oh');
+    $code[$methodName]['function'] = 'MyServerClass::'.$methodDef['function'];
     unset($code[$methodName]['source']);
 }
 file_put_contents($targetClassFile, "}\n", FILE_APPEND) || die('uh oh');
@@ -42,11 +42,11 @@ 
 // generate the separate file with the xml-rpc server and dispatch map
 
 file_put_contents($targetServerFile,
-    "<?php\n\n" .
+    "<?php\n\n".
 
-    "require_once '$autoloader';\n\n" .
+    "require_once '$autoloader';\n\n".
 
-    "require_once '$targetClassFile';\n\n" .
+    "require_once '$targetClassFile';\n\n".
 
     // NB: since we are running the generated code within the same script, the existing CommentManager instance will be
     // available for usage by the methods of MyServerClass, as we keep a reference to them within the variable Wrapper::$objHolder
@@ -56,11 +56,11 @@ 
     //     Wrapper::$objHolder['xmlrpc_CommentManager_addComment'] = $cm;
     //     Wrapper::$objHolder['xmlrpc_CommentManager_getComments'] = $cm;
 
-    '$dm = ' . var_export($code, true) . ";\n" .
-    '$s = new \PhpXmlRpc\Server($dm, false);' . "\n" .
-    '$s->setDebug(2);' . "\n" .
-    '$s->exception_handling = 1;' . "\n" .
-    '$s->service();' . "\n"
+    '$dm = '.var_export($code, true).";\n".
+    '$s = new \PhpXmlRpc\Server($dm, false);'."\n".
+    '$s->setDebug(2);'."\n".
+    '$s->exception_handling = 1;'."\n".
+    '$s->service();'."\n"
 ) || die('uh oh');
 
 // test that everything worked by running it in realtime

demo/server/discuss.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
  *   `$functions_parameters_type` and `$exception_handling`
  */
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 require_once __DIR__.'/methodProviders/CommentManager.php';
 
@@ -19,12 +19,12 @@ 
 
 $addComment_sig = array(array(Value::$xmlrpcInt, Value::$xmlrpcString, Value::$xmlrpcString, Value::$xmlrpcString));
 
-$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, ' .
+$addComment_doc = 'Adds a comment to an item. The first parameter is the item ID, the second the name of the commenter, '.
     'and the third is the comment itself. Returns the number of comments against that ID.';
 
 $getComments_sig = array(array(Value::$xmlrpcArray, Value::$xmlrpcString));
 
-$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct ' .
+$getComments_doc = 'Returns an array of comments for a given ID, which is the sole argument. Each array item is a struct '.
     'containing name and comment text.';
 
 $srv = new Server(array(

tests/7DemofilesTest.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-include_once __DIR__ . '/WebTestCase.php';
+include_once __DIR__.'/WebTestCase.php';
 
 /**
  * Tests for php files in the 'demo' directory
@@ -12,8 +12,8 @@ 
         $this->args = argParser::getArgs();
 
         // assumes HTTPURI to be in the form /tests/index.php?etc...
-        $this->baseUrl = $this->args['HTTPSERVER'] . preg_replace('|\?.+|', '', $this->args['HTTPURI']);
-        $this->coverageScriptUrl = 'http://' . $this->args['HTTPSERVER'] . preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
+        $this->baseUrl = $this->args['HTTPSERVER'].preg_replace('|\?.+|', '', $this->args['HTTPURI']);
+        $this->coverageScriptUrl = 'http://'.$this->args['HTTPSERVER'].preg_replace('|/tests/index\.php(\?.*)?|', '/tests/phpunit_coverage.php', $this->args['HTTPURI']);
     }
 
     public function testVardemo()

demo/server/server.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     die();
 }
 
-require_once __DIR__ . "/_prepend.php";
+require_once __DIR__."/_prepend.php";
 
 use PhpXmlRpc\PhpXmlRpc;
 use PhpXmlRpc\Server;
@@ -80,7 +80,7 @@ 
         } elseif ($_GET['FORCE_AUTH'] == 'Digest') {
             if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
                 header('HTTP/1.1 401 Unauthorized');
-                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="' . uniqid() . '",opaque="' . md5('Phpxmlrpc Digest Realm') . '"');
+                header('WWW-Authenticate: Digest realm="Phpxmlrpc Digest Realm",qop="auth",nonce="'.uniqid().'",opaque="'.md5('Phpxmlrpc Digest Realm').'"');
                 die('Text visible if user hits Cancel button');
             }
         }

demo/server/_prepend.php

Spacing +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
 }
 
 // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer
-include_once __DIR__ . '/../../src/Autoloader.php';
+include_once __DIR__.'/../../src/Autoloader.php';
 PhpXmlRpc\Autoloader::register();

demo/client/_prepend.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 }
 
 // Use the custom class autoloader. These two lines are not needed when the phpxmlrpc library is installed using Composer
-include_once __DIR__ . '/../../src/Autoloader.php';
+include_once __DIR__.'/../../src/Autoloader.php';
 PhpXmlRpc\Autoloader::register();
 
 // Let unit tests run against localhost, 'plain' demos against a known public server

debugger/controller.php

Spacing +17 added lines, -17 removed lines

@@ -17,7 +17,7 @@ 
 // Make sure we set the correct charset type for output, so that we can display all characters
 header('Content-Type: text/html; charset=utf-8');
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 if ($action == '') {
     $action = 'list';
 }
@@ -33,27 +33,27 @@ 
     /// @const JSXMLRPC_PATH Path to the visual xmlrpc editing dialog's containing folder. Can be absolute, or
     ///         relative to this debugger's folder.
     if (defined('JSXMLRPC_PATH')) {
-        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__ . '/' . JSXMLRPC_PATH));
+        $editorpaths = array(JSXMLRPC_PATH[0] === '/' ? JSXMLRPC_PATH : (__DIR__.'/'.JSXMLRPC_PATH));
     } else {
         $editorpaths = array(
-            __DIR__ . '/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger
-            __DIR__ . '/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger
-            __DIR__ . '/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile in debugger
-            __DIR__ . '/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
-            __DIR__ . '/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
-            __DIR__ . '/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
-            __DIR__ . '/../../../../web/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm
+            __DIR__.'/vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer in debugger
+            __DIR__.'/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm in debugger
+            __DIR__.'/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via taskfile in debugger
+            __DIR__.'/../vendor/phpxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via composer
+            __DIR__.'/../node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is top-level, jsxmlrpc installed via npm
+            __DIR__.'/../../jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc too
+            __DIR__.'/../../../../web/node_modules/@jsxmlrpc/jsxmlrpc/debugger/', // this package is a composer dependency, jsxmlrpc installed via npm
         );
     }
-    foreach($editorpaths as $editorpath) {
-        if (is_file(realpath($editorpath . 'visualeditor.html'))) {
+    foreach ($editorpaths as $editorpath) {
+        if (is_file(realpath($editorpath.'visualeditor.html'))) {
             $haseditor = true;
             break;
         }
     }
     if ($haseditor) {
-        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'],  PHP_URL_PATH));
-        $editorurlpath = $controllerRootUrl . '/' . preg_replace('|^' . preg_quote(__DIR__, '|') .'|', '', $editorpath);
+        $controllerRootUrl = str_replace('/controller.php', '', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+        $editorurlpath = $controllerRootUrl.'/'.preg_replace('|^'.preg_quote(__DIR__, '|').'|', '', $editorpath);
         /// @todo for cases above 4, 5 and up, look at $controllerRootUrl and check if the web root is not pointing directly
         ///       at this folder, as in that case the link to the visualeditor will not
         ///       work, as it will be in the form http(s)://domain/../../jsxmlrpc/debugger/visualeditor.html
@@ -223,7 +223,7 @@ 
         }
 
         function activateeditor() {
-            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array( "\\\\","\\'"), $alt_payload); ?>';
+            var url = '<?php echo $editorurlpath; ?>visualeditor.html?params=<?php echo str_replace(array("\\", "'"), array("\\\\", "\\'"), $alt_payload); ?>';
             if (document.frmaction.wstype.value == "1")
                 url += '&type=jsonrpc';
             var wnd = window.open(url, '_blank', 'width=750, height=400, location=0, resizable=1, menubar=0, scrollbars=1');
@@ -260,9 +260,9 @@ 
         echo ' document.forms[2].submit();';
     } ?>">
 <h1>XML-RPC
-    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmxmlrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(0);" <?php if (!class_exists('\PhpXmlRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     /
-    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"';} ?>/></form>
+    <form name="frmjsonrpc" style="display: inline;" action="."><input name="yes" type="radio" onclick="switchtransport(1);" <?php if (!class_exists('\PhpXmlRpc\JsonRpc\Client')) { echo 'disabled="disabled"'; } ?>/></form>
     JSON-RPC Debugger (based on the <a href="https://gggeek.github.io/phpxmlrpc/">PHPXMLRPC</a> library, ver. <?php echo htmlspecialchars(\PhpXmlRpc\PhpXmlRpc::$xmlrpcVersion)?>)
 </h1>
 <form name="frmaction" method="get" action="action.php" target="frmaction" onSubmit="switchFormMethod();">
@@ -325,7 +325,7 @@ 
                 </select>
             </td>
             <td class="labelcell">Timeout:</td>
-            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout > 0) { echo $timeout; } ?>"/></td>
+            <td><input type="text" name="timeout" size="3" value="<?php if ($timeout>0) { echo $timeout; } ?>"/></td>
             <td></td>
             <td></td>
         </tr>