vaites / php-apache-tika

src/Clients/WebClient.php

Spacing +27 added lines, -27 removed lines

@@ -70,28 +70,28 @@ 
      */
     public function __construct($host = null, $port = null, $options = [])
     {
-        if(is_string($host) && filter_var($host, FILTER_VALIDATE_URL))
+        if (is_string($host) && filter_var($host, FILTER_VALIDATE_URL))
         {
             $this->setUrl($host);
         }
-        elseif($host)
+        elseif ($host)
         {
             $this->setHost($host);
         }
 
-        if(is_numeric($port))
+        if (is_numeric($port))
         {
             $this->setPort($port);
         }
 
-        if(!empty($options))
+        if (!empty($options))
         {
             $this->setOptions($options);
         }
 
         $this->setDownloadRemote(true);
 
-        if(self::$check === true)
+        if (self::$check === true)
         {
             $this->check();
         }
@@ -119,7 +119,7 @@ 
 
         $this->setHost($url['host']);
 
-        if(isset($url['port']))
+        if (isset($url['port']))
         {
             $this->setPort($url['port']);
         }
@@ -229,7 +229,7 @@ 
      */
     public function setOption($key, $value)
     {
-        if(in_array($key, [CURLINFO_HEADER_OUT, CURLOPT_PUT, CURLOPT_RETURNTRANSFER]))
+        if (in_array($key, [CURLINFO_HEADER_OUT, CURLOPT_PUT, CURLOPT_RETURNTRANSFER]))
         {
             throw new Exception("Value for cURL option $key cannot be modified", 3);
         }
@@ -248,7 +248,7 @@ 
      */
     public function setOptions($options)
     {
-        foreach($options as $key => $value)
+        foreach ($options as $key => $value)
         {
             $this->setOption($key, $value);
         }
@@ -287,7 +287,7 @@ 
      */
     public function check()
     {
-        if(self::$checked === false)
+        if (self::$checked === false)
         {
             // throws an exception if server is unreachable or can't connect
             $this->getVersion();
@@ -312,11 +312,11 @@ 
         $this->check();
 
         // check if is cached
-        if(isset($this->cache[sha1($file)][$type]))
+        if (isset($this->cache[sha1($file)][$type]))
         {
             return $this->cache[sha1($file)][$type];
         }
-        elseif(!isset($retries[sha1($file)]))
+        elseif (!isset($retries[sha1($file)]))
         {
             $retries[sha1($file)] = $this->retries;
         }
@@ -331,7 +331,7 @@ 
         $options = $this->getCurlOptions($type, $file);
 
         // sets headers
-        foreach($headers as $header)
+        foreach ($headers as $header)
         {
             $options[CURLOPT_HTTPHEADER][] = $header;
         }
@@ -343,26 +343,26 @@ 
         list($response, $status) = $this->exec($options);
 
         // request completed successfully
-        if($status == 200)
+        if ($status == 200)
         {
-            if($type == 'meta')
+            if ($type == 'meta')
             {
                 $response = Metadata::make($response, $file);
             }
 
             // cache certain responses
-            if(in_array($type, ['lang', 'meta']))
+            if (in_array($type, ['lang', 'meta']))
             {
                 $this->cache[sha1($file)][$type] = $response;
             }
         }
         // request completed successfully but result is empty
-        elseif($status == 204)
+        elseif ($status == 204)
         {
             $response = null;
         }
         // retry on request failed with error 500
-        elseif($status == 500 && $retries[sha1($file)]--)
+        elseif ($status == 500 && $retries[sha1($file)]--)
         {
             $response = $this->request($type, $file);
         }
@@ -388,13 +388,13 @@ 
         $curl = curl_init();
 
         // we avoid curl_setopt_array($curl, $options) because extrange Windows behaviour (issue #8)
-        foreach($options as $option => $value)
+        foreach ($options as $option => $value)
         {
             curl_setopt($curl, $option, $value);
         }
 
         // make the request
-        if(is_null($this->callback))
+        if (is_null($this->callback))
         {
             $this->response = curl_exec($curl);
         }
@@ -405,7 +405,7 @@ 
         }
 
         // exception if cURL fails
-        if(curl_errno($curl))
+        if (curl_errno($curl))
         {
             throw new Exception(curl_error($curl), curl_errno($curl));
         }
@@ -425,7 +425,7 @@ 
      */
     protected function error($status, $resource)
     {
-        switch($status)
+        switch ($status)
         {
             //  method not allowed
             case 405:
@@ -466,12 +466,12 @@ 
     {
         $headers = [];
 
-        if(!empty($file) && preg_match('/^http/', $file))
+        if (!empty($file) && preg_match('/^http/', $file))
         {
             $headers[] = "fileUrl:$file";
         }
 
-        switch($type)
+        switch ($type)
         {
             case 'html':
                 $resource = 'tika';
@@ -531,7 +531,7 @@ 
         $options = $this->options;
 
         // callback
-        if(!is_null($this->callback))
+        if (!is_null($this->callback))
         {
             $callback = $this->callback;
 
@@ -547,18 +547,18 @@ 
         }
 
         // remote file options
-        if($file && preg_match('/^http/', $file))
+        if ($file && preg_match('/^http/', $file))
         {
             //
         }
         // local file options
-        elseif($file && file_exists($file) && is_readable($file))
+        elseif ($file && file_exists($file) && is_readable($file))
         {
             $options[CURLOPT_INFILE] = fopen($file, 'r');
             $options[CURLOPT_INFILESIZE] = filesize($file);
         }
         // other options for specific requests
-        elseif(in_array($type,  ['detectors', 'mime-types', 'parsers', 'version']))
+        elseif (in_array($type, ['detectors', 'mime-types', 'parsers', 'version']))
         {
             $options[CURLOPT_PUT] = false;
         }

src/Clients/CLIClient.php

Spacing +16 added lines, -16 removed lines

@@ -42,17 +42,17 @@ 
      */
     public function __construct($path = null, $java = null)
     {
-        if($path)
+        if ($path)
         {
             $this->setPath($path);
         }
 
-        if($java)
+        if ($java)
         {
             $this->setJava($java);
         }
 
-        if(self::$check === true)
+        if (self::$check === true)
         {
             $this->check();
         }
@@ -112,16 +112,16 @@ 
      */
     public function check()
     {
-        if(self::$checked === false)
+        if (self::$checked === false)
         {
             // Java command must not return an error
             exec(($this->java ?: 'java') . ' -version 2> /dev/null', $output, $return);
-            if($return != 0)
+            if ($return != 0)
             {
                 throw new Exception('Java command not found');
             }
             // JAR path must exists
-            elseif(file_exists($this->path) == false)
+            elseif (file_exists($this->path) == false)
             {
                 throw new Exception('Apache Tika app JAR not found');
             }
@@ -144,7 +144,7 @@ 
         $this->check();
 
         // check if is cached
-        if(isset($this->cache[sha1($file)][$type]))
+        if (isset($this->cache[sha1($file)][$type]))
         {
             return $this->cache[sha1($file)][$type];
         }
@@ -156,7 +156,7 @@ 
         $file = parent::checkRequest($type, $file);
 
         // add last argument
-        if($file)
+        if ($file)
         {
             $arguments[] = escapeshellarg($file);
         }
@@ -169,13 +169,13 @@ 
         $response = $this->exec($command);
 
         // metadata response
-        if($type == 'meta')
+        if ($type == 'meta')
         {
             // fix for invalid? json returned only with images
             $response = str_replace(basename($file) . '"}{', '", ', $response);
 
             // on Windows, response comes in another charset
-            if(defined('PHP_WINDOWS_VERSION_MAJOR'))
+            if (defined('PHP_WINDOWS_VERSION_MAJOR'))
             {
                 $response = utf8_encode($response);
             }
@@ -184,7 +184,7 @@ 
         }
 
         // cache certain responses
-        if(in_array($type, ['lang', 'meta']))
+        if (in_array($type, ['lang', 'meta']))
         {
             $this->cache[sha1($file)][$type] = $response;
         }
@@ -209,13 +209,13 @@ 
         $callback = $this->callback;
 
         // get output if command runs ok
-        if(is_resource($process))
+        if (is_resource($process))
         {
             fclose($pipes[0]);
             $this->response = '';
-            while($chunk = stream_get_line($pipes[1], $this->chunkSize))
+            while ($chunk = stream_get_line($pipes[1], $this->chunkSize))
             {
-                if(!is_null($callback))
+                if (!is_null($callback))
                 {
                     $callback($chunk);
                 }
@@ -227,7 +227,7 @@ 
         }
 
         // exception if exit value is not zero
-        if($exit > 0)
+        if ($exit > 0)
         {
             throw new Exception("Unexpected exit value ($exit) for command $command");
         }
@@ -247,7 +247,7 @@ 
     {
         // parameters for command
         $arguments = [];
-        switch($type)
+        switch ($type)
         {
             case 'html':
                 $arguments[] = '--html';