Merge branch 'feature/md-desc-var-fix' of https://github.com/EvanLovely/patternlab-php-core into feature-installupdate

Author: dmolsen

src/PatternLab/Fetch.php

@@ -203,7 +203,7 @@ protected function mirrorDist($sourceDir, $tempDirDist) {
 		// mirror dist to source
 		Console::writeInfo("installing the starterkit files...");
 		$fs = new Filesystem();
-		$fs->mirror($tempDirDist, $sourceDir, null);
+		$fs->mirror($tempDirDist, $sourceDir, null, $fsOptions);
 		Console::writeInfo("starterkit files have been installed...");
 
 	}

src/PatternLab/PatternData/Exporters/PatternPartialsExporter.php

@@ -42,7 +42,7 @@ public function run($type = "", $subtype = "") {
 		$store = PatternData::get();
 		foreach ($store as $patternStoreKey => $patternStoreData) {
 
-			if (($patternStoreData["category"] == "pattern") && (!$patternStoreData["hidden"]) && (!$patternStoreData["noviewall"]) && ($patternStoreData["depth"] == 2) && (!in_array($patternStoreData["type"],$styleGuideExcludes))) {
+			if (($patternStoreData["category"] == "pattern") && (!$patternStoreData["hidden"]) && (!$patternStoreData["noviewall"]) && ($patternStoreData["depth"] > 1) && (!in_array($patternStoreData["type"],$styleGuideExcludes))) {
 
 				if ((($patternStoreData["type"] == $type) && empty($subtype)) || (empty($type) && empty($subtype)) || (($patternStoreData["type"] == $type) && ($patternStoreData["subtype"] == $subtype))) {
 

src/PatternLab/PatternData/Helpers/LineageHelper.php

@@ -61,7 +61,7 @@ public function run() {
 
 							if (strpos($lineage, '/') === false) {
 								$fileName = $patternStoreData["pathName"].".".$patternExtension;
-								Console::writeWarning("you may have a typo in ".$fileName.". {{> ".$lineage." }} is not a valid pattern...");
+								Console::writeWarning("you may have a typo in ".$fileName.". `".$lineage."` is not a valid pattern...");
 							}
 
 						}

src/PatternLab/PatternData/Rules/DocumentationRule.php

@@ -81,11 +81,14 @@ public function run($depth, $ext, $path, $pathName, $name) {
 			$patternStoreKey  = ($patternSubtypeDoc) ? $docPartial."-plsubtype" : $docPartial;
 
 			$patternStoreData = array("category"   => $category,
-									  "nameClean"  => $title,
 									  "desc"       => $markdown,
 									  "descExists" => true,
 									  "meta"       => $yaml,
 									  "full"       => $doc);
+
+			if (isset($title)) {
+				$patternStoreData["nameClean"] = $title;
+			}
 
 			// if the pattern data store already exists make sure this data overwrites it
 			$patternStoreData = (PatternData::checkOption($patternStoreKey)) ? array_replace_recursive(PatternData::getOption($patternStoreKey),$patternStoreData) : $patternStoreData;

src/PatternLab/PatternData/Rules/PatternInfoListItemsRule.php

@@ -26,7 +26,7 @@ public function __construct($options) {
 		parent::__construct($options);
 
 		$this->depthProp  = 3; // 3 means that depth won't be checked
-		$this->extProp    = "json||yaml";
+		$this->extProp    = "json||yaml||yml";
 		$this->isDirProp  = false;
 		$this->isFileProp = true;
 		$this->searchProp = ".listitems.";

src/PatternLab/PatternData/Rules/PatternInfoRule.php

@@ -26,7 +26,7 @@ public function __construct($options) {
 		parent::__construct($options);
 
 		$this->depthProp  = 3; // 3 means that depth won't be checked
-		$this->extProp    = "json||yaml";
+		$this->extProp    = "json||yaml||yml";
 		$this->isDirProp  = false;
 		$this->isFileProp = true;
 		$this->searchProp = "";

src/PatternLab/PatternData/Rules/PatternRule.php

@@ -94,7 +94,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 								  "extraOutput"      => array());
 
 		// add any subtype info if necessary
-		if ($depth == 2) {
+		if ($depth > 1) {
 			$patternStoreData["subtype"]     = $patternSubtype;
 			$patternStoreData["subtypeDash"] = $patternSubtypeDash;
 			$patternStoreData["breadcrumb"]  = $patternTypeClean." > ".$patternSubtypeClean;

src/PatternLab/PatternData/Rules/PseudoPatternRule.php

@@ -26,7 +26,7 @@ public function __construct($options) {
 		parent::__construct($options);
 
 		$this->depthProp  = 3; // 3 means that depth won't be checked
-		$this->extProp    = "json||yaml";
+		$this->extProp    = "json||yaml||yml";
 		$this->isDirProp  = false;
 		$this->isFileProp = true;
 		$this->searchProp = "~";
@@ -112,7 +112,7 @@ public function run($depth, $ext, $path, $pathName, $name) {
 									"pathOrigDash" => $patternPathOrigDash);
 
 		// add any subtype info if necessary
-		if ($depth == 2) {
+		if ($depth > 1) {
 			$patternStoreData["subtype"]     = $patternSubtype;
 			$patternStoreData["subtypeDash"] = $patternSubtypeDash;
 			$patternStoreData["breadcrumb"]  = $patternType." > ".$patternSubtype;