Fix testProgressFunction

Author: isublimity

src/Transport/Http.php

@@ -434,14 +434,14 @@ public function __findXClickHouseProgress($handle)
  if (!$header_size) {
  return false;
  }
- $pos = strrpos($header, 'X-ClickHouse-Progress');
 
+ $pos = strrpos($header, 'X-ClickHouse-Summary:');
  if (!$pos) {
  return false;
  }
 
  $last = substr($header, $pos);
- $data = @json_decode(str_ireplace('X-ClickHouse-Progress:', '', $last), true);
+ $data = @json_decode(str_ireplace('X-ClickHouse-Summary:', '', $last), true);
 
  if ($data && is_callable($this->xClickHouseProgress)) {
 
@@ -657,7 +657,7 @@ public function selectAsync($sql, array $bindings = [], $whereInFile = null, $wr
  /**
  * @param callable $callback
  */
- public function setProgressFunction(callable $callback)
+ public function setProgressFunction(callable $callback) : void
  {
  $this->xClickHouseProgress = $callback;
  }

tests/ProgressAndEscapeTest.php

@@ -28,26 +28,24 @@ public function testProgressFunction()
  global $resultTest;
 
  $this->client->settings()->set('max_block_size', 1);
-
  $this->client->progressFunction(function ($data) {
  global $resultTest;
  $resultTest=$data;
  });
- $st=$this->client->select('SELECT number,sleep(0.2) FROM system.numbers limit 4');
+ $st=$this->client->select('SELECT number,sleep(0.1) FROM system.numbers limit 2 UNION ALL SELECT number,sleep(0.1) FROM system.numbers limit 12');
 
  // read_rows + read_bytes + total_rows
  $this->assertArrayHasKey('read_rows',$resultTest);
  $this->assertArrayHasKey('read_bytes',$resultTest);
+ $this->assertArrayHasKey('written_rows',$resultTest);
+ $this->assertArrayHasKey('written_bytes',$resultTest);
 
  if (isset($resultTest['total_rows']))
  {
  $this->assertArrayHasKey('total_rows',$resultTest);
  } else {
  $this->assertArrayHasKey('total_rows_to_read',$resultTest);
  }
-
-
-
  $this->assertGreaterThan(3,$resultTest['read_rows']);
  $this->assertGreaterThan(3,$resultTest['read_bytes']);
  }