CS-fixes

belgattitude · Oct 8, 2017 · 6bd0b85 · 6bd0b85
1 parent 4e88239
commit 6bd0b85
Show file tree

Hide file tree

Showing 28 changed files with 86 additions and 104 deletions.
diff --git a/.php_cs b/.php_cs
@@ -33,7 +33,7 @@ return PhpCsFixer\Config::create()
         'blank_line_before_return' => true,
         'cast_spaces' => true,
         'class_definition' => ['singleLine' => true],
-        'concat_space' => ['spacing' => 'one'], // Different from symfony (none)
+        'concat_space' => ['spacing' => "none"], // Different from symfony (none)
         'declare_equal_normalize' => true,
         'function_typehint_space' => true,
         'hash_to_slash_comment' => true,

diff --git a/src/Soluble/Japha/Bridge/Adapter.php b/src/Soluble/Japha/Bridge/Adapter.php
@@ -78,7 +78,7 @@ public function __construct(array $options, LoggerInterface $logger = null)
         $driver_class = self::$registeredDrivers[$driver] ?? null;
 
         if ($driver_class === null) {
-            throw new Exception\UnsupportedDriverException(__METHOD__ . " Driver '$driver' is not supported");
+            throw new Exception\UnsupportedDriverException(__METHOD__." Driver '$driver' is not supported");
         }
 
         $this->driver = new $driver_class($options, $logger);

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/Client.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/Client.php
@@ -460,7 +460,7 @@ public function begin(string $name, array $st): void
             default:
                 $this->protocol->handler->shutdownBrokenConnection(
                     sprintf(
-                        'Parser error, check the backend for details, $name: %s, ' .
+                        'Parser error, check the backend for details, $name: %s, '.
                         '$st params: %s',
                         $name,
                         json_encode($st)
@@ -493,8 +493,8 @@ protected function writeArg($arg): void
             $this->protocol->writeString($arg);
         } elseif (is_object($arg)) {
             if (!$arg instanceof JavaType) {
-                $msg = "Client failed to writeArg(), IllegalArgument 'arg:" . get_class($arg) . "' not a Java object, using NULL instead";
-                $this->logger->error("[soluble-japha] $msg (" . __METHOD__ . ')');
+                $msg = "Client failed to writeArg(), IllegalArgument 'arg:".get_class($arg)."' not a Java object, using NULL instead";
+                $this->logger->error("[soluble-japha] $msg (".__METHOD__.')');
                 //trigger_error($msg, E_USER_WARNING);
                 $this->protocol->writeObject(null);
             } else {
@@ -675,7 +675,7 @@ public function apply(ApplyArg $arg): void
             $res = call_user_func_array($ob, $res);
             if (is_object($res) && (!($res instanceof JavaType))) {
                 $msg = "Client failed to applyArg(), Object returned from '$name()' is not a Java object";
-                $this->logger->warning("[soluble-japha] $msg (" . __METHOD__ . ')');
+                $this->logger->warning("[soluble-japha] $msg (".__METHOD__.')');
                 trigger_error($msg, E_USER_WARNING);
 
                 $this->protocol->invokeBegin(0, 'makeClosure');
@@ -692,8 +692,8 @@ public function apply(ApplyArg $arg): void
             $this->protocol->writeException($e->__java, $trace);
             $this->protocol->resultEnd();
         } catch (\Throwable $ex) {
-            $msg = 'Unchecked exception detected in callback (' . $ex->__toString() . ')';
-            $this->logger->error("[soluble-japha] $msg (" . __METHOD__ . ')');
+            $msg = 'Unchecked exception detected in callback ('.$ex->__toString().')';
+            $this->logger->error("[soluble-japha] $msg (".__METHOD__.')');
             trigger_error($msg, E_USER_WARNING);
             throw new Exception\RuntimeException($msg);
         }

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/JavaProxy.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/JavaProxy.php
@@ -167,8 +167,8 @@ public function __toString(): string
         try {
             return (string) $this->__client->invokeMethod(0, 'ObjectToString', [$this]);
         } catch (Exception\JavaException $ex) {
-            $msg = 'Exception in Java::__toString(): ' . HelperFunctions::java_truncate((string) $ex);
-            $this->__client->getLogger()->warning("[soluble-japha] $msg (" . __METHOD__ . ')');
+            $msg = 'Exception in Java::__toString(): '.HelperFunctions::java_truncate((string) $ex);
+            $this->__client->getLogger()->warning("[soluble-japha] $msg (".__METHOD__.')');
             trigger_error($msg, E_USER_WARNING);
 
             return '';

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/Pjb62Driver.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/Pjb62Driver.php
@@ -67,11 +67,11 @@ public function __construct(array $options, LoggerInterface $logger = null)
         } catch (Exception\ConnectionException $e) {
             $address = $options['servlet_address'];
             $msg = "Cannot connect to php-java-bridge server on '$address', server didn't respond.";
-            $this->logger->critical("[soluble-japha] $msg (" . $e->getMessage() . ')');
+            $this->logger->critical("[soluble-japha] $msg (".$e->getMessage().')');
             throw $e;
         } catch (Exception\InvalidArgumentException $e) {
             $msg = 'Invalid arguments, cannot initiate connection to java-bridge.';
-            $this->logger->error("[soluble-japha] $msg (" . $e->getMessage() . ')');
+            $this->logger->error("[soluble-japha] $msg (".$e->getMessage().')');
             throw $e;
         }
     }
@@ -376,7 +376,7 @@ public function getClassName(Interfaces\JavaObject $javaObject): string
         $matches = [];
         preg_match('/^\[class (.+)\:/', $inspect, $matches);
         if (!isset($matches[1]) || $matches[1] == '') {
-            throw new Exception\UnexpectedException(__METHOD__ . ' Cannot determine class name');
+            throw new Exception\UnexpectedException(__METHOD__.' Cannot determine class name');
         }
 
         return $matches[1];

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/PjbProxyClient.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/PjbProxyClient.php
@@ -163,7 +163,7 @@ public static function getInstance(?array $options = null, ?LoggerInterface $log
         if (self::$instance === null) {
             if ($options === null) {
                 throw new Exception\InvalidUsageException(
-                    'Cannot instanciate PjbProxyClient without "$options" the first time, ' .
+                    'Cannot instanciate PjbProxyClient without "$options" the first time, '.
                     'or the instance have been unregistered since'
                 );
             }
@@ -196,7 +196,7 @@ protected function loadClient(): void
             $options = $this->options;
 
             if (!isset($options['servlet_address'])) {
-                throw new Exception\InvalidArgumentException(__METHOD__ . ' Missing required parameter servlet_address');
+                throw new Exception\InvalidArgumentException(__METHOD__.' Missing required parameter servlet_address');
             }
 
             $connection = static::parseServletUrl($options['servlet_address']);
@@ -322,7 +322,7 @@ public function isInstanceOf(Interfaces\JavaObject $object, $class): bool
             // Will eventually throws ClassNotFoundException
             $class = $this->getJavaClass($name);
         } elseif (!$class instanceof Interfaces\JavaObject) {
-            throw new Exception\InvalidArgumentException(__METHOD__ . 'Class $class parameter must be of Interfaces\JavaClass, Interfaces\JavaObject or string');
+            throw new Exception\InvalidArgumentException(__METHOD__.'Class $class parameter must be of Interfaces\JavaClass, Interfaces\JavaObject or string');
         }
 
         return self::getClient()->invokeMethod(0, 'instanceOf', [$object, $class]);
@@ -436,7 +436,7 @@ public static function parseServletUrl(string $servlet_address): array
         $url = parse_url($servlet_address);
 
         if ($url === false || !isset($url['host'])) {
-            throw new Exception\InvalidArgumentException(__METHOD__ . " Cannot parse url '$servlet_address'");
+            throw new Exception\InvalidArgumentException(__METHOD__." Cannot parse url '$servlet_address'");
         }
 
         $scheme = '';

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/Protocol.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/Protocol.php
@@ -142,9 +142,6 @@ public function getOverrideHosts(): string
         return Pjb62Driver::getJavaBridgeHeader('X_JAVABRIDGE_OVERRIDE_HOSTS_REDIRECT', $_SERVER);
     }
 
-    /**
-     * @param SocketHandler $socketHandler
-     */
     public function setSocketHandler(SocketHandler $socketHandler): void
     {
         $this->socketHandler = $socketHandler;

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/Proxy/DefaultThrowExceptionProxyFactory.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/Proxy/DefaultThrowExceptionProxyFactory.php
@@ -77,7 +77,7 @@ protected function getExceptionFromResult(Pjb62\Exception\JavaException $result)
             $exceptionClass = $this->defaultException;
         }
 
-        $cls = '\\Soluble\\Japha\\Bridge\\Exception\\' . $exceptionClass;
+        $cls = '\\Soluble\\Japha\\Bridge\\Exception\\'.$exceptionClass;
 
         // Public message, mask any login/passwords
         $message = preg_replace('/user=([^&\ ]+)|password=([^&\ ]+)/', '****', $message);

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/SimpleHttpHandler.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/SimpleHttpHandler.php
@@ -180,7 +180,7 @@ public function getWebAppInternal()
 
         return ($this->java_servlet == 'User' &&
                 array_key_exists('PHP_SELF', $_SERVER) &&
-                array_key_exists('HTTP_HOST', $_SERVER)) ? $_SERVER['PHP_SELF'] . 'javabridge' : null;
+                array_key_exists('HTTP_HOST', $_SERVER)) ? $_SERVER['PHP_SELF'].'javabridge' : null;
     }
 
     public function getWebApp(): string
@@ -228,7 +228,7 @@ public function getChannel(string $channelName): SocketChannelP
         try {
             $streamSocket = new StreamSocket(
                 $this->ssl === 'ssl' ? StreamSocket::TRANSPORT_SSL : StreamSocket::TRANSPORT_TCP,
-                $this->host . ':' . $channelName,
+                $this->host.':'.$channelName,
                 self::DEFAULT_CONNECT_TIMEOUT,
                 [],
                 true

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/SimpleHttpTunnelHandler.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/SimpleHttpTunnelHandler.php
@@ -102,7 +102,7 @@ protected function open()
         try {
             $streamSocket = new StreamSocket(
                 $this->ssl === 'ssl' ? StreamSocket::TRANSPORT_SSL : StreamSocket::TRANSPORT_TCP,
-                $this->host . ':' . $this->port,
+                $this->host.':'.$this->port,
                 self::DEFAULT_CONNECT_TIMEOUT
             );
             $socket = $streamSocket->getSocket();
@@ -227,7 +227,7 @@ public function write(string $data): ?int
         $compat = PjbProxyClient::getInstance()->getCompatibilityOption($this->protocol->client);
         $this->headers = null; // reset headers
 
-        $request = $this->httpHeadersPayload . "\r\n" . $this->getBodyFor($compat, $data);
+        $request = $this->httpHeadersPayload."\r\n".$this->getBodyFor($compat, $data);
 
         $count = @fwrite($this->socket, $request);
         if ($count === false) {

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/SocketHandler.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/SocketHandler.php
@@ -110,7 +110,7 @@ public function dieWithBrokenConnection(string $msg = ''): void
         // Log error
         $client = $this->protocol->getClient();
 
-        $client->getLogger()->critical("[soluble-japha] Broken connection: $msg, check the backend log for details\"  (" . __METHOD__ . ')');
+        $client->getLogger()->critical("[soluble-japha] Broken connection: $msg, check the backend log for details\"  (".__METHOD__.')');
 
         PjbProxyClient::unregisterInstance();
         throw new BrokenConnectionException("Broken connection: $msg, check the backend log for details");

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/ThrowExceptionProxyFactory.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/ThrowExceptionProxyFactory.php
@@ -72,9 +72,9 @@ public function checkResult(Exception\JavaException $result): void
         if (PjbProxyClient::getInstance()->getOption('java_prefer_values') || ($result->__hasDeclaredExceptions === 'T')) {
             throw $result;
         } else {
-            $msg = 'Unchecked exception detected: ' . HelperFunctions::java_truncate($result->__toString());
+            $msg = 'Unchecked exception detected: '.HelperFunctions::java_truncate($result->__toString());
             // Log error
-            $this->client->getLogger()->critical("[soluble-japha] $msg (" . __METHOD__ . ')');
+            $this->client->getLogger()->critical("[soluble-japha] $msg (".__METHOD__.')');
             trigger_error($msg, E_USER_WARNING);
         }
     }

diff --git a/src/Soluble/Japha/Bridge/Driver/Pjb62/Utils/HelperFunctions.php b/src/Soluble/Japha/Bridge/Driver/Pjb62/Utils/HelperFunctions.php
@@ -27,7 +27,7 @@ public static function java_get_session_lifetime(): int
     public static function java_truncate(string $str): string
     {
         if (strlen($str) > 955) {
-            return substr($str, 0, 475) . '[...]' . substr($str, -475);
+            return substr($str, 0, 475).'[...]'.substr($str, -475);
         }
 
         return $str;

diff --git a/src/Soluble/Japha/Bridge/Http/Cookie.php b/src/Soluble/Japha/Bridge/Http/Cookie.php
@@ -41,7 +41,7 @@ public static function getCookiesHeaderLine(array $cookies = null): ?string
             $cookieParts[] = self::serializePHPCookies($k, $v);
         }
 
-        return 'Cookie: ' . implode(';', $cookieParts);
+        return 'Cookie: '.implode(';', $cookieParts);
     }
 
     /**
@@ -67,7 +67,7 @@ private static function serializePHPCookies(string $cookieName, $cookieValue): s
 
             case 'array':
                 foreach ($cookieValue as $cookieValueKey => $cookieValueValue) {
-                    $cookieParts[] = self::serializePHPCookies($cookieName . "[$cookieValueKey]", $cookieValueValue);
+                    $cookieParts[] = self::serializePHPCookies($cookieName."[$cookieValueKey]", $cookieValueValue);
                 }
                 break;
 
@@ -76,14 +76,14 @@ private static function serializePHPCookies(string $cookieName, $cookieValue): s
                 break;
 
             case 'boolean':
-                $cookieParts[] = "$urlEncodedCookieName=" . ($cookieValue ? '1' : '0');
+                $cookieParts[] = "$urlEncodedCookieName=".($cookieValue ? '1' : '0');
                 break;
 
             // It's a security risk to serialize an object and send it as a cookie
             case 'object':
                 // Intentional fallthrough
             default:
-                $cookieParts[] = "$urlEncodedCookieName=" . self::UNSUPPORTED_TYPE_VALUE;
+                $cookieParts[] = "$urlEncodedCookieName=".self::UNSUPPORTED_TYPE_VALUE;
                 break;
         }
 

diff --git a/src/Soluble/Japha/Db/DriverManager.php b/src/Soluble/Japha/Db/DriverManager.php
@@ -54,7 +54,7 @@ public function createConnection(string $dsn, string $driverClass = 'com.mysql.j
     {
         if (!is_string($dsn) || trim($dsn) == '') {
             $message = 'DSN param must be a valid (on-empty) string';
-            throw new Exception\InvalidArgumentException(__METHOD__ . ' ' . $message);
+            throw new Exception\InvalidArgumentException(__METHOD__.' '.$message);
         }
 
         $class = $this->ba->javaClass('java.lang.Class');
@@ -105,11 +105,11 @@ public static function getJdbcDsn(string $driver, string $db, string $host, stri
         if (count($options) > 0) {
             $tmp = [];
             foreach ($options as $key => $value) {
-                $tmp[] = urlencode($key) . '=' . urlencode($value);
+                $tmp[] = urlencode($key).'='.urlencode($value);
             }
-            $extras = '&' . implode('&', $tmp);
+            $extras = '&'.implode('&', $tmp);
         }
 
-        return "jdbc:$driver://$host/$db?user=$user&password=$password" . $extras;
+        return "jdbc:$driver://$host/$db?user=$user&password=$password".$extras;
     }
 }
diff --git a/test/SolubleTestFactories.php b/test/SolubleTestFactories.php
@@ -38,7 +38,7 @@ public static function startJavaBridgeServer()
                     'port' => $port,
                     'classpaths' => [
                         //__DIR__ . '/resources/mysql-connector-java-5.1.36-bin.jar',
-                        __DIR__ . '/resources/*.jar'
+                        __DIR__.'/resources/*.jar'
                     ]
                 ];
 
@@ -79,7 +79,7 @@ public static function getCachePath()
     {
         $cache_dir = $_SERVER['PHPUNIT_CACHE_DIR'];
         if (!preg_match('/^\//', $cache_dir)) {
-            $cache_dir = __DIR__ . DIRECTORY_SEPARATOR . $cache_dir;
+            $cache_dir = __DIR__.DIRECTORY_SEPARATOR.$cache_dir;
         }
 
         return $cache_dir;
@@ -90,7 +90,7 @@ public static function getCachePath()
      */
     public static function getScriptPath()
     {
-        return __DIR__ . DIRECTORY_SEPARATOR . 'scripts';
+        return __DIR__.DIRECTORY_SEPARATOR.'scripts';
     }
 
     public static function getDatabaseConfig()

diff --git a/test/bench/simple_benchmarks.php b/test/bench/simple_benchmarks.php
@@ -8,7 +8,7 @@
  * @license   MIT License https://github.com/belgattitude/soluble-japha/blob/master/LICENSE.md
  */
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__.'/../../vendor/autoload.php';
 
 use Soluble\Japha\Bridge\Adapter as BridgeAdapter;
 
@@ -18,7 +18,7 @@
 
 $start_total_time = $bm->getTimeMs();
 
-echo '<pre>' . PHP_EOL;
+echo '<pre>'.PHP_EOL;
 
 // BENCHING CONNECTION
 $start_connection_time = $bm->getTimeMs();
@@ -34,7 +34,7 @@
     ]);
     $init = $ba->java('java.lang.String');
 } catch (\Exception $e) {
-    die('Error connecting: ' . $e->getMessage());
+    die('Error connecting: '.$e->getMessage());
 }
 $end_connection_time = $bm->getTimeMs();
 $connection_time = $bm->getFormattedTimeMs($start_connection_time, $end_connection_time);
@@ -118,7 +118,7 @@ function ($iterations) use ($ba, $jString) {
     "\$a = `...String->concat('hello')` . ' world'",
     function ($iterations) use ($ba, $jString) {
         for ($i = 0; $i < $iterations; ++$i) {
-            $a = $jString->concat('hello') . ' world';
+            $a = $jString->concat('hello').' world';
         }
     }
 );
@@ -208,7 +208,7 @@ function ($iterations) {
     'Pure PHP: concat \'$string . "hello"\' ',
     function ($iterations) use (&$phpString) {
         for ($i = 0; $i < $iterations; ++$i) {
-            $phpString = $phpString . 'Hello World';
+            $phpString = $phpString.'Hello World';
         }
     }
 );
@@ -217,8 +217,8 @@ function ($iterations) use (&$phpString) {
 $total_time = $bm->getFormattedTimeMs($start_total_time, $end_total_time);
 
 echo PHP_EOL;
-echo '- Connection time: ' . $connection_time . PHP_EOL;
-echo '- Total time     : ' . $total_time . PHP_EOL;
+echo '- Connection time: '.$connection_time.PHP_EOL;
+echo '- Total time     : '.$total_time.PHP_EOL;
 echo PHP_EOL;
 
 class Benchmark
@@ -244,12 +244,12 @@ public function __construct()
     public function time($name, callable $fn)
     {
         if (!$this->tableHeaderPrinted) {
-            echo '| Benchmark name | ' . implode('|', array_map(function ($iter) {
+            echo '| Benchmark name | '.implode('|', array_map(function ($iter) {
                 return " x$iter ";
-            }, $this->iterations)) . '| Average | Memory |' . PHP_EOL;
-            echo '|----| ' . implode('|', array_map(function ($iter) {
+            }, $this->iterations)).'| Average | Memory |'.PHP_EOL;
+            echo '|----| '.implode('|', array_map(function ($iter) {
                 return '----:';
-            }, $this->iterations)) . '|-------:|----:| ' . PHP_EOL;
+            }, $this->iterations)).'|-------:|----:| '.PHP_EOL;
             $this->tableHeaderPrinted = true;
         }
 
@@ -272,11 +272,11 @@ public function time($name, callable $fn)
         $ttime = array_sum($times);
         echo number_format($ttime * 1000, 2);
         */
-        echo  "| $name | " . implode('| ', array_map(function ($time) {
-            return number_format($time * 1000, 2) . 'ms';
-        }, $times)) . '| ' .
-            number_format($avg * 1000, 2) . 'ms| ' .
-            round($memory / 1024, 2) . 'Kb' . '|' . PHP_EOL;
+        echo  "| $name | ".implode('| ', array_map(function ($time) {
+            return number_format($time * 1000, 2).'ms';
+        }, $times)).'| '.
+            number_format($avg * 1000, 2).'ms| '.
+            round($memory / 1024, 2).'Kb'.'|'.PHP_EOL;
     }
 
     /**
@@ -289,7 +289,7 @@ public function getFormattedTimeMs($start_time, $end_time)
     {
         $time = $end_time - $start_time;
 
-        return number_format($time, 0, '.', '') . ' ms';
+        return number_format($time, 0, '.', '').' ms';
     }
 
     /**