Add addHelper() autocomplete for Cake4.

Author: dereuromark

README.md

@@ -12,7 +12,7 @@ IdeHelper plugin for CakePHP applications.
 
 > Boost your productivity. Avoid mistakes.
 
-This branch is for use with **CakePHP 4.2+**. For details see [version map](https://github.com/dereuromark/cakephp-ide-helper/wiki#cakephp-version-map).
+This branch is for use with **CakePHP 4.4+**. For details see [version map](https://github.com/dereuromark/cakephp-ide-helper/wiki#cakephp-version-map).
 
 ## Features
 

composer.json

@@ -31,7 +31,7 @@
 	},
 	"require": {
 		"php": ">=7.4",
-		"cakephp/cakephp": "^4.2.0",
+		"cakephp/cakephp": "^4.4.0",
 		"cakephp/bake": "^2.1.0",
 		"sebastian/diff": "^4.0.3||^5.0",
 		"phpstan/phpdoc-parser": "^1.7.0",

src/Generator/Task/HelperTask.php

@@ -14,13 +14,16 @@
 
 class HelperTask implements TaskInterface {
 
-	public const CLASS_VIEW = View::class;
-	public const CLASS_VIEW_BUILDER = ViewBuilder::class;
+	protected const CLASS_VIEW = View::class;
+	protected const CLASS_VIEW_BUILDER = ViewBuilder::class;
 
 	/**
-	 * @var string
+	 * @var array<string>
 	 */
-	protected const METHOD_VIEW = '\\' . self::CLASS_VIEW . '::loadHelper(0)';
+	protected array $overrideMethods = [
+		'\\' . self::CLASS_VIEW . '::loadHelper(0)',
+		'\\' . self::CLASS_VIEW . '::addHelper(0)',
+	];
 
 	/**
 	 * @var string
@@ -41,8 +44,10 @@ public function collect(): array {
 
 		$result = [];
 
-		$directive = new Override(static::METHOD_VIEW, $map);
-		$result[$directive->key()] = $directive;
+		foreach ($this->overrideMethods as $method) {
+			$directive = new Override($method, $map);
+			$result[$directive->key()] = $directive;
+		}
 
 		$list = [];
 		foreach ($helpers as $name => $className) {

tests/TestCase/Generator/PhpstormGeneratorTest.php

@@ -55,9 +55,6 @@ public function testCollect() {
 		file_put_contents(TMP . '.meta.php', $result);
 
 		$file = Plugin::path('IdeHelper') . 'tests' . DS . 'test_files' . DS . 'meta' . DS . 'phpstorm' . DS . '.meta.php';
-		if (version_compare(Configure::version(), '4.4.0') > 0) {
-			$file = Plugin::path('IdeHelper') . 'tests' . DS . 'test_files' . DS . 'meta' . DS . 'phpstorm' . DS . '.meta-44.php';
-		}
 		$expected = file_get_contents($file);
 
 		$this->assertTextEquals($expected, $result);

tests/TestCase/Generator/Task/HelperTaskTest.php

@@ -27,12 +27,16 @@ protected function setUp(): void {
 	public function testCollect() {
 		$result = $this->task->collect();
 
-		$this->assertCount(2, $result);
+		$this->assertCount(3, $result);
 
 		/** @var \IdeHelper\Generator\Directive\Override $directive */
 		$directive = array_shift($result);
 		$this->assertSame('\Cake\View\View::loadHelper(0)', $directive->toArray()['method']);
 
+		/** @var \IdeHelper\Generator\Directive\Override $directive */
+		$directive = array_shift($result);
+		$this->assertSame('\Cake\View\View::addHelper(0)', $directive->toArray()['method']);
+
 		$map = $directive->toArray()['map'];
 
 		$expected = '\Cake\View\Helper\FormHelper::class';