From 28c8e545a7884869d51ad5fa8d44c190de71ed1f Mon Sep 17 00:00:00 2001 From: Evan Lovely Date: Thu, 2 Nov 2017 09:17:43 -0700 Subject: [PATCH] Cleanup config setting readability. No functional changes to code. --- src/PatternLab/Config.php | 100 ++++++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 20 deletions(-) diff --git a/src/PatternLab/Config.php b/src/PatternLab/Config.php index c090348f..0332cc21 100644 --- a/src/PatternLab/Config.php +++ b/src/PatternLab/Config.php @@ -107,7 +107,7 @@ protected static function getStyleguideKitPath($styleguideKitPath = "") { * @param {Boolean} whether we should print out the status of the config being loaded */ public static function init($baseDir = "", $verbose = true) { - + // make sure a base dir was supplied if (empty($baseDir)) { Console::writeError("need a base directory to initialize the config class..."); @@ -195,27 +195,87 @@ public static function init($baseDir = "", $verbose = true) { Console::writeError("a set of configuration options is required to use Pattern Lab..."); exit; } - - // set-up the various dirs - self::$options["configDir"] = self::$userConfigDir; - self::$options["configPath"] = self::$userConfigPath; - self::$options["coreDir"] = is_dir(self::$options["baseDir"]."_core") ? self::$options["baseDir"]."_core" : self::$options["baseDir"]."core"; - self::$options["exportDir"] = isset(self::$options["exportDir"]) ? self::$options["baseDir"].self::cleanDir(self::$options["exportDir"]) : self::$options["baseDir"]."exports"; - self::$options["publicDir"] = isset(self::$options["publicDir"]) ? self::$options["baseDir"].self::cleanDir(self::$options["publicDir"]) : self::$options["baseDir"]."public"; - self::$options["scriptsDir"] = isset(self::$options["scriptsDir"]) ? self::$options["baseDir"].self::cleanDir(self::$options["scriptsDir"]) : self::$options["baseDir"]."scripts"; - self::$options["sourceDir"] = isset(self::$options["sourceDir"]) ? self::$options["baseDir"].self::cleanDir(self::$options["sourceDir"]) : self::$options["baseDir"]."source"; - self::$options["componentDir"] = isset(self::$options["componentDir"]) ? self::$options["publicDir"].DIRECTORY_SEPARATOR.self::cleanDir(self::$options["componentDir"]) : self::$options["publicDir"].DIRECTORY_SEPARATOR."patternlab-components"; - self::$options["dataDir"] = isset(self::$options["dataDir"]) ? self::$options["sourceDir"].DIRECTORY_SEPARATOR.self::cleanDir(self::$options["dataDir"]) : self::$options["sourceDir"].DIRECTORY_SEPARATOR."_data"; - self::$options["patternExportDir"] = isset(self::$options["patternExportDir"]) ? self::$options["exportDir"].DIRECTORY_SEPARATOR.self::cleanDir(self::$options["patternExportDir"]) : self::$options["exportDir"].DIRECTORY_SEPARATOR."patterns"; - self::$options["patternPublicDir"] = isset(self::$options["patternPublicDir"]) ? self::$options["publicDir"].DIRECTORY_SEPARATOR.self::cleanDir(self::$options["patternPublicDir"]) : self::$options["publicDir"].DIRECTORY_SEPARATOR."patterns"; - self::$options["patternSourceDir"] = isset(self::$options["patternSourceDir"]) ? self::$options["sourceDir"].DIRECTORY_SEPARATOR.self::cleanDir(self::$options["patternSourceDir"]) : self::$options["sourceDir"].DIRECTORY_SEPARATOR."_patterns"; - self::$options["metaDir"] = isset(self::$options["metaDir"]) ? self::$options["sourceDir"].DIRECTORY_SEPARATOR.self::cleanDir(self::$options["metaDir"]) : self::$options["sourceDir"].DIRECTORY_SEPARATOR."_meta/"; - self::$options["annotationsDir"] = isset(self::$options["annotationsDir"]) ? self::$options["sourceDir"].DIRECTORY_SEPARATOR.self::cleanDir(self::$options["annotationsDir"]) : self::$options["sourceDir"].DIRECTORY_SEPARATOR."_annotations/"; + + // set-up the various dirs + self::$options["configDir"] = self::$userConfigDir; + + self::$options["configPath"] = self::$userConfigPath; + + self::$options["coreDir"] = + is_dir(self::$options["baseDir"] . "_core") + ? self::$options["baseDir"] . "_core" + : self::$options["baseDir"] . "core"; + + self::$options["exportDir"] = + isset(self::$options["exportDir"]) + ? self::$options["baseDir"] . self::cleanDir(self::$options["exportDir"]) + : self::$options["baseDir"] . "exports"; + + self::$options["publicDir"] = + isset(self::$options["publicDir"]) + ? self::$options["baseDir"] . self::cleanDir(self::$options["publicDir"]) + : self::$options["baseDir"] . "public"; + + self::$options["scriptsDir"] = + isset(self::$options["scriptsDir"]) + ? self::$options["baseDir"] . self::cleanDir(self::$options["scriptsDir"]) + : self::$options["baseDir"] . "scripts"; + + self::$options["sourceDir"] = + isset(self::$options["sourceDir"]) + ? self::$options["baseDir"] . self::cleanDir(self::$options["sourceDir"]) + : self::$options["baseDir"] . "source"; + + self::$options["componentDir"] = + isset(self::$options["componentDir"]) + ? self::$options["publicDir"] . DIRECTORY_SEPARATOR . self::cleanDir(self::$options["componentDir"]) + : self::$options["publicDir"] . DIRECTORY_SEPARATOR . "patternlab-components"; + + self::$options["dataDir"] = + isset(self::$options["dataDir"]) + ? self::$options["sourceDir"] . DIRECTORY_SEPARATOR . self::cleanDir(self::$options["dataDir"]) + : self::$options["sourceDir"] . DIRECTORY_SEPARATOR . "_data"; + + self::$options["patternExportDir"] = + isset(self::$options["patternExportDir"]) + ? self::$options["exportDir"] . DIRECTORY_SEPARATOR . self::cleanDir(self::$options["patternExportDir"]) + : self::$options["exportDir"] . DIRECTORY_SEPARATOR . "patterns"; + + self::$options["patternPublicDir"] = + isset(self::$options["patternPublicDir"]) + ? self::$options["publicDir"] . DIRECTORY_SEPARATOR . self::cleanDir(self::$options["patternPublicDir"]) + : self::$options["publicDir"] . DIRECTORY_SEPARATOR . "patterns"; + + self::$options["patternSourceDir"] = + isset(self::$options["patternSourceDir"]) + ? self::$options["sourceDir"] . DIRECTORY_SEPARATOR . self::cleanDir(self::$options["patternSourceDir"]) + : self::$options["sourceDir"] . DIRECTORY_SEPARATOR . "_patterns"; + + self::$options["metaDir"] = + isset(self::$options["metaDir"]) + ? self::$options["sourceDir"] . DIRECTORY_SEPARATOR . self::cleanDir(self::$options["metaDir"]) + : self::$options["sourceDir"] . DIRECTORY_SEPARATOR . "_meta/"; + + self::$options["annotationsDir"] = + isset(self::$options["annotationsDir"]) + ? self::$options["sourceDir"] . DIRECTORY_SEPARATOR . self::cleanDir(self::$options["annotationsDir"]) + : self::$options["sourceDir"] . DIRECTORY_SEPARATOR . "_annotations/"; // set-up outputFileSuffixes - self::$options["outputFileSuffixes"]["rendered"] = isset(self::$options["outputFileSuffixes"]["rendered"]) ? self::$options["outputFileSuffixes"]["rendered"] : ''; - self::$options["outputFileSuffixes"]["rawTemplate"] = isset(self::$options["outputFileSuffixes"]["rawTemplate"]) ? self::$options["outputFileSuffixes"]["rawTemplate"] : ''; - self::$options["outputFileSuffixes"]["markupOnly"] = isset(self::$options["outputFileSuffixes"]["markupOnly"]) ? self::$options["outputFileSuffixes"]["markupOnly"] : '.markup-only'; + self::$options["outputFileSuffixes"]["rendered"] = + isset(self::$options["outputFileSuffixes"]["rendered"]) + ? self::$options["outputFileSuffixes"]["rendered"] + : ''; + + self::$options["outputFileSuffixes"]["rawTemplate"] = + isset(self::$options["outputFileSuffixes"]["rawTemplate"]) + ? self::$options["outputFileSuffixes"]["rawTemplate"] + : ''; + + self::$options["outputFileSuffixes"]["markupOnly"] = + isset(self::$options["outputFileSuffixes"]["markupOnly"]) + ? self::$options["outputFileSuffixes"]["markupOnly"] + : '.markup-only'; // handle a pre-2.1.0 styleguideKitPath before saving it if (isset(self::$options["styleguideKitPath"])) {