Merge pull request #211 from dereuromark/behavior-remove

Add behavior remove autocomplete.
dereuromark · Oct 2, 2020 · 5345205 · 5345205
2 parents 7d4936b + 55dab9c
commit 5345205
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 8 deletions.
diff --git a/docs/Generator.md b/docs/Generator.md
@@ -111,6 +111,7 @@ Note: Using Configure key `'IdeHelper.preemptive'` set to `true` you can be a bi
 The following is now auto-completed, for example:
 ```php
 $this->addBehavior('Tools.Slugged');
+$this->removeBehavior('Slugged'); // Note the alias without plugin prefix
 ```
 
 #### Components

diff --git a/src/Generator/Task/BehaviorTask.php b/src/Generator/Task/BehaviorTask.php
@@ -17,26 +17,41 @@ class BehaviorTask implements TaskInterface {
 	/**
 	 * @var int[]
 	 */
-	protected $aliases = [
+	protected $addAliases = [
 		'\\' . self::CLASS_TABLE . '::addBehavior()' => 0,
 	];
 
+	/**
+	 * @var int[]
+	 */
+	protected $removeAliases = [
+		'\\' . self::CLASS_TABLE . '::removeBehavior()' => 0,
+	];
+
 	/**
 	 * @return \IdeHelper\Generator\Directive\BaseDirective[]
 	 */
 	public function collect(): array {
-		$list = [];
-
+		$addList = $removeList = [];
 		$behaviors = $this->collectBehaviors();
 		foreach ($behaviors as $name => $className) {
-			$list[$name] = StringName::create($name);
+			$addList[$name] = StringName::create($name);
+			if (strpos($name, '.') !== false) {
+				[, $name] = pluginSplit($name);
+			}
+			$removeList[$name] = StringName::create($name);
 		}
 
-		ksort($list);
+		ksort($addList);
+		ksort($removeList);
 
 		$result = [];
-		foreach ($this->aliases as $alias => $position) {
-			$directive = new ExpectedArguments($alias, $position, $list);
+		foreach ($this->addAliases as $alias => $position) {
+			$directive = new ExpectedArguments($alias, $position, $addList);
+			$result[$directive->key()] = $directive;
+		}
+		foreach ($this->removeAliases as $alias => $position) {
+			$directive = new ExpectedArguments($alias, $position, $removeList);
 			$result[$directive->key()] = $directive;
 		}
 

diff --git a/tests/TestCase/Generator/Task/BehaviorTaskTest.php b/tests/TestCase/Generator/Task/BehaviorTaskTest.php
@@ -27,7 +27,7 @@ public function setUp(): void {
 	public function testCollect() {
 		$result = $this->task->collect();
 
-		$this->assertCount(1, $result);
+		$this->assertCount(2, $result);
 
 		/** @var \IdeHelper\Generator\Directive\Override $directive */
 		$directive = array_shift($result);
@@ -40,6 +40,18 @@ public function testCollect() {
 
 		$expected = '\'Shim.Nullable\'';
 		$this->assertSame($expected, (string)$list['Shim.Nullable']);
+
+		/** @var \IdeHelper\Generator\Directive\Override $directive */
+		$directive = array_shift($result);
+		$this->assertSame('\Cake\ORM\Table::removeBehavior()', $directive->toArray()['method']);
+
+		$list = $directive->toArray()['list'];
+
+		$expected = '\'Timestamp\'';
+		$this->assertSame($expected, (string)$list['Timestamp']);
+
+		$expected = '\'Nullable\'';
+		$this->assertSame($expected, (string)$list['Nullable']);
 	}
 
 }
diff --git a/tests/test_files/meta/phpstorm/.meta.php b/tests/test_files/meta/phpstorm/.meta.php
@@ -367,6 +367,17 @@
 		])
 	);
 
+	expectedArguments(
+		\Cake\ORM\Table::removeBehavior(),
+		0,
+		'CounterCache',
+		'My',
+		'Nullable',
+		'Timestamp',
+		'Translate',
+		'Tree'
+	);
+
 	override(
 		\Cake\ORM\TableRegistry::get(0),
 		map([