Merge pull request #25 from stellarwp/feat/allow-paths-outside-of-themes-and-plugins

Allow paths outside of theme and plugins

Author: dpanta94

assets.php

@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Assets
  * Description: Asset library with a plugin bootstrap file for automated testing.
- * Version: 1.4.0
+ * Version: 1.4.1
  * Author: StellarWP
  * Author URI: https://stellarwp.com
  */

src/Assets/Config.php

@@ -146,6 +146,7 @@ public static function reset() {
 		static::$root_path           = '';
 		static::$path_urls           = [];
 		static::$version             = '';
+		Utils::clear_runtime_cache();
 	}
 
 	/**
@@ -196,6 +197,7 @@ public static function set_version( string $version ) {
 	 * Normalizes a path.
 	 *
 	 * @since 1.4.0
+	 * @since 1.4.1 Allow for paths that are not in the plugin or theme directory.
 	 *
 	 * @param string $path The path to normalize.
 	 *
@@ -211,9 +213,10 @@ protected static function normalize_path( string $path ): string {
 		if (
 			$plugins_content_dir_position === false
 			&& $themes_content_dir_position === false
+			&& strpos( $path, '/' ) !== 0
 		) {
-			// Default to plugins.
-			$path = $plugin_dir . $path;
+			// Default to plugins if a relative path is provided.
+			$path = trailingslashit( $plugin_dir ) . $path;
 		} elseif ( $plugins_content_dir_position !== false ) {
 			$path = substr( $path, $plugins_content_dir_position );
 		} elseif ( $themes_content_dir_position !== false ) {

src/Assets/Utils.php

@@ -101,6 +101,17 @@ public static function get_bases(): array {
 		return static::$bases[ $key ];
 	}
 
+	/**
+	 * Clears the runtime cache.
+	 *
+	 * @since 1.4.1
+	 *
+	 * @return void
+	 */
+	public static function clear_runtime_cache() {
+		static::$bases = [];
+	}
+
 	/**
 	 * Get the runtime cache key.
 	 *

tests/wpunit/ConfigTest.php

@@ -23,6 +23,24 @@ public function should_set_hook_prefix() {
 		$this->assertEquals( 'bork', Config::get_hook_prefix() );
 	}
 
+	public function paths_provider() {
+		yield 'plugin' => [ WP_PLUGIN_DIR . '/my-plugin/', '/var/www/html/wp-content/plugins/my-plugin/' ];
+		yield 'theme' => [ get_theme_file_path() . '/', get_theme_file_path() . '/' ];
+		yield 'mu-plugin' => [ WPMU_PLUGIN_DIR . '/my-plugin/', '/var/www/html/wp-content/mu-plugins/my-plugin/' ];
+		yield 'content' => [ WP_CONTENT_DIR . '/stuff/', '/var/www/html/wp-content/stuff/' ];
+		yield 'root' => [ ABSPATH . 'stuff/', '/var/www/html/stuff/' ];
+		yield 'relative' => [ 'my-plugin/', '/var/www/html/wp-content/plugins/my-plugin/' ];
+	}
+
+	/**
+	 * @test
+	 * @dataProvider paths_provider
+	 */
+	public function should_set_root_path_correctly( $path, $expected ) {
+		Config::set_path( $path );
+		$this->assertEquals( $expected, Config::get_path( $path ), Config::get_path( $path ) );
+	}
+
 	/**
 	 * @test
 	 */
@@ -32,6 +50,15 @@ public function should_set_path() {
 		$this->assertEquals( WP_PLUGIN_DIR . '/assets/', Config::get_path() );
 	}
 
+	/**
+	 * @test
+	 */
+	public function should_set_path_outside_of_themes_and_plugins() {
+		Config::set_path( ABSPATH . 'foo/' );
+
+		$this->assertEquals( '/var/www/html/foo/', Config::get_path() );
+	}
+
 	/**
 	 * @test
 	 */