Merge pull request #733 from cakephp/issue-724

Port fixes from #716 to master

Author: markstory

src/Command/BenchmarkCommand.php

@@ -28,9 +28,6 @@
  * functionally similar to Apache AB
  *
  * @since         DebugKit 1.0
- * @todo Print/export time detail information
- * @todo Export/graphing of data to .dot format for graphviz visualization
- * @todo Make calculated results round to leading significant digit position of std dev.
  */
 class BenchmarkCommand extends Command
 {

src/View/Helper/SimpleGraphHelper.php

@@ -55,10 +55,9 @@ class SimpleGraphHelper extends Helper
     public function bar($value, $offset, $options = [])
     {
         $settings = array_merge($this->_defaultSettings, $options);
-        /** @var int $max */
-        /** @var int $width */
-        /** @var string $valueType */
-        extract($settings);
+        $max = $settings['max'];
+        $width = $settings['width'];
+        $valueType = $settings['valueType'];
 
         $graphValue = $value / $max * $width;
         $graphValue = max(round($graphValue), 1);

tests/TestCase/DebugSqlTest.php

@@ -14,7 +14,7 @@
  */
 namespace DebugKit\Test\TestCase;
 
-use Cake\Database\Driver\Mysql;
+use Cake\Database\Driver\Postgres;
 use Cake\Datasource\ConnectionManager;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
@@ -59,7 +59,7 @@ public function testSqlText()
 ###########################
 
 EXPECTED;
-        $fieldName = $this->connection->getDriver() instanceof Mysql ? '`panels__id`' : '"panels__id"';
+        $fieldName = $this->connection->getDriver() instanceof Postgres ? '"panels__id"' : 'panels__id';
         $expected = sprintf($expectedText, str_replace(ROOT, '', __FILE__), __LINE__ - 11, $fieldName);
         $this->assertEquals($expected, $result);
     }
@@ -86,7 +86,7 @@ public function testSqlHtml()
 </pre>
 </div>
 EXPECTED;
-        $fieldName = $this->connection->getDriver() instanceof Mysql ? '`panels__id`' : '"panels__id"';
+        $fieldName = $this->connection->getDriver() instanceof Postgres ? '"panels__id"' : 'panels__id';
         $expected = sprintf($expectedHtml, str_replace(ROOT, '', __FILE__), __LINE__ - 15, $fieldName);
         $this->assertEquals(str_replace("\r", '', $expected), str_replace("\r", '', $result));
     }

tests/TestCase/Panel/VariablesPanelTest.php

@@ -112,8 +112,14 @@ public function testShutdown()
         });
         $this->assertRegExp('/^\[stream\] Resource id #\d+$/', $output['content']['resource']);
         $this->assertIsArray($output['content']['unserializableDebugInfo']);
+
+        if (version_compare(PHP_VERSION, '7.4.0', '>=')) {
+            $expectedErrorMessage = "Unserializable object - stdClass. Error: Serialization of 'PDO' is not allowed";
+        } else {
+            $expectedErrorMessage = 'Unserializable object - stdClass. Error: You cannot serialize or unserialize PDO instances';
+        }
         $this->assertStringStartsWith(
-            'Unserializable object - stdClass. Error: You cannot serialize or unserialize PDO instances',
+            $expectedErrorMessage,
             $output['content']['unserializableDebugInfo']['unserializable']
         );
         $this->assertStringStartsWith(

tests/TestCase/ToolbarServiceTest.php

@@ -286,11 +286,7 @@ public function testInjectScriptsStreamBodies()
 
         $result = $bar->injectScripts($row, $response);
         $this->assertInstanceOf('Cake\Http\Response', $result);
-        if (version_compare(PHP_VERSION, '5.6.0', '>=')) {
-            $this->assertEquals('I am a teapot!', $response->getBody());
-        } else {
-            $this->assertInstanceOf('Closure', $response->getBody());
-        }
+        $this->assertEquals('I am a teapot!', $response->getBody());
     }
 
     /**