Merge remote-tracking branch 'origin/wip/1.2' into wip/1.2-code-analysis

wintercms · Feb 25, 2022 · 0fd415d · 0fd415d
2 parents 4f1db25 + 6cb008f
commit 0fd415d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/Filesystem/FilesystemServiceProvider.php b/src/Filesystem/FilesystemServiceProvider.php
@@ -47,8 +47,9 @@ protected function registerNativeFilesystem()
             $files->filePermissions = $config->get('cms.defaultMask.file', null);
             $files->folderPermissions = $config->get('cms.defaultMask.folder', null);
             $files->pathSymbols = [
-                '$' => base_path() . $config->get('cms.pluginsDir', '/plugins'),
                 '~' => base_path(),
+                '$' => base_path() . $config->get('cms.pluginsDir', '/plugins'),
+                '#' => base_path() . $config->get('cms.themesDir', '/themes'),
             ];
             return $files;
         });

diff --git a/src/Scaffold/GeneratorCommand.php b/src/Scaffold/GeneratorCommand.php
@@ -16,30 +16,22 @@
 abstract class GeneratorCommand extends Command
 {
     /**
-     * The filesystem instance.
-     *
-     * @var \Winter\Storm\Filesystem\Filesystem
+     * @var \Winter\Storm\Filesystem\Filesystem The filesystem instance.
      */
     protected $files;
 
     /**
-     * The type of class being generated.
-     *
-     * @var string
+     * @var string The type of class being generated.
      */
     protected $type;
 
     /**
-     * A mapping of stub to generated file.
-     *
-     * @var array
+     * @var array A mapping of stub to generated file.
      */
     protected $stubs = [];
 
     /**
-     * An array of variables to use in stubs.
-     *
-     * @var array
+     * @var array An array of variables to use in stubs.
      */
     protected $vars = [];