Fix shell code

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Mar 2, 2021 · 4cdd2a9 · 4cdd2a9
1 parent 51c5e19
commit 4cdd2a9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 6 deletions.
diff --git a/src/Controller/StatsController.php b/src/Controller/StatsController.php
@@ -53,7 +53,7 @@ public function stats(): void
             $filter_string = 'all_time';
         }
         $entriesWithCount = [];
-        //Cache::clear(false);
+        //Cache::clear();
         foreach (TableRegistry::getTableLocator()->get('Incidents')->summarizableFields as $field) {
             $entriesWithCount = Cache::read($field . '_' . $filter_string);
             if ($entriesWithCount === false) {

diff --git a/src/Shell/SyncGithubIssueStatesShell.php b/src/Shell/SyncGithubIssueStatesShell.php
@@ -20,8 +20,10 @@
 
 use Cake\Console\Shell;
 use Cake\Core\Configure;
+use Cake\Core\HttpApplicationInterface;
+use Cake\Http\Server;
+use Cake\Http\ServerRequest;
 use Cake\Log\Log;
-use Cake\Routing\Router;
 use const PHP_SAPI;
 use function date;
 
@@ -30,6 +32,23 @@
  */
 class SyncGithubIssueStatesShell extends Shell
 {
+    /**
+     * The application that is being dispatched.
+     *
+     * @var HttpApplicationInterface
+     */
+    protected $app;
+
+    /**
+     * Constructor
+     *
+     * @param HttpApplicationInterface $app The test case to run.
+     */
+    public function __construct(HttpApplicationInterface $app)
+    {
+        $this->app = $app;
+    }
+
     public function main(): void
     {
         Log::debug(
@@ -45,8 +64,16 @@ public function main(): void
             exit;
         }
 
-        //TODO: check if works
-        Router::connect('github/sync_issue_status');
+        $request = new ServerRequest([
+            'url' => '/github/sync_issue_status',
+            'params' => [
+                'controller' => 'Github',
+                'action' => 'sync_issue_status',
+            ],
+        ]);
+
+        $server = new Server($this->app);
+        $server->run($request);
 
         Log::debug(
             'FINISHED: Job "'

diff --git a/tests/TestCase/Shell/StatsShellTest.php b/tests/TestCase/Shell/StatsShellTest.php
@@ -79,7 +79,7 @@ public function testMain(): void
         $this->Stats->initialize();
 
         // Clear the existing cache
-        Cache::clear(false);
+        Cache::clear();
 
         // Run the shell command
         $this->Stats->main();

diff --git a/tests/TestCase/Shell/SyncGithubIssueStatesShellTest.php b/tests/TestCase/Shell/SyncGithubIssueStatesShellTest.php
@@ -4,6 +4,7 @@
 
 use App\Shell\SyncGithubIssueStatesShell;
 use Cake\Console\ConsoleIo;
+use Cake\Http\BaseApplication;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use phpmock\phpunit\PHPMock;
@@ -48,7 +49,12 @@ public function setUp(): void
     {
         parent::setUp();
         $this->io = $this->getMockBuilder('Cake\Console\ConsoleIo')->getMock();
-        $this->SyncGithubIssueStates = new SyncGithubIssueStatesShell($this->io);
+        /** @var BaseApplication $app */
+        $app = $this->getMockForAbstractClass(
+            BaseApplication::class,
+            [__DIR__ . '/../../../config']
+        );
+        $this->SyncGithubIssueStates = new SyncGithubIssueStatesShell($app);
         $this->Reports = TableRegistry::getTableLocator()->get('Reports');
     }