Merge branch '2.0' into 2

silverstripe · Jun 19, 2024 · 761c099 · 761c099
2 parents 8267407 + 902d4c3
commit 761c099
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Library.php b/src/Library.php
@@ -115,7 +115,7 @@ public function getBasePublicPath()
     {
         $projectPath = $this->getBasePath();
         $resourceDir = $this->getResourcesDir();
-        $publicPath = Util::joinPaths($projectPath, self::PUBLIC_PATH, $resourceDir);
+        $publicPath = Util::joinPaths($projectPath, Library::PUBLIC_PATH, $resourceDir);
         return $publicPath;
     }
 
@@ -138,7 +138,7 @@ public function getPath()
      */
     public function getRelativePath()
     {
-        return trim(substr($this->path ?? '', strlen($this->basePath ?? '')), self::TRIM_CHARS ?? '');
+        return trim(substr($this->path ?? '', strlen($this->basePath ?? '')), Library::TRIM_CHARS ?? '');
     }
 
     /**
@@ -271,13 +271,13 @@ public function getResourcesDir()
         $rootProject = new JsonFile($rootComposerFile, null, new NullIO());
 
         if (!$rootProject->exists()) {
-            return self::DEFAULT_RESOURCES_DIR;
+            return Library::DEFAULT_RESOURCES_DIR;
         }
 
         $rootProjectData = $rootProject->read();
         $resourcesDir = isset($rootProjectData['extra']['resources-dir'])
             ? $rootProjectData['extra']['resources-dir']
-            : self::DEFAULT_RESOURCES_DIR;
+            : Library::DEFAULT_RESOURCES_DIR;
 
 
         if (preg_match('/^[_\-a-z0-9]+$/i', $resourcesDir ?? '')) {

diff --git a/src/VendorPlugin.php b/src/VendorPlugin.php
@@ -46,7 +46,7 @@ class VendorPlugin implements PluginInterface, EventSubscriberInterface, Capable
     /**
      * Define default as 'auto'
      */
-    const METHOD_DEFAULT = self::METHOD_AUTO;
+    const METHOD_DEFAULT = VendorPlugin::METHOD_AUTO;
 
     /**
      * @var Filesystem