Merge pull request #170 from joomdev/dev

Leafo\ScssPhp\Compiler issue resolved
joomdev · Sep 1, 2020 · 8629077 · 8629077
2 parents cde0838 + 93e2b42
commit 8629077
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/astroid/astroid-framework/astroid.xml b/astroid/astroid-framework/astroid.xml
@@ -4,7 +4,7 @@
    <libraryname>astroid</libraryname>
    <author>JoomDev</author>
    <creationDate>Aug 2020</creationDate>
-   <version>2.4.0</version>
+   <version>2.4.1</version>
    <url>https://www.astroidframework.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>

diff --git a/astroid/astroid-framework/framework/helper.php b/astroid/astroid-framework/framework/helper.php
@@ -13,7 +13,7 @@
 jimport('joomla.filesystem.folder');
 jimport('joomla.filesystem.element');
 
-use Leafo\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Compiler;
 
 \JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_cache/models', 'CacheModel');
 
@@ -162,7 +162,7 @@ public static function compileSass($sass_path, $css_path, $sass, $css, $variable
          require_once JPATH_LIBRARIES . '/' . 'astroid' . '/' . 'framework' . '/' . 'library' . '/' . 'scssphp' . '/' . 'scss.inc.php';
          $scss = new Compiler();
          $scss->setImportPaths($sass_path);
-         $scss->setFormatter('Leafo\ScssPhp\Formatter\Compressed');
+         $scss->setFormatter('ScssPhp\ScssPhp\Formatter\Compressed');
          if (!empty($variables)) {
             $scss->setVariables($variables);
          }

diff --git a/astroid/astroid-framework/framework/library/astroid/Helper/Constants.php b/astroid/astroid-framework/framework/library/astroid/Helper/Constants.php
@@ -13,7 +13,7 @@
 
 class Constants 
 {
-    public static $astroid_version = '2.4.0';
+    public static $astroid_version = '2.4.1';
     public static $fontawesome_version = '5.12.1';
     public static $animatecss_version = '3.7.0';
     public static $forum_link = 'https://www.joomdev.com/forum/astroid-framework';

diff --git a/pkg_astroid.xml b/pkg_astroid.xml
@@ -6,7 +6,7 @@
    <packagerurl>https://www.astroidframework.com</packagerurl>
    <author>JoomDev</author>
    <creationDate>Aug 2020</creationDate>
-   <version>2.4.0</version>
+   <version>2.4.1</version>
    <url>https://www.joomdev.com</url>
    <copyright>Copyright (C) 2020 Joomdev, Inc. All rights reserved.</copyright>
    <license>GNU General Public License version 2 or later; see LICENSE.txt</license>