Upgrade to CakePHP 4

README.md

@@ -1,9 +1,11 @@
-# Froala WYSIWYG Editor Plugin for CakePHP 3
+# Froala WYSIWYG Editor Plugin for CakePHP 4
 
 [![Packagist](https://img.shields.io/packagist/v/froala/wysiwyg-cake.svg)](https://packagist.org/packages/froala/wysiwyg-cake)
 [![Packagist](https://img.shields.io/packagist/dt/froala/wysiwyg-cake.svg)](https://packagist.org/packages/froala/wysiwyg-cake)
 
-> CakePHP Plugin for Froala Javascript WYSIWYG Text Editor. For CakePHP >=3.0.
+> CakePHP Plugin for Froala Javascript WYSIWYG Text Editor. For CakePHP >=4.0.
+
+> See [froala/wysiwyg-cake](https://github.com/froala/wysiwyg-cake) for CakePHP version 3.
 
 > See [froala/wysiwyg-cake2](https://github.com/froala/wysiwyg-cake2) for CakePHP version 2.
 

composer.json

@@ -4,7 +4,7 @@
     "type": "cakephp-plugin",
     "keywords": [
         "froala",
-        "froala cake php 3",
+        "froala cake php 4",
         "html",
         "text",
         "editor",
@@ -24,8 +24,8 @@
       }
     ],
     "require": {
-        "php": ">=5.5.9",
-        "cakephp/cakephp": ">=3.3.2 <4.0.0",
+        "php": ">=7.1",
+        "cakephp/cakephp": "^4.0.0",
         "fortawesome/font-awesome": ">=4.4.0"
     },
     "require-dev": {

config/routes.php

@@ -1,9 +1,9 @@
 <?php
 use Cake\Routing\RouteBuilder;
-use Cake\Routing\Router;
 use Cake\Routing\Route\DashedRoute;
 
-Router::plugin(
+/** @var \Cake\Routing\RouteBuilder $routes */
+$routes->plugin(
     'Froala',
     ['path' => '/froala'],
     function (RouteBuilder $routes) {

phpunit.xml.dist

@@ -1,43 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    colors="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    syntaxCheck="false"
-    bootstrap="./tests/bootstrap.php"
-    >
-    <php>
-        <ini name="memory_limit" value="-1"/>
-        <ini name="apc.enable_cli" value="1"/>
-    </php>
-
-    <!-- Add any additional test suites you want to run here -->
-    <testsuites>
-        <testsuite name="Froala Test Suite">
-            <directory>./tests/TestCase</directory>
-        </testsuite>
-    </testsuites>
-
-    <!-- Setup a listener for fixtures -->
-    <listeners>
-        <listener
-        class="\Cake\TestSuite\Fixture\FixtureInjector"
-        file="./vendor/cakephp/cakephp/src/TestSuite/Fixture/FixtureInjector.php">
-            <arguments>
-                <object class="\Cake\TestSuite\Fixture\FixtureManager" />
-            </arguments>
-        </listener>
-    </listeners>
-
-    <!-- Prevent coverage reports from looking in tests and vendors -->
-    <filter>
-        <blacklist>
-            <directory suffix=".php">./vendor/</directory>
-            <directory suffix=".ctp">./vendor/</directory>
-
-            <directory suffix=".php">./tests/</directory>
-            <directory suffix=".ctp">./tests/</directory>
-        </blacklist>
-    </filter>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="memory_limit" value="-1"/>
+    <ini name="apc.enable_cli" value="1"/>
+  </php>
+  <!-- Add any additional test suites you want to run here -->
+  <testsuites>
+    <testsuite name="Froala Test Suite">
+      <directory>tests/TestCase/</directory>
+    </testsuite>
+  </testsuites>
+  <extensions>
+    <extension class="\Cake\TestSuite\Fixture\PHPUnitExtension"/>
+  </extensions>
 </phpunit>

src/View/Helper/FroalaHelper.php

@@ -19,7 +19,7 @@ class FroalaHelper extends Helper
 	public $helpers = array('Html');
 
 
-	public function initialize(array $config) {}
+	public function initialize(array $config): void {}
 
 	/**
 	 * Adds a new editor to the script block on the page

tests/TestCase/View/Helper/FroalaHelperTest.php

@@ -23,7 +23,7 @@ class FroalaHelperTest extends TestCase
      *
      * @return void
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $view = new View();
@@ -35,7 +35,7 @@ public function setUp()
      *
      * @return void
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($this->Froala);
 

tests/bootstrap.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * Test suite bootstrap for Froala.
  *
@@ -21,4 +23,18 @@
 unset($findRoot);
 
 chdir($root);
-require $root . '/config/bootstrap.php';
+
+require_once $root . '/vendor/autoload.php';
+
+/**
+ * Define fallback values for required constants and configuration.
+ * To customize constants and configuration remove this require
+ * and define the data required by your plugin here.
+ */
+require_once $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
+
+if (file_exists($root . '/config/bootstrap.php')) {
+    require $root . '/config/bootstrap.php';
+
+    return;
+}