MDL-60287 scssphp: upgraded to 0.6.7

This commit is contained in:
Marina Glancy
2017-10-01 11:47:58 +08:00
parent 23ab0d7788
commit 653b2bd351
26 changed files with 202 additions and 132 deletions
+6 -6
View File
@@ -2,7 +2,7 @@
/**
* SCSSPHP
*
* @copyright 2012-2015 Leaf Corcoran
* @copyright 2012-2017 Leaf Corcoran
*
* @license http://opensource.org/licenses/MIT MIT
*
@@ -110,7 +110,7 @@ class Number extends Node implements \ArrayAccess
$dimension = $this->dimension;
foreach (self::$unitTable['in'] as $unit => $conv) {
foreach (static::$unitTable['in'] as $unit => $conv) {
$from = isset($this->units[$unit]) ? $this->units[$unit] : 0;
$to = isset($units[$unit]) ? $units[$unit] : 0;
$factor = pow($conv, $from - $to);
@@ -265,7 +265,7 @@ class Number extends Node implements \ArrayAccess
*/
public function output(Compiler $compiler = null)
{
$dimension = round($this->dimension, self::$precision);
$dimension = round($this->dimension, static::$precision);
$units = array_filter($this->units, function ($unitSize) {
return $unitSize;
@@ -277,7 +277,7 @@ class Number extends Node implements \ArrayAccess
$this->normalizeUnits($dimension, $units, 'in');
$dimension = round($dimension, self::$precision);
$dimension = round($dimension, static::$precision);
$units = array_filter($units, function ($unitSize) {
return $unitSize;
});
@@ -316,8 +316,8 @@ class Number extends Node implements \ArrayAccess
$units = [];
foreach ($this->units as $unit => $exp) {
if (isset(self::$unitTable[$baseUnit][$unit])) {
$factor = pow(self::$unitTable[$baseUnit][$unit], $exp);
if (isset(static::$unitTable[$baseUnit][$unit])) {
$factor = pow(static::$unitTable[$baseUnit][$unit], $exp);
$unit = $baseUnit;
$dimension /= $factor;