Add behavior parsing for table mixin annotations.

src/Annotator/EntityAnnotator.php

@@ -17,9 +17,6 @@ public function annotate($path) {
 		}
 
 		$content = file_get_contents($path);
-		if (preg_match('/\* @property .+ \$/', $content)) {
-			return null;
-		}
 
 		$helper = new DocBlockHelper(new View());
 		$schema = $this->getConfig('schema');
@@ -33,6 +30,12 @@ public function annotate($path) {
 			$annotations = array_merge($annotations, $helper->propertyHints($associationHintMap));
 		}
 
+		foreach ($annotations as $key => $annotation) {
+			if (preg_match('/' . preg_quote($annotation) . '/', $content)) {
+				unset($annotations[$key]);
+			}
+		}
+
 		return $this->_annotate($path, $content, $annotations);
 	}
 

src/Annotator/ModelAnnotator.php

@@ -57,8 +57,7 @@ protected function _table($path, $entityName, array $associations) {
 
 		$entity = $entityName;
 
-		//TODO
-		$behaviors = [];
+		$behaviors = $this->_parseLoadedBehaviors($content);
 
 		$namespace = $this->getConfig(static::CONFIG_NAMESPACE);
 		$annotations = [];
@@ -85,8 +84,17 @@ protected function _table($path, $entityName, array $associations) {
 		$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} patchEntity(\\Cake\\Datasource\\EntityInterface \$entity, array \$data, array \$options = [])";
 		$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity}[] patchEntities(\$entities, array \$data, array \$options = [])";
 		$annotations[] = "@method \\{$namespace}\\Model\\Entity\\{$entity} findOrCreate(\$search, callable \$callback = null, \$options = [])";
-		foreach ($behaviors as $behavior => $behaviorData) {
-			$annotations[] = "@mixin \\Cake\\ORM\\Behavior\\{$behavior}Behavior";
+
+		foreach ($behaviors as $behavior) {
+			$className = App::className($behavior, 'Model/Behavior', 'Behavior');
+			if (!$className) {
+				$className = App::className($behavior, 'ORM/Behavior', 'Behavior');
+			}
+			if (!$className) {
+				continue;
+			}
+
+			$annotations[] = "@mixin \\{$className}";
 		}
 
 		foreach ($annotations as $key => $annotation) {
@@ -126,4 +134,19 @@ protected function _entity($entityName, array $schema) {
 		return true;
 	}
 
+	/**
+	 * @param string $content
+	 * @return array
+	 */
+	protected function _parseLoadedBehaviors($content) {
+		preg_match_all('/\$this-\>addBehavior\(\'([a-z.]+)\'/i', $content, $matches);
+		if (empty($matches)) {
+			return [];
+		}
+
+		$behaviors = $matches[1];
+
+		return array_unique($behaviors);
+	}
+
 }

tests/TestCase/Annotator/ModelAnnotatorTest.php

@@ -114,7 +114,7 @@ public function testAnnotate() {
 
 		$output = (string)$this->out->output();
 
-		$this->assertTextContains('  * 7 annotations added', $output);
+		$this->assertTextContains('  * 9 annotations added', $output);
 	}
 
 	/**

tests/test_app/src/Model/Table/FooTable.php

@@ -4,4 +4,16 @@
 use Cake\ORM\Table;
 
 class FooTable extends Table {
+
+	/**
+	 * @param array $config
+	 * @return void
+	 */
+	public function initialize(array $config) {
+		parent::initialize($config);
+
+		$this->addBehavior('Tools.Confirmable');
+		$this->addBehavior('Timestamp');
+	}
+
 }

tests/test_files/Model/Table/FooTable.php

@@ -11,6 +11,21 @@
  * @method \App\Model\Entity\Foo patchEntity(\Cake\Datasource\EntityInterface $entity, array $data, array $options = [])
  * @method \App\Model\Entity\Foo[] patchEntities($entities, array $data, array $options = [])
  * @method \App\Model\Entity\Foo findOrCreate($search, callable $callback = null, $options = [])
+ *
+ * @mixin \Tools\Model\Behavior\ConfirmableBehavior
+ * @mixin \Cake\ORM\Behavior\TimestampBehavior
  */
 class FooTable extends Table {
+
+	/**
+	 * @param array $config
+	 * @return void
+	 */
+	public function initialize(array $config) {
+		parent::initialize($config);
+
+		$this->addBehavior('Tools.Confirmable');
+		$this->addBehavior('Timestamp');
+	}
+
 }