Upgrade version CakePHP 4.x

.gitignore

@@ -0,0 +1,10 @@
+/.buildpath
+/.project
+/.idea
+/.settings/
+/vendor/
+/composer.lock
+/nbproject/
+/phpunit.xml
+/tmp
+/.phpunit.result.cache

composer.json

@@ -12,9 +12,12 @@
         }
     ],
     "require": {
-        "cakephp/cakephp": "~3.0",
+        "cakephp/cakephp": "^4.0",
         "tijsverkoyen/css-to-inline-styles": "^1.5"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^8"
+    },
     "autoload": {
         "psr-4": {
             "InlineCss\\": "src"

readme.md

@@ -6,14 +6,14 @@ This plugin provides a CakePHP helper that uses [CssToInlineStyles](https://gith
 
 ## Requirements
 
-* CakePHP 3.x
+* CakePHP 4.x
 
 ## Installation
 
 This plugin should be installed using Composer:-
 
 ```
-composer require drmonkeyninja/cakephp-inline-css:3.0.*
+composer require drmonkeyninja/cakephp-inline-css:4.0.*
 ```
 
 Then add the following line to your bootstrap.php to load the plugin.

src/View/Helper/InlineCssHelper.php

@@ -10,12 +10,14 @@ class InlineCssHelper extends Helper
     /**
      * After layout logic.
      *
-     * @param \Cake\Event\Event $event Event
-     * @param string $layoutFile Layout filename
+     * @param  \Cake\Event\Event  $event  Event
+     * @param  string  $layoutFile  Layout filename
+     *
+     * @throws \TijsVerkoyen\CssToInlineStyles\Exception
      */
     public function afterLayout(\Cake\Event\Event $event, $layoutFile)
     {
-        $content = $this->_View->Blocks->get('content');
+        $content = $this->_View->fetch('content');
 
         if (!isset($this->InlineCss)) {
             $this->InlineCss = new CssToInlineStyles();
@@ -26,7 +28,7 @@ public function afterLayout(\Cake\Event\Event $event, $layoutFile)
         $this->InlineCss->setUseInlineStylesBlock(true);
         $content = $this->InlineCss->convert();
 
-        $this->_View->Blocks->set('content', $content);
+        $this->_View->assign('content', $content);
 
         return;
     }

tests/TestCase/View/Helper/InlineCssHelperTest.php

@@ -1,17 +1,17 @@
 <?php
+
 namespace InlineCss\TestCase\View\Helper;
 
-use Cake\Network\Request;
+use Cake\Http\ServerRequest as Request;
 use Cake\TestSuite\TestCase;
 use Cake\View\View;
 use InlineCss\View\Helper\InlineCssHelper;
 
 class InlineCssHelperTest extends TestCase
 {
-
     public $InlineCss = null;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -21,12 +21,12 @@ public function setUp()
 
     public function testAfterLayout()
     {
-        $this->View->Blocks->set('content', '<style type="text/css">a{color:red}</style><p><a href="#">Test</a></p>');
+        $this->View->assign('content', '<style type="text/css">a{color:red}</style><p><a href="#">Test</a></p>');
 
         $this->InlineCss->afterLayout(new \Cake\Event\Event(''), null);
 
         $expected = '<p><a href="#" style="color: red;">Test</a></p>';
-        $this->assertContains($expected, $this->View->Blocks->get('content'));
+        $this->assertStringContainsString($expected, $this->View->fetch('content'));
     }
 
 }

tests/bootstrap.php

@@ -1,6 +1,11 @@
 <?php
-require dirname(__DIR__) . '/vendor/cakephp/cakephp/src/basics.php';
-require dirname(__DIR__) . '/vendor/autoload.php';
+
+use Cake\Cache\Cache;
+use Cake\Core\Plugin;
+use Cake\Datasource\ConnectionManager;
+
+require dirname(__DIR__).'/vendor/cakephp/cakephp/src/basics.php';
+require dirname(__DIR__).'/vendor/autoload.php';
 if (!defined('DS')) {
     define('DS', DIRECTORY_SEPARATOR);
 }
@@ -13,59 +18,55 @@
 }
 define('ROOT', dirname(__DIR__));
 define('APP_DIR', 'src');
-define('APP', rtrim(sys_get_temp_dir(), DS) . DS . APP_DIR . DS);
+define('APP', rtrim(sys_get_temp_dir(), DS).DS.APP_DIR.DS);
 if (!is_dir(APP)) {
     mkdir(APP, 0770, true);
 }
-define('TMP', ROOT . DS . 'tmp' . DS);
+define('TMP', ROOT.DS.'tmp'.DS);
 if (!is_dir(TMP)) {
     mkdir(TMP, 0770, true);
 }
-define('CONFIG', dirname(__FILE__) . DS . 'config' . DS);
-define('LOGS', TMP . 'logs' . DS);
-define('CACHE', TMP . 'cache' . DS);
-define('CAKE_CORE_INCLUDE_PATH', ROOT . '/vendor/cakephp/cakephp');
-define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-define('CAKE', CORE_PATH . 'src' . DS);
+define('CONFIG', dirname(__FILE__).DS.'config'.DS);
+define('LOGS', TMP.'logs'.DS);
+define('CACHE', TMP.'cache'.DS);
+define('CAKE_CORE_INCLUDE_PATH', ROOT.'/vendor/cakephp/cakephp');
+define('CORE_PATH', CAKE_CORE_INCLUDE_PATH.DS);
+define('CAKE', CORE_PATH.'src'.DS);
 Cake\Core\Configure::write('App', [
-    'namespace' => 'App'
+    'namespace' => 'App',
 ]);
 Cake\Core\Configure::write('debug', true);
 $cache = [
     'default' => [
         'engine' => 'File',
-        'path' => CACHE
+        'path' => CACHE,
     ],
     '_cake_core_' => [
         'className' => 'File',
         'prefix' => 'crud_myapp_cake_core_',
-        'path' => CACHE . 'persistent/',
+        'path' => CACHE.'persistent/',
         'serialize' => true,
-        'duration' => '+10 seconds'
+        'duration' => '+10 seconds',
     ],
     '_cake_model_' => [
         'className' => 'File',
         'prefix' => 'crud_my_app_cake_model_',
-        'path' => CACHE . 'models/',
+        'path' => CACHE.'models/',
         'serialize' => 'File',
-        'duration' => '+10 seconds'
-    ]
+        'duration' => '+10 seconds',
+    ],
 ];
-Cake\Cache\Cache::config($cache);
-Cake\Core\Plugin::load('SocialShare', ['path' => ROOT . DS]);
+Cache::setConfig($cache);
 // Ensure default test connection is defined
 if (!getenv('db_class')) {
     putenv('db_class=Cake\Database\Driver\Sqlite');
     putenv('db_dsn=sqlite::memory:');
 }
-Cake\Datasource\ConnectionManager::config('test', [
+ConnectionManager::setConfig('test', [
     'className' => 'Cake\Database\Connection',
-    'driver' => getenv('db_class'),
-    'dsn' => getenv('db_dsn'),
-    'database' => getenv('db_database'),
-    'username' => getenv('db_username'),
-    'password' => getenv('db_password'),
-    'timezone' => 'UTC',
-    'quoteIdentifiers' => true,
+    'driver' => 'Cake\Database\Driver\Sqlite',
+    'database' => TMP.'test.sqlite',
+    'encoding' => 'utf8',
     'cacheMetadata' => true,
+    'quoteIdentifiers' => false,
 ]);