Changeset 115301 in spip-zone

Timestamp:

May 10, 2019, 8:03:27 AM (9 days ago)

Author:

cedric@…

Message:

Mise a jour de la lib ScssPHP en version 0.8.2+ depuis ​https://github.com/Cerdic/scssphp/tree/maint/leafo/master qui resoud encore un certain nombre de bugs du compilateur
C'est sans doute la derniere version qui tourne encore en PHP 5.4 car le prerequis vient de passer a PHP 5.6,
on va donc archiver la branche a suivre pour les utilisateurs de vieilles versions SPIP et passer cette branche du plugin en compat SPIP 3.1+/PHP 5.6+ uniquement

Location:

_plugins_/scssphp/trunk

Files:

• lib/scssphp/src/Block.php (modified) (1 diff)
• lib/scssphp/src/Compiler.php (modified) (54 diffs)
• lib/scssphp/src/Parser.php (modified) (31 diffs)
• lib/scssphp/src/SourceMap/SourceMapGenerator.php (modified) (8 diffs)
• lib/scssphp/src/Version.php (modified) (1 diff)
• paquet.xml (modified) (2 diffs)

_plugins_/scssphp/trunk/lib/scssphp/src/Block.php

@@ -63 +63 @@
      */
     public $children;
+
     /**
      * @var \Leafo\ScssPhp\Block

_plugins_/scssphp/trunk/lib/scssphp/src/Compiler.php

@@ -150 +150 @@
 
     protected $indentLevel;
-    protected $commentsSeen;
     protected $extends;
     protected $extendsMap;
@@ -227 +226 @@
 
         $this->indentLevel    = -1;
-        $this->commentsSeen   = [];
         $this->extends        = [];
         $this->extendsMap     = [];
@@ -484 +482 @@
 
     /**
+     * Glue parts of :not( or :nth-child( ... that are in general splitted in selectors parts
+     *
+     * @param array $parts
+     *
+     * @return array
+     */
+    protected function glueFunctionSelectors($parts)
+    {
+        $new = [];
+        foreach ($parts as $part) {
+            if (is_array($part)) {
+                $part = $this->glueFunctionSelectors($part);
+                $new[] = $part;
+            } else {
+                // a selector part finishing with a ) is the last part of a :not( or :nth-child(
+                // and need to be joined to this
+                if (count($new) && is_string($new[count($new) - 1])
+                    && strlen($part) && substr($part, -1) === ')' && strpos($part, '(') === false
+                ) {
+                    $new[count($new) - 1] .= $part;
+                } else {
+                    $new[] = $part;
+                }
+            }
+        }
+        return $new;
+    }
+
+    /**
      * Match extends
      *
@@ -493 +520 @@
     protected function matchExtends($selector, &$out, $from = 0, $initial = true)
     {
+        $selector = $this->glueFunctionSelectors($selector);
+
         foreach ($selector as $i => $part) {
             if ($i < $from) {
@@ -519 +548 @@
                     for ($l = count($tempReplacement) - 1; $l >= 0; $l--) {
                         $slice = [];
+
                         foreach ($tempReplacement[$l] as $chunk) {
                             if (!in_array($chunk, $slice)) {
@@ -524 +554 @@
                             }
                         }
+
                         array_unshift($replacement, $slice);
 
@@ -622 +653 @@
         foreach ($counts as $idx => $count) {
             list($target, $origin, /* $block */) = $this->extends[$idx];
+            $origin = $this->glueFunctionSelectors($origin);
 
             // check count
@@ -663 +695 @@
     }
 
-
     /**
      * Extract a relationship from the fragment.
@@ -673 +704 @@
      *
      * @param array $fragment The selector fragment maybe ending with a direction relationship combinator.
+     *
      * @return array The selector without the relationship fragment if any, the relationship fragment.
      */
@@ -857 +889 @@
 
         $selfParent = $block->selfParent;
-        if (! $block->selfParent->selectors && isset($block->parent) && $block->parent && isset($block->parent->selectors) && $block->parent->selectors) {
+
+        if (! $block->selfParent->selectors && isset($block->parent) && $block->parent &&
+            isset($block->parent->selectors) && $block->parent->selectors
+        ) {
             $selfParent = $block->parent;
         }
@@ -878 +913 @@
     /**
      * Filter at-root scope depending of with/without option
-     * @param $scope
-     * @param $without
+     *
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $scope
+     * @param mixed                                $without
+     *
      * @return mixed
      */
@@ -899 +936 @@
                 break;
             }
+
             if (! $this->isWithout($without, $scope)) {
                 $s = clone $scope;
@@ -904 +942 @@
                 $s->lines = [];
                 $s->parent = null;
+
                 if ($s->type !== Type::T_MEDIA && $s->type !== Type::T_DIRECTIVE) {
                     $s->selectors = [];
                 }
+
                 $filteredScopes[] = $s;
             }
@@ -916 +956 @@
             }
         }
+
         if (!count($filteredScopes)) {
             return $this->rootBlock;
@@ -922 +963 @@
         $newScope = array_shift($filteredScopes);
         $newScope->parent = $this->rootBlock;
+
         $this->rootBlock->children[] = $newScope;
 
         $p = &$newScope;
+
         while (count($filteredScopes)) {
             $s = array_shift($filteredScopes);
@@ -938 +981 @@
      * found missing selector from a at-root compilation in the previous scope
      * (if at-root is just enclosing a property, the selector is in the parent tree)
-     * @param $scope
-     * @param $previousScope
+     *
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $scope
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $previousScope
+     *
      * @return mixed
      */
@@ -947 +992 @@
             $scope->selectors = $this->findScopeSelectors($previousScope, $scope->depth);
         }
+
         if ($scope->children) {
             foreach ($scope->children as $k => $c) {
@@ -958 +1004 @@
     /**
      * Find a selector by the depth node in the scope
-     * @param $scope
-     * @param $depth
+     *
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $scope
+     * @param integer                              $depth
+     *
      * @return array
      */
@@ -967 +1015 @@
             return $scope->selectors;
         }
+
         if ($scope->children) {
             foreach (array_reverse($scope->children) as $c) {
@@ -974 +1023 @@
             }
         }
+
         return [];
     }
@@ -1053 +1103 @@
      * Filter WITH rules
      *
-     * @param integer              $without
+     * @param integer                                                   $without
      * @param \Leafo\ScssPhp\Block|\Leafo\ScssPhp\Formatter\OutputBlock $block
      *
@@ -1069 +1119 @@
                     return ($without & static::WITH_SUPPORTS) ? true : false;
                 }
+
                 if (isset($block->selectors) && strpos(serialize($block->selectors), '@supports') !== false) {
                     return ($without & static::WITH_SUPPORTS) ? true : false;
@@ -1074 +1125 @@
             }
         }
+
         if ((($without & static::WITH_RULE) && isset($block->selectors))) {
             return true;
@@ -1123 +1175 @@
 
         // wrap assign children in a block
-        foreach ($block->children as $k => $child) {
-            if ($child[0] === Type::T_ASSIGN) {
+        // except for @font-face
+        if ($block->type !== Type::T_DIRECTIVE || $block->name !== "font-face") {
+            // need wrapping?
+            $needWrapping = false;
+
+            foreach ($block->children as $child) {
+                if ($child[0] === Type::T_ASSIGN) {
+                    $needWrapping = true;
+                    break;
+                }
+            }
+
+            if ($needWrapping) {
                 $wrapped = new Block;
-                $wrapped->sourceName   = $block->sourceName;
-                $wrapped->sourceIndex  = $block->sourceIndex;
-                $wrapped->sourceLine   = $block->sourceLine;
+                $wrapped->sourceName = $block->sourceName;
+                $wrapped->sourceIndex = $block->sourceIndex;
+                $wrapped->sourceLine = $block->sourceLine;
                 $wrapped->sourceColumn = $block->sourceColumn;
-                $wrapped->selectors    = [];
-                $wrapped->comments     = [];
-                $wrapped->parent       = $block;
-                $wrapped->children     = [$child];
-                $wrapped->selfParent   = $block->selfParent;
-
-                $block->children[$k] = [Type::T_BLOCK, $wrapped];
+                $wrapped->selectors = [];
+                $wrapped->comments = [];
+                $wrapped->parent = $block;
+                $wrapped->children = $block->children;
+                $wrapped->selfParent = $block->selfParent;
+
+                $block->children = [[Type::T_BLOCK, $wrapped]];
             }
         }
@@ -1200 +1263 @@
         if (count($block->children)) {
             $out->selectors = $this->multiplySelectors($env, $block->selfParent);
+
             // propagate selfParent to the children where they still can be useful
             $selfParentSelectors = null;
+
             if (isset($block->selfParent->selectors)) {
                 $selfParentSelectors = $block->selfParent->selectors;
                 $block->selfParent->selectors = $out->selectors;
             }
+
             $this->compileChildrenNoReturn($block->children, $out, $block->selfParent);
+
             // and revert for the following childs of the same block
             if ($selfParentSelectors) {
@@ -1227 +1294 @@
         $out = $this->makeOutputBlock(Type::T_COMMENT);
         $out->lines[] = $block[1];
+
         $this->scope->children[] = $out;
     }
@@ -1459 +1527 @@
             }
         }
+
         return null;
     }
@@ -1467 +1536 @@
      * @param array                                $stms
      * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
-     * @param \Leafo\ScssPhp\Block $selfParent
+     * @param \Leafo\ScssPhp\Block                 $selfParent
      *
      * @throws \Exception
@@ -1473 +1542 @@
     protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null)
     {
-
         foreach ($stms as $stm) {
-            if ($selfParent && isset($stm[1]) && is_object($stm[1]) && get_class($stm[1]) == 'Leafo\ScssPhp\Block') {
+            if ($selfParent && isset($stm[1]) && is_object($stm[1]) && $stm[1] instanceof Block) {
                 $stm[1]->selfParent = $selfParent;
                 $ret = $this->compileChild($stm, $out);
                 $stm[1]->selfParent = null;
-            }
-            elseif ($selfParent && $stm[0] === TYPE::T_INCLUDE) {
+            } elseif ($selfParent && $stm[0] === TYPE::T_INCLUDE) {
                 $stm['selfParent'] = $selfParent;
                 $ret = $this->compileChild($stm, $out);
@@ -1494 +1561 @@
             }
         }
+    }
+
+
+    /**
+     * evaluate media query : compile internal value keeping the structure inchanged
+     *
+     * @param array $queryList
+     *
+     * @return array
+     */
+    protected function evaluateMediaQuery($queryList)
+    {
+        foreach ($queryList as $kql => $query) {
+            foreach ($query as $kq => $q) {
+                for ($i = 1; $i < count($q); $i++) {
+                    $value = $this->compileValue($q[$i]);
+
+                    // the parser had no mean to know if media type or expression if it was an interpolation
+                    if ($q[0] == Type::T_MEDIA_TYPE &&
+                        (strpos($value, '(') !== false ||
+                        strpos($value, ')') !== false ||
+                        strpos($value, ':') !== false)
+                    ) {
+                        $queryList[$kql][$kq][0] = Type::T_MEDIA_EXPRESSION;
+
+                        if (strpos($value, 'and') !== false) {
+                            $values = explode('and', $value);
+                            $value = trim(array_pop($values));
+
+                            while ($v = trim(array_pop($values))) {
+                                $type = Type::T_MEDIA_EXPRESSION;
+
+                                if (strpos($v, '(') === false &&
+                                    strpos($v, ')') === false &&
+                                    strpos($v, ':') === false
+                                ) {
+                                    $type = Type::T_MEDIA_TYPE;
+                                }
+
+                                if (substr($v, 0, 1) === '(' && substr($v, -1) === ')') {
+                                    $v = substr($v, 1, -1);
+                                }
+
+                                $queryList[$kql][] = [$type,[Type::T_KEYWORD, $v]];
+                            }
+                        }
+
+                        if (substr($value, 0, 1) === '(' && substr($value, -1) === ')') {
+                            $value = substr($value, 1, -1);
+                        }
+                    }
+
+                    $queryList[$kql][$kq][$i] = [Type::T_KEYWORD, $value];
+                }
+            }
+        }
+
+        return $queryList;
     }
 
@@ -1568 +1693 @@
     }
 
+    /**
+     * Merge direct relationships between selectors
+     *
+     * @param array $selectors1
+     * @param array $selectors2
+     *
+     * @return array
+     */
     protected function mergeDirectRelationships($selectors1, $selectors2)
     {
@@ -1668 +1801 @@
      * Compile import; returns true if the value was something that could be imported
      *
-     * @param array   $rawPath
-     * @param array   $out
-     * @param boolean $once
+     * @param array                                $rawPath
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
+     * @param boolean                              $once
      *
      * @return boolean
      */
-    protected function compileImport($rawPath, $out, $once = false)
+    protected function compileImport($rawPath, OutputBlock $out, $once = false)
     {
         if ($rawPath[0] === Type::T_STRING) {
@@ -1734 +1867 @@
             $this->sourceLine = $out->sourceLine;
             $this->sourceIndex = array_search($out->sourceName, $this->sourceNames);
+
             if ($this->sourceIndex === false) {
                 $this->sourceIndex = null;
@@ -1806 +1940 @@
 
                 // handle shorthand syntax: size / line-height
-                if ($compiledName === 'font') {
+                if ($compiledName === 'font' || $compiledName === 'grid-row' || $compiledName === 'grid-column') {
                     if ($value[0] === Type::T_VARIABLE) {
-                        // if the font value comes from variable, the content is already reduced (which means formulars where already calculated)
-                        // so we need the original unreduced value
+                        // if the font value comes from variable, the content is already reduced
+                        // (i.e., formulas were already calculated), so we need the original unreduced value
                         $value = $this->get($value[1], true, null, true);
                     }
 
                     $fontValue=&$value;
+
                     if ($value[0] === Type::T_LIST && $value[1]==',') {
                         // this is the case if more than one font is given: example: "font: 400 1em/1.3 arial,helvetica"
@@ -2045 +2180 @@
                 // and assign this fake parent to childs
                 $selfParent = null;
+
                 if (isset($child['selfParent']) && isset($child['selfParent']->selectors)) {
                     $selfParent = $child['selfParent'];
-                }
-                else {
+                } else {
                     $parentSelectors = $this->multiplySelectors($this->env);
+
                     if ($parentSelectors) {
                         $parent = new Block();
                         $parent->selectors = $parentSelectors;
+
                         foreach ($mixin->children as $k => $child) {
-                            if (isset($child[1]) && is_object($child[1]) && get_class($child[1]) == 'Leafo\ScssPhp\Block') {
+                            if (isset($child[1]) && is_object($child[1]) && $child[1] instanceof Block) {
                                 $mixin->children[$k][1]->parent = $parent;
                             }
@@ -2061 +2198 @@
                 }
 
+                // clone the stored content to not have its scope spoiled by a further call to the same mixin
+                // i.e., recursive @include of the same mixin
                 if (isset($content)) {
-                    $content->scope = $callingScope;
-
-                    $this->setRaw(static::$namespaces['special'] . 'content', $content, $this->env);
+                    $copyContent = clone $content;
+                    $copyContent->scope = $callingScope;
+
+                    $this->setRaw(static::$namespaces['special'] . 'content', $copyContent, $this->env);
                 }
 
@@ -2095 +2235 @@
                 $storeEnv = $this->storeEnv;
                 $this->storeEnv = $content->scope;
-
                 $this->compileChildrenNoReturn($content->children, $out);
 
@@ -2170 +2309 @@
      * @param array $value
      *
-     * @return array
+     * @return boolean
      */
     protected function isTruthy($value)
@@ -2397 +2536 @@
                 $selfSelector = $this->multiplySelectors($this->env);
                 $selfSelector = $this->collapseSelectors($selfSelector);
+
                 return [Type::T_STRING, '', [$selfSelector]];
 
@@ -2585 +2725 @@
             return $strRight;
         }
+
         return null;
     }
@@ -3091 +3232 @@
      *
      * @param \Leafo\ScssPhp\Compiler\Environment $env
-     * @param Leafo\ScssPhp\Block $selfParent
+     * @param \Leafo\ScssPhp\Block                $selfParent
      *
      * @return array
@@ -3102 +3243 @@
 
         $selfParentSelectors = null;
+
         if (!is_null($selfParent) and $selfParent->selectors) {
             $selfParentSelectors = $this->evalSelectors($selfParent->selectors);
@@ -3117 +3259 @@
                     if ($selfParentSelectors) {
                         $previous = null;
+
                         foreach ($selfParentSelectors as $selfParent) {
                             // if no '&' in the selector, each call will give same result, only add once
                             $s = $this->joinSelectors($parent, $selector, $selfParent);
+
                             if ($s !== $previous) {
                                 $selectors[serialize($s)] = $s;
                             }
+
                             $previous = $s;
                         }
@@ -3136 +3281 @@
 
         $selectors = array_values($selectors);
+
         return $selectors;
     }
@@ -3145 +3291 @@
      * @param array $child
      * @param array $selfParentSelectors
+
      * @return array
      */
@@ -3158 +3305 @@
                 if ($p === static::$selfSelector) {
                     $setSelf = true;
+
                     if (is_null($selfParentSelectors)) {
                         $selfParentSelectors = $parent;
                     }
+
                     foreach ($selfParentSelectors as $i => $parentPart) {
                         if ($i > 0) {
@@ -3214 +3363 @@
             : [[[Type::T_MEDIA_VALUE, $env->block->value]]];
 
+        $store = [$this->env, $this->storeEnv];
+        $this->env = $env;
+        $this->storeEnv = null;
+        $parentQueries = $this->evaluateMediaQuery($parentQueries);
+        list($this->env, $this->storeEnv) = $store;
+
         if ($childQueries === null) {
             $childQueries = $parentQueries;
@@ -3358 +3513 @@
 
         $env->store[$name] = $value;
+
         if ($valueUnreduced) {
             $env->storeUnreduced[$name] = $valueUnreduced;
@@ -3374 +3530 @@
     {
         $env->store[$name] = $value;
+
         if ($valueUnreduced) {
             $env->storeUnreduced[$name] = $valueUnreduced;
@@ -3403 +3560 @@
         $hasNamespace = $normalizedName[0] === '^' || $normalizedName[0] === '@' || $normalizedName[0] === '%';
 
+        $maxDepth = 10000;
+
         for (;;) {
+            if ($maxDepth-- <= 0) {
+                break;
+            }
             if (array_key_exists($normalizedName, $env->store)) {
                 if ($unreduced && isset($env->storeUnreduced[$normalizedName])) {
                     return $env->storeUnreduced[$normalizedName];
                 }
+
                 return $env->store[$normalizedName];
             }
@@ -3429 +3592 @@
 
         if ($shouldThrow) {
-            $this->throwError("Undefined variable \$$name");
+            $this->throwError("Undefined variable \$$name" . ($maxDepth<=0 ? " (infinite recursion)" : ""));
         }
 
@@ -3664 +3827 @@
      * Import file
      *
-     * @param string $path
-     * @param array  $out
-     */
-    protected function importFile($path, $out)
+     * @param string                               $path
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
+     */
+    protected function importFile($path, OutputBlock $out)
     {
         // see if tree is cached
@@ -3765 +3928 @@
     {
         $this->ignoreErrors = $ignoreErrors;
+
         return $this;
     }
@@ -3788 +3952 @@
 
         $line = $this->sourceLine;
-        $loc = isset($this->sourceNames[$this->sourceIndex]) ? $this->sourceNames[$this->sourceIndex] . " on line $line" : "line: $line";
+        $loc = isset($this->sourceNames[$this->sourceIndex])
+             ? $this->sourceNames[$this->sourceIndex] . " on line $line"
+             : "line: $line";
         $msg = "$msg: $loc";
+
         if ($this->callStack) {
             $msg .= "\nCall Stack:\n";
             $ncall = 0;
+
             foreach (array_reverse($this->callStack) as $call) {
                 $msg .= "#" . $ncall++ . " " . $call['n'] . " ";
-                $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]]) ? $this->sourceNames[$call[Parser::SOURCE_INDEX]] : '(unknown file)');
+                $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]])
+                      ? $this->sourceNames[$call[Parser::SOURCE_INDEX]]
+                      : '(unknown file)');
                 $msg .= " on line " . $call[Parser::SOURCE_LINE] . "\n";
             }

_plugins_/scssphp/trunk/lib/scssphp/src/Parser.php

@@ -68 +68 @@
     private $encoding;
     private $patternModifiers;
+    private $commentsSeen;
 
     /**
@@ -86 +87 @@
         $this->utf8             = ! $encoding || strtolower($encoding) === 'utf-8';
         $this->patternModifiers = $this->utf8 ? 'Aisu' : 'Ais';
+        $this->commentsSeen   = [];
 
         if (empty(static::$operatorPattern)) {
@@ -442 +444 @@
 
             $this->seek($s);
-
 
             if ($this->literal('@return', 7) && ($this->valueList($retVal) || true) && $this->end()) {
@@ -794 +795 @@
 
         $this->env = $block->parent;
+
         unset($block->parent);
 
         $comments = $block->comments;
+
         if ($comments) {
             $this->env->comments = $comments;
@@ -830 +833 @@
      *
      * @param integer $where
-     *
-     * @return integer
      */
     protected function seek($where)
@@ -890 +891 @@
     protected function match($regex, &$out, $eatWhitespace = null)
     {
-
         $r = '/' . $regex . '/' . $this->patternModifiers;
 
@@ -910 +910 @@
     }
 
-
     /**
      * Match a single string
@@ -921 +920 @@
     protected function matchChar($char, $eatWhitespace = null)
     {
-
         if (! isset($this->buffer[$this->count]) || $this->buffer[$this->count] !== $char) {
             return false;
@@ -937 +935 @@
         return true;
     }
-
 
     /**
@@ -966 +963 @@
         return true;
     }
-
 
     /**
@@ -1193 +1189 @@
      * Parse comma separated value list
      *
-     * @param string $out
+     * @param array $out
      *
      * @return boolean
@@ -1229 +1225 @@
         $items = [];
         $value = null;
+
         while ($this->$parseItem($value)) {
             $items[] = $value;
@@ -1266 +1263 @@
 
         if ($this->matchChar('(')) {
-            if ($this->matchChar(')')) {
-                $out = [Type::T_LIST, '', []];
-
-                return true;
-            }
-
-            if ($this->valueList($out) && $this->matchChar(')') && $out[0] === Type::T_LIST) {
-                return true;
-            }
-
-            $this->seek($s);
-
-            if ($this->map($out)) {
+            if ($this->parenExpression($out, $s, ")")) {
+                return true;
+            }
+
+            $this->seek($s);
+        }
+
+        if ($this->matchChar('[')) {
+            if ($this->parenExpression($out, $s, "]")) {
                 return true;
             }
@@ -1288 +1281 @@
             $out = $this->expHelper($lhs, 0);
 
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Parse expression specifically checking for lists in parenthesis or brackets
+     *
+     * @param array   $out
+     * @param integer $s
+     * @param string  $closingParen
+     *
+     * @return boolean
+     */
+    protected function parenExpression(&$out, $s, $closingParen = ")")
+    {
+        if ($this->matchChar($closingParen)) {
+            $out = [Type::T_LIST, '', []];
+
+            return true;
+        }
+
+        if ($this->valueList($out) && $this->matchChar($closingParen) && $out[0] === Type::T_LIST) {
+            return true;
+        }
+
+        $this->seek($s);
+
+        if ($this->map($out)) {
             return true;
         }
@@ -1354 +1377 @@
     protected function value(&$out)
     {
-
         if (! isset($this->buffer[$this->count])) {
             return false;
@@ -1381 +1403 @@
             if ($this->whitespace() && $this->value($inner)) {
                 $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
+
                 return true;
             }
@@ -1388 +1411 @@
             if ($this->parenValue($inner)) {
                 $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
+
                 return true;
             }
@@ -1397 +1421 @@
         if ($char === '+') {
             $this->count++;
+
             if ($this->value($inner)) {
                 $out = [Type::T_UNARY, '+', $inner, $this->inParens];
                 return true;
             }
+
             $this->count--;
+
             return false;
         }
-
 
         // negation
         if ($char === '-') {
             $this->count++;
+
             if ($this->variable($inner) || $this->unit($inner) || $this->parenValue($inner)) {
                 $out = [Type::T_UNARY, '-', $inner, $this->inParens];
@@ -1443 +1470 @@
             return true;
         }
-
 
         if ($this->unit($out)) {
@@ -1539 +1565 @@
      *
      * @param string $name
-     * @param array $out
+     * @param array  $func
      *
      * @return boolean
@@ -1790 +1816 @@
      * Parse number with unit
      *
-     * @param array $out
+     * @param array $unit
      *
      * @return boolean
@@ -2219 +2245 @@
             }
 
-
             //self
             switch ($char) {
@@ -2236 +2261 @@
             }
 
-
             if ($char === '\\' && $this->match('\\\\\S', $m)) {
                 $parts[] = $m[0];
@@ -2242 +2266 @@
             }
 
-
             if ($char === '%') {
                 $this->count++;
+
                 if ($this->placeholder($placeholder)) {
                     $parts[] = '%';
@@ -2250 +2274 @@
                     continue;
                 }
+
                 break;
             }
@@ -2263 +2288 @@
                 continue;
             }
-
 
             // a pseudo selector
@@ -2274 +2298 @@
                     $part = ':';
                 }
+
                 if ($this->mixedKeyword($nameParts)) {
                     $parts[] = $part;
@@ -2302 +2327 @@
             }
 
-
-            $this->seek($s);
-
+            $this->seek($s);
 
             // attribute selector
@@ -2325 +2348 @@
             $this->seek($s);
 
-
             // for keyframes
             if ($this->unit($unit)) {
@@ -2336 +2358 @@
                 continue;
             }
-
-
-
 
             break;
@@ -2611 +2630 @@
      * @param integer $pos
      *
-     * @return integer
+     * @return array
      */
     private function getSourcePosition($pos)

_plugins_/scssphp/trunk/lib/scssphp/src/SourceMap/SourceMapGenerator.php

@@ -86 +86 @@
      */
     protected $sources = [];
-    protected $source_keys = [];
+    protected $sourceKeys = [];
 
     /**
@@ -111 +111 @@
     {
         $this->mappings[] = [
-            'generated_line' => $generatedLine,
+            'generated_line'   => $generatedLine,
             'generated_column' => $generatedColumn,
-            'original_line' => $originalLine,
-            'original_column' => $originalColumn,
-            'source_file' => $sourceFile
+            'original_line'    => $originalLine,
+            'original_column'  => $originalColumn,
+            'source_file'      => $sourceFile
         ];
 
@@ -124 +124 @@
      * Saves the source map to a file
      *
-     * @param string $file    The absolute path to a file
      * @param string $content The content to write
+     *
+     * @return string
      *
      * @throws \Leafo\ScssPhp\Exception\CompilerException If the file could not be saved
@@ -181 +182 @@
         $sourceMap['sources'] = [];
 
-        foreach ($this->sources as $source_uri => $source_filename) {
-            $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
+        foreach ($this->sources as $sourceUri => $sourceFilename) {
+            $sourceMap['sources'][] = $this->normalizeFilename($sourceFilename);
         }
 
@@ -237 +238 @@
         }
 
-        $this->source_keys = array_flip(array_keys($this->sources));
+        $this->sourceKeys = array_flip(array_keys($this->sources));
 
         // group mappings by generated line number.
@@ -249 +250 @@
         $lastGeneratedLine = $lastOriginalIndex = $lastOriginalLine = $lastOriginalColumn = 0;
 
-        foreach ($groupedMap as $lineNumber => $line_map) {
+        foreach ($groupedMap as $lineNumber => $lineMap) {
             while (++$lastGeneratedLine < $lineNumber) {
                 $groupedMapEncoded[] = ';';
@@ -257 +258 @@
             $lastGeneratedColumn = 0;
 
-            foreach ($line_map as $m) {
+            foreach ($lineMap as $m) {
                 $mapEncoded = $this->encoder->encode($m['generated_column'] - $lastGeneratedColumn);
                 $lastGeneratedColumn = $m['generated_column'];
@@ -294 +295 @@
     protected function findFileIndex($filename)
     {
-        return $this->source_keys[$filename];
-    }
-
+        return $this->sourceKeys[$filename];
+    }
+
+    /**
+     * Normalize filename
+     *
+     * @param string $filename
+     *
+     * @return string
+     */
     protected function normalizeFilename($filename)
     {

_plugins_/scssphp/trunk/lib/scssphp/src/Version.php

@@ -19 +19 @@
 class Version
 {
-    const VERSION = 'v0.8.0.1';
+    const VERSION = 'v0.8.2.1';
 }

_plugins_/scssphp/trunk/paquet.xml

@@ -2 +2 @@
         prefix="scssphp"
         categorie="outil"
-        version="1.9.1"
+        version="1.9.2"
         etat="test"
         compatibilite="[2.1.0;3.2.*]"
@@ -22 +22 @@
         <pipeline nom="formulaire_admin"  inclure="scssphp_pipelines.php" />
 
-        <procure nom="scssphp" version="0.8.0.1" />
+        <procure nom="scssphp" version="0.8.2.1" />
 
         <spip compatibilite="[3.1.0;[">