addressing if annotations are missing

Author: dmolsen

src/PatternLab/Annotations.php

@@ -55,6 +55,9 @@ public static function gather() {
 		if (!is_dir($annotationsDir)) {
 			Console::writeWarning("<path>".Console::getHumanReadablePath($annotationsDir)."</path><warning> doesn't exist so you won't have annotations...");
 			mkdir($annotationsDir);
+		} else {
+			
+			
 		}
 
 		// find the markdown-based annotations
@@ -90,6 +93,7 @@ public static function gather() {
 		}
 
 		// read in the old style annotations.js, modify the data and generate JSON array to merge
+		$data = array();
 		$oldStyleAnnotationsPath = $annotationsDir.DIRECTORY_SEPARATOR."annotations.js";
 		if (file_exists($oldStyleAnnotationsPath)) {
 			$text = trim(file_get_contents($oldStyleAnnotationsPath));
@@ -103,8 +107,10 @@ public static function gather() {
 			}
 		}
 
-		// merge in any data from the old file
-		self::$store["comments"] = array_merge(self::$store["comments"],$data["comments"]);
+		// merge in any data from the old file if the json decode was successful
+		if (is_array($data) && isset($data["comments"])) {
+			self::$store["comments"] = array_merge(self::$store["comments"],$data["comments"]);
+		}
 
 		$dispatcherInstance->dispatch("annotations.gatherEnd");