MDL-65761 lib: Update scssphp to 1.0.0

moodle · Jul 16, 2019 · f619e30 · f619e30
1 parent 358d571
commit f619e30
Show file tree

Hide file tree

Showing 35 changed files with 993 additions and 272 deletions.
diff --git a/lib/adminlib.php b/lib/adminlib.php
@@ -10861,9 +10861,9 @@ public function validate($data) {
         $scss = new core_scss();
         try {
             $scss->compile($data);
-        } catch (Leafo\ScssPhp\Exception\ParserException $e) {
+        } catch (ScssPhp\ScssPhp\Exception\ParserException $e) {
             return get_string('scssinvalid', 'admin', $e->getMessage());
-        } catch (Leafo\ScssPhp\Exception\CompilerException $e) {
+        } catch (ScssPhp\ScssPhp\Exception\CompilerException $e) {
             // Silently ignore this - it could be a scss variable defined from somewhere
             // else which we are not examining here.
             return true;

diff --git a/lib/classes/component.php b/lib/classes/component.php
@@ -80,7 +80,7 @@ class core_component {
         'GeoIp2' => 'lib/maxmind/GeoIp2',
         'Sabberworm\\CSS' => 'lib/php-css-parser',
         'MoodleHQ\\RTLCSS' => 'lib/rtlcss',
-        'Leafo\\ScssPhp' => 'lib/scssphp',
+        'ScssPhp\\ScssPhp' => 'lib/scssphp',
         'Box\\Spout' => 'lib/spout/src/Spout',
         'MatthiasMullie\\Minify' => 'lib/minify/matthiasmullie-minify/src/',
         'MatthiasMullie\\PathConverter' => 'lib/minify/matthiasmullie-pathconverter/src/',

diff --git a/lib/classes/scss.php b/lib/classes/scss.php
@@ -31,7 +31,7 @@
  * @copyright  2016 Frédéric Massart
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_scss extends \Leafo\ScssPhp\Compiler {
+class core_scss extends \ScssPhp\ScssPhp\Compiler {
 
     /** @var string The path to the SCSS file. */
     protected $scssfile;
@@ -150,14 +150,14 @@ public function compile($code, $path = null) {
      * Compile child; returns a value to halt execution
      *
      * @param array $child
-     * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
+     * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
      *
      * @return array|null
      */
-    protected function compileChild($child, \Leafo\ScssPhp\Formatter\OutputBlock $out) {
+    protected function compileChild($child, \ScssPhp\ScssPhp\Formatter\OutputBlock $out) {
         switch($child[0]) {
-            case \Leafo\ScssPhp\Type::T_SCSSPHP_IMPORT_ONCE:
-            case \Leafo\ScssPhp\Type::T_IMPORT:
+            case \ScssPhp\ScssPhp\Type::T_SCSSPHP_IMPORT_ONCE:
+            case \ScssPhp\ScssPhp\Type::T_IMPORT:
                 list(, $rawpath) = $child;
                 $rawpath = $this->reduce($rawpath);
                 $path = $this->compileStringContent($rawpath);

diff --git a/lib/scssphp/Base/Range.php b/lib/scssphp/Base/Range.php
@@ -2,14 +2,14 @@
 /**
  * SCSSPHP
  *
- * @copyright 2015-2018 Leaf Corcoran
+ * @copyright 2015-2019 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
- * @link http://leafo.github.io/scssphp
+ * @link http://scssphp.github.io/scssphp
  */
 
-namespace Leafo\ScssPhp\Base;
+namespace ScssPhp\ScssPhp\Base;
 
 /**
  * Range

diff --git a/lib/scssphp/Block.php b/lib/scssphp/Block.php
@@ -2,14 +2,14 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2018 Leaf Corcoran
+ * @copyright 2012-2019 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
- * @link http://leafo.github.io/scssphp
+ * @link http://scssphp.github.io/scssphp
  */
 
-namespace Leafo\ScssPhp;
+namespace ScssPhp\ScssPhp;
 
 /**
  * Block
@@ -24,7 +24,7 @@ class Block
     public $type;
 
     /**
-     * @var \Leafo\ScssPhp\Block
+     * @var \ScssPhp\ScssPhp\Block
      */
     public $parent;
 
@@ -64,7 +64,7 @@ class Block
     public $children;
 
     /**
-     * @var \Leafo\ScssPhp\Block
+     * @var \ScssPhp\ScssPhp\Block
      */
     public $selfParent;
 }
diff --git a/lib/scssphp/Cache.php b/lib/scssphp/Cache.php
@@ -2,14 +2,14 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2018 Leaf Corcoran
+ * @copyright 2012-2019 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
- * @link http://leafo.github.io/scssphp
+ * @link http://scssphp.github.io/scssphp
  */
 
-namespace Leafo\ScssPhp;
+namespace ScssPhp\ScssPhp;
 
 use Exception;
 

diff --git a/lib/scssphp/Colors.php b/lib/scssphp/Colors.php
@@ -2,14 +2,14 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2018 Leaf Corcoran
+ * @copyright 2012-2019 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
- * @link http://leafo.github.io/scssphp
+ * @link http://scssphp.github.io/scssphp
  */
 
-namespace Leafo\ScssPhp;
+namespace ScssPhp\ScssPhp;
 
 /**
  * CSS Colors