refactoring and fix scss composition when snippet file cannot be found

Author: Menrath

classes/snippets.php

@@ -85,7 +85,7 @@ public static function get_snippet_scss($path, $source) {
         $file = self::get_snippet_file($path, $source);
 
         if (is_null($file)) {
-            return null;
+            return '';
         }
 
         $scss = file_get_contents( $file, false, null, 0);

lib.php

@@ -128,6 +128,8 @@
 define('THEME_BOOST_UNION_SETTING_EXTSCSSSOURCE_DOWNLOAD', 1);
 define('THEME_BOOST_UNION_SETTING_EXTSCSSSOURCE_GITHUB', 2);
 
+use theme_boost_union\snippets;
+
 /**
  * Returns the main SCSS content.
  *
@@ -159,8 +161,8 @@ function theme_boost_union_get_main_scss_content($theme) {
     // Thus, we sadly have to get and include the external Post SCSS here already.
     $scss .= theme_boost_union_get_external_scss('post');
 
-    // Setting: CSS Snippets.
-    $scss .= theme_boost_union_get_snippets_scss();
+    // Include SCSS of enabled Style snippets.
+    $scss .= snippets::get_enabled_snippet_scss();
 
     return $scss;
 }

locallib.php

@@ -2222,17 +2222,6 @@ function theme_boost_union_get_external_scss($type) {
     return $extscss;
 }
 
-/**
- * Gets and returns the SCSS based on the enabled CSS snippets.
- *
- * @return string The (S)CSS strings content.
- */
-function theme_boost_union_get_snippets_scss() {
-    $snippetsscss = snippets::get_enabled_snippet_scss();
-
-    return $snippetsscss;
-}
-
 /**
  * Helper function which wxtracts and returns the pluginname for the given callback name.
  * This function simply differentiates between real plugins and core components.