Merge branch '3.x'

Author: ADmad

config/bootstrap.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -42,11 +44,11 @@
      * This function returns the same variable that was passed.
      * Only runs if debug mode is enabled.
      *
-     * @param Query $query Query to show SQL statements for.
+     * @param \Cake\Database\Query $query Query to show SQL statements for.
      * @param bool $showValues Renders the SQL statement with bound variables.
      * @param bool|null $showHtml If set to true, the method prints the debug
      *    data in a browser-friendly way.
-     * @return Query
+     * @return \Cake\Database\Query
      */
     function sql(Query $query, $showValues = true, $showHtml = null)
     {
@@ -61,7 +63,7 @@ function sql(Query $query, $showValues = true, $showHtml = null)
      * Only runs if debug mode is enabled.
      * It will otherwise just continue code execution and ignore this function.
      *
-     * @param Query $query Query to show SQL statements for.
+     * @param \Cake\Database\Query $query Query to show SQL statements for.
      * @param bool $showValues Renders the SQL statement with bound variables.
      * @param bool|null $showHtml If set to true, the method prints the debug
      *    data in a browser-friendly way.

src/Model/Table/RequestsTable.php

@@ -76,6 +76,16 @@ public function findRecent(Query $query, array $options)
             ->limit(10);
     }
 
+    /**
+     * Check if garbage collection should be run
+     *
+     * @return bool
+     */
+    protected function shouldGc()
+    {
+        return time() % 100 === 0;
+    }
+
     /**
      * Garbage collect old request data.
      *
@@ -87,13 +97,16 @@ public function findRecent(Query $query, array $options)
      */
     public function gc()
     {
-        if (time() % 100 !== 0) {
+        if (!$this->shouldGc()) {
             return;
         }
         $noPurge = $this->find()
             ->select(['id'])
+            ->enableHydration(false)
             ->order(['requested_at' => 'desc'])
-            ->limit(Configure::read('DebugKit.requestCount') ?: 20);
+            ->limit(Configure::read('DebugKit.requestCount') ?: 20)
+            ->extract('id')
+            ->toArray();
 
         $query = $this->Panels->query()
             ->delete()

tests/TestCase/Model/Table/RequestTableTest.php

@@ -15,6 +15,7 @@
  */
 namespace DebugKit\Test\TestCase\Model\Table;
 
+use Cake\Core\Configure;
 use Cake\Database\Driver\Sqlite;
 use Cake\Datasource\ConnectionManager;
 use Cake\ORM\TableRegistry;
@@ -73,4 +74,35 @@ public function testFindRecent()
         $this->assertSame(10, $query->clause('limit'));
         $this->assertNotEmpty($query->clause('order'));
     }
+
+    /**
+     * Test the garbage collect.
+     *
+     * @return void
+     */
+    public function testGc()
+    {
+        /** @var \PHPUnit\Framework\MockObject\MockObject&\DebugKit\Model\Table\RequestsTable $requestsTableMock */
+        $requestsTableMock = $this->getMockForModel('DebugKit.Requests', ['shouldGc']);
+        $requestsTableMock->method('shouldGc')
+            ->will($this->returnValue(true));
+
+        $data = array_fill(0, 10, [
+            'url' => '/tasks/add',
+            'content_type' => 'text/html',
+            'status_code' => 200,
+            'requested_at' => '2014-08-21 7:41:12',
+        ]);
+        $requests = $requestsTableMock->newEntities($data);
+        $this->assertNotFalse($requestsTableMock->saveMany($requests));
+
+        $count = $requestsTableMock->find()->count();
+        $this->assertGreaterThanOrEqual(10, $count);
+
+        Configure::write('DebugKit.requestCount', 5);
+        $requestsTableMock->gc();
+
+        $count = $requestsTableMock->find()->count();
+        $this->assertSame(5, $count);
+    }
 }