jenkins-bot has submitted this change and it was merged. Change subject: lessphp: Update to upstream 6e8e724fc7 ......................................................................
lessphp: Update to upstream 6e8e724fc7 Summary of changes: - lessphp throws errors when referencing undeclared variables and mixins. - lessc::addParsedFile is now public. See <https://github.com/leafo/lessphp/compare/785ad53840...6e8e724fc7>. Change-Id: Idffe6946f4029659e677f9dfb62566096cc8d5b5 --- M includes/libs/lessc.inc.php 1 file changed, 7 insertions(+), 10 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/libs/lessc.inc.php b/includes/libs/lessc.inc.php index 6db21be..7b1c27b 100644 --- a/includes/libs/lessc.inc.php +++ b/includes/libs/lessc.inc.php @@ -1,7 +1,7 @@ <?php /** - * lessphp v0.4.0@785ad53840 + * lessphp v0.4.0@6e8e724fc7 * http://leafo.net/lessphp * * LESS css compiler, adapted from http://lesscss.org @@ -89,8 +89,6 @@ // so we know how to create error messages protected $sourceParser = null; protected $sourceLoc = null; - - static public $defaultValue = array("keyword", ""); static protected $nextImportId = 0; // uniquely identify imports @@ -712,8 +710,7 @@ $mixins = $this->findBlocks($block, $path, $orderedArgs, $keywordArgs); if ($mixins === null) { - // fwrite(STDERR,"failed to find block: ".implode(" > ", $path)."\n"); - break; // throw error here?? + $this->throwError("{$prop[1][0]} is undefined"); } foreach ($mixins as $mixin) { @@ -987,7 +984,7 @@ if (isset($items[0])) { return $this->lib_e($items[0]); } - return self::$defaultValue; + $this->throwError("unrecognised input"); case "string": $arg[1] = ""; return $arg; @@ -1415,7 +1412,7 @@ } $seen[$key] = true; - $out = $this->reduce($this->get($key, self::$defaultValue)); + $out = $this->reduce($this->get($key)); $seen[$key] = false; return $out; case "list": @@ -1774,7 +1771,7 @@ // get the highest occurrence entry for a name - protected function get($name, $default=null) { + protected function get($name) { $current = $this->env; $isArguments = $name == $this->vPrefix . 'arguments'; @@ -1791,7 +1788,7 @@ } } - return $default; + $this->throwError("variable $name is undefined"); } // inject array of unparsed strings into environment as variables @@ -2027,7 +2024,7 @@ return $this->allParsedFiles; } - protected function addParsedFile($file) { + public function addParsedFile($file) { $this->allParsedFiles[realpath($file)] = filemtime($file); } -- To view, visit https://gerrit.wikimedia.org/r/86246 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idffe6946f4029659e677f9dfb62566096cc8d5b5 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: PleaseStand <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
