Cake 4.x (#43)

* Update composer.json

* Update composer.json

* Update composer.json

* Update RequestMetadata.php

* Update AuditLogBehavior.php

* Update composer.json

* Cake4 only

* Update .travis.yml

* Update ElasticMappingShell.php

* additional changes

* fix testsuite errors

* revert

Co-authored-by: Ali1 <ali.m.bakir@gmail.com>

.travis.yml

@@ -1,8 +1,9 @@
 language: php
 
 php:
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 sudo: true
 

composer.json

@@ -4,13 +4,13 @@
     "type": "cakephp-plugin",
     "license": "MIT",
     "require": {
-        "php": ">=7.0.0",
-        "cakephp/orm": "^3.0"
+        "php": ">=7.2",
+        "cakephp/orm": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
-        "cakephp/cakephp": "^3.6",
-        "cakephp/elastic-search": "^2.0-dev",
+        "phpunit/phpunit": "^8.0",
+        "cakephp/cakephp": "^4.0",
+        "cakephp/elastic-search": "dev-cake-4.x-updates",
         "friendsofcake/process-mq": "dev-master"
     },
     "suggest": {
@@ -29,4 +29,4 @@
             "Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
         }
     }
-}
+}

phpunit.xml.dist

@@ -3,7 +3,6 @@
     colors="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="./tests/bootstrap.php"
     >
     <php>

src/Meta/ApplicationMetadata.php

@@ -34,7 +34,7 @@ public function __construct($name, $data = [])
      *
      * @return array
      */
-    public function implementedEvents()
+    public function implementedEvents(): array
     {
         return ['AuditStash.beforeLog' => 'beforeLog'];
     }

src/Meta/RequestMetadata.php

@@ -44,7 +44,7 @@ public function __construct($request, $user = null)
      *
      * @return array
      */
-    public function implementedEvents()
+    public function implementedEvents(): array
     {
         return ['AuditStash.beforeLog' => 'beforeLog'];
     }

src/Model/Behavior/AuditLogBehavior.php

@@ -47,7 +47,7 @@ class AuditLogBehavior extends Behavior
      *
      * @return array
      */
-    public function implementedEvents()
+    public function implementedEvents(): array
     {
         return [
             'Model.beforeSave' => 'injectTracking',

src/Shell/ElasticMappingShell.php

@@ -2,6 +2,7 @@
 
 namespace AuditStash\Shell;
 
+use Cake\Console\ConsoleOptionParser;
 use Cake\Console\Shell;
 use Cake\Datasource\ConnectionManager;
 use Cake\Utility\Inflector;
@@ -16,7 +17,7 @@ class ElasticMappingShell extends Shell
     /**
      * {@inheritdoc}
      */
-    public function getOptionParser()
+    public function getOptionParser(): ConsoleOptionParser
     {
         return parent::getOptionParser()
             ->setDescription('Creates type mappings in elastic search for the tables you want tracked with audit logging')

tests/TestCase/Model/Behavior/AuditIntegrationTest.php

@@ -29,19 +29,19 @@ class AuditIntegrationTest extends TestCase
      * @var array
      */
     public $fixtures = [
-        'core.articles',
-        'core.comments',
-        'core.authors',
-        'core.tags',
-        'core.articles_tags',
+        'core.Articles',
+        'core.Comments',
+        'core.Authors',
+        'core.Tags',
+        'core.ArticlesTags',
     ];
 
     /**
      * tests setup.
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->table = $this->loadModel('Articles');
         $this->table->hasMany('Comments');

tests/TestCase/Model/Behavior/AuditLogBehaviorTest.php

@@ -12,7 +12,7 @@
 
 class AuditLogBehaviorTest extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->table = new Table(['table' => 'articles']);

tests/TestCase/Persister/ElasticSearchPersisterTest.php

@@ -20,10 +20,10 @@ class ElasticSearchPersisterTest extends TestCase
      * @var string
      */
     public $fixtures = [
-        'plugin.audit_stash.elastic_articles',
-        'plugin.audit_stash.elastic_audits',
-        'plugin.audit_stash.elastic_authors',
-        'plugin.audit_stash.elastic_tags',
+        'plugin.AuditStash.ElasticArticles',
+        'plugin.AuditStash.ElasticAudits',
+        'plugin.AuditStash.ElasticAuthors',
+        'plugin.AuditStash.ElasticTags',
     ];
 
     /**

tests/TestCase/Persister/TablePersisterTest.php

@@ -10,10 +10,11 @@
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
+use InvalidArgumentException;
 
 class AuditLogsTable extends Table
 {
-    public function initialize(array $config)
+    public function initialize(array $config): void
     {
         parent::initialize($config);
 
@@ -49,7 +50,7 @@ class TablePersisterTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -65,7 +66,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($this->TablePersister);
 
@@ -106,12 +107,10 @@ public function testSetTableAsObject()
         $this->assertSame($customTable, $this->TablePersister->getTable());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage The `$table` argument must be either a table alias, or an instance of `\Cake\ORM\Table`.
-     */
     public function testSetInvalidTable()
     {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('The `$table` argument must be either a table alias, or an instance of `\Cake\ORM\Table`.');
         $this->TablePersister->setTable(null);
     }