Added 'append' parameter to Client::setCallback() to disable response append to save memory as requested on #24

Author: vaites

src/Client.php

@@ -65,6 +65,13 @@ abstract class Client
      */
     protected $callback = null;
 
+    /**
+     * Enable or disable appending when using callback
+     *
+     * @var bool
+     */
+    protected $callbackAppend = true;
+
     /**
      * Size of chunks for callback
      *
@@ -140,14 +147,16 @@ public function getCallback()
      * @return  $this
      * @throws  \Exception
      */
-    public function setCallback($callback)
+    public function setCallback($callback, $append = true)
     {
         if($callback instanceof Closure)
         {
+            $this->callbackAppend = (bool) $append;
             $this->callback = $callback;
         }
         elseif(is_callable($callback))
         {
+            $this->callbackAppend = (bool) $append;
             $this->callback = function($chunk) use($callback)
             {
                 return call_user_func_array($callback, [$chunk]);
@@ -288,14 +297,15 @@ public function getMIME($file)
      *
      * @param   string  $file
      * @param   mixed   $callback
+     * @param   bool    $append
      * @return  string
      * @throws  \Exception
      */
-    public function getHTML($file, $callback = null)
+    public function getHTML($file, $callback = null, $append = true)
     {
         if(!is_null($callback))
         {
-            $this->setCallback($callback);
+            $this->setCallback($callback, $append);
         }
 
         return $this->request('html', $file);
@@ -306,14 +316,15 @@ public function getHTML($file, $callback = null)
      *
      * @param   string  $file
      * @param   mixed   $callback
+     * @param   bool    $append
      * @return  string
      * @throws  \Exception
      */
-    public function getText($file, $callback = null)
+    public function getText($file, $callback = null, $append = true)
     {
         if(!is_null($callback))
         {
-            $this->setCallback($callback);
+            $this->setCallback($callback, $append);
         }
 
         return $this->request('text', $file);
@@ -324,14 +335,15 @@ public function getText($file, $callback = null)
      *
      * @param   string  $file
      * @param   mixed   $callback
+     * @param   bool    $append
      * @return  string
      * @throws  \Exception
      */
-    public function getMainText($file, $callback = null)
+    public function getMainText($file, $callback = null, $append = true)
     {
         if(!is_null($callback))
         {
-            $this->setCallback($callback);
+            $this->setCallback($callback, $append);
         }
 
         return $this->request('text-main', $file);

src/Clients/CLIClient.php

@@ -219,7 +219,10 @@ public function exec($command)
                     $callback($chunk);
                 }
 
-                $this->response .= $chunk;
+                if($this->callbackAppend === true)
+                {
+                    $this->response .= $chunk;
+                }
             }
             fclose($pipes[1]);
             $exit = proc_close($process);

src/Clients/WebClient.php

@@ -323,7 +323,7 @@ public function request($type, $file = null)
         }
 
         // parameters for cURL request
-        list($resource, $headers) = $this->getParameters($type, $file);
+        [$resource, $headers] = $this->getParameters($type, $file);
 
         // check the request
         $file = $this->checkRequest($type, $file);
@@ -341,7 +341,7 @@ public function request($type, $file = null)
         $options[CURLOPT_URL] = $this->getUrl() . "/$resource";
 
         // get the response and the HTTP status code
-        list($response, $status) = $this->exec($options);
+        [$response, $status] = $this->exec($options);
 
         // reduce memory usage closing cURL resource
         if(isset($options[CURLOPT_INFILE]) && is_resource($options[CURLOPT_INFILE]))
@@ -560,7 +560,10 @@ protected function getCurlOptions($type, $file = null)
 
             $options[CURLOPT_WRITEFUNCTION] = function($handler, $data) use($callback)
             {
-                $this->response .= $data;
+                if($this->callbackAppend === true)
+                {
+                    $this->response .= $data;
+                }
 
                 $callback($data);
 

tests/BaseTest.php

@@ -449,7 +449,7 @@ public function testTextCallback($file)
     {
         $client =& self::$client;
 
-    if($client::MODE == 'web' && version_compare(self::$version, '1.9') == 0)
+        if($client::MODE == 'web' && version_compare(self::$version, '1.9') == 0)
         {
             $this->markTestSkipped('Apache Tika 1.9 throws random "Error while processing document" errors');
         }
@@ -463,6 +463,32 @@ public function testTextCallback($file)
         }
     }
 
+    /**
+     * Text callback test
+     *
+     * @dataProvider    callbackProvider
+     *
+     * @param   string $file
+     * @throws  \Exception
+     */
+    public function testTextCallbackWithoutAppend($file)
+    {
+        $client =& self::$client;
+
+        if($client::MODE == 'web' && version_compare(self::$version, '1.9') == 0)
+        {
+            $this->markTestSkipped('Apache Tika 1.9 throws random "Error while processing document" errors');
+        }
+        else
+        {
+            BaseTest::$shared = 0;
+
+            $response = self::$client->getText($file, [$this, 'callableCallback'], false);
+
+            $this->assertEmpty($response);
+        }
+    }
+
     /**
      * Main text callback test
      *