[composer] [autoload] Added start.php to autoload.files in composer.json #756

DanieleAlessandra · 2024-11-05T13:50:48Z

No description provided.

swashata · 2024-11-27T06:44:34Z

start.php

-	) {
-		$this_sdk_relative_path = '../' . $themes_directory_name . '/' . $theme_candidate_basename;
+	// This change ensures that the condition works even if the SDK is located in a subdirectory (e.g., vendor)
+	$theme_candidate_basename = str_replace($themes_directory . '/' . get_stylesheet() . '/', '', $fs_root_path );


@DanieleAlessandra While I understand your logic, I think the placement of it can be made better.

The variable $theme_candidate_basename means the "basename" of the theme itself, it doesn't need to be the basename of the SDK directory inside the theme.

So either

Rename this variable to something like $theme_candidate_sdk_basename

Or change the logic of $is_current_active_theme

swashata · 2024-11-27T06:46:19Z

start.php

+	$theme_candidate_basename = str_replace($themes_directory . '/' . get_stylesheet() . '/', '', $fs_root_path );
+
+	// Check if the current file is part of the active theme.
+	$is_current_active_theme = $file_path == $themes_directory . '/' . get_stylesheet() . '/' . $theme_candidate_basename . '/' . basename($file_path);


I would name the variable like

$is_current_active_theme --> $is_current_sdk_from_active_theme

$is_current_parent_theme --> $is_current_sdk_from_parent_theme.

swashata · 2024-11-27T06:52:28Z

start.php

@@ -176,7 +190,8 @@ function_exists( 'wp_is_json_request' ) &&
 	     $this_sdk_version != $fs_active_plugins->plugins[ $this_sdk_relative_path ]->version
 	) {
 		if ( $is_theme ) {
-			$plugin_path = basename( dirname( $this_sdk_relative_path ) );
+			// Saving relative path and not only directory name as it could be a subfolder
+			$plugin_path = $this_sdk_relative_path;


This is creating an anomaly in logic. For plugins, we are saving the basename of the plugin, but for theme, we are saving the SDK's relative path! Can't we do better here? That is for both plugin and theme, save the basename?

swashata · 2024-11-27T06:52:57Z

start.php

@@ -229,7 +244,8 @@ function_exists( 'wp_is_json_request' ) &&
 			$is_newest_sdk_plugin_active = is_plugin_active( $fs_newest_sdk->plugin_path );
 		} else {
 			$current_theme               = wp_get_theme();
-			$is_newest_sdk_plugin_active = ( $current_theme->stylesheet === $fs_newest_sdk->plugin_path );
+			// Detect if current theme is the one registered as newer SDK
+			$is_newest_sdk_plugin_active = ( strpos( $fs_newest_sdk->plugin_path, '/' . $themes_directory_name . '/' . $current_theme->stylesheet . '/' ) !== false );


Please see my suggestion above, perhaps we can skip this change!

swashata · 2024-11-27T06:53:19Z

start.php

@@ -238,7 +254,8 @@ function_exists( 'wp_is_json_request' ) &&
             * from happening by keeping the SDK info stored in the `fs_active_plugins` option.
             */
            if ( ! $is_newest_sdk_plugin_active && $current_theme_parent instanceof WP_Theme ) {
-                $is_newest_sdk_plugin_active = ( $fs_newest_sdk->plugin_path === $current_theme_parent->stylesheet );
+				// Detect if current theme parent is the one registered as newer SDK
+				$is_newest_sdk_plugin_active = ( strpos( $fs_newest_sdk->plugin_path, '../' . $themes_directory_name . '/' . $current_theme_parent->stylesheet . '/' ) === 0 );


Please see my suggestion

swashata · 2024-11-27T06:53:35Z

start.php

@@ -309,6 +326,9 @@ function_exists( 'wp_is_json_request' ) &&
 	}

 	if ( class_exists( 'Freemius' ) ) {
+		if ($is_theme && $is_current_sdk_newest) {


Looks like you forgot to remove this part?

…t work also when SDK is stored in a subfolder (e.g. vendor folder)

…o load, even with themes and child themes

swashata

Please take a look at my minor changes here, thanks.

swashata · 2024-11-28T12:17:57Z

start.php

+        } else {
+            $current_theme = wp_get_theme();
+            // Detect if current theme is the one registered as newer SDK
+            $is_newest_sdk_module_active = ( strpos( $fs_newest_sdk->plugin_path,


$is_newest_sdk_module_active = ( strpos( $fs_newest_sdk->plugin_path, '/' . $themes_directory_name . '/' . $current_theme->stylesheet . '/' ) !== false );

swashata · 2024-11-28T12:18:30Z

start.php

+        } else {
+            $current_theme = wp_get_theme();
+            // Detect if current theme is the one registered as newer SDK
+            $is_newest_sdk_module_active = ( strpos( $fs_newest_sdk->plugin_path,


Also do you think a === 0 would be a more appropriate check here, like the one for the parent theme? (line 268)

swashata · 2024-11-28T12:18:56Z

start.php


            $current_theme_parent = $current_theme->parent();

            /**
             * If the current theme is a child of the theme that has the newest SDK, this prevents a redirects loop
             * from happening by keeping the SDK info stored in the `fs_active_plugins` option.
             */
-            if ( ! $is_newest_sdk_plugin_active && $current_theme_parent instanceof WP_Theme ) {
-                $is_newest_sdk_plugin_active = ( $fs_newest_sdk->plugin_path === $current_theme_parent->stylesheet );
+            if ( ! $is_newest_sdk_module_active && $current_theme_parent instanceof WP_Theme ) {


// Detect if current theme parent is the one registered as newer SDK $is_newest_sdk_module_active = ( strpos( $fs_newest_sdk->plugin_path, '../' . $themes_directory_name . '/' . $current_theme_parent->stylesheet . '/' ) === 0 );

swashata · 2024-11-28T12:21:43Z

start.php

@@ -15,7 +15,7 @@
 	 *
 	 * @var string
 	 */
-	$this_sdk_version = '2.9.0.4';
+	$this_sdk_version = '2.9.0.5';


@DanieleAlessandra You will find in line 40 a note about theme. Let's add something for your changes too

Something like this:

* We updated the logic to support SDK loading from a subfolder of a theme as well as from a parent theme. * This allows the SDK to be loaded from composer dependencies or from a custom `vendor/freemius` folder. * * @since 2.9.0.5 * @author Daniele Alessandra (@DanielleAlessandra)

… stylesheet

swashata

Nicely done

DanieleAlessandra requested a review from swashata November 5, 2024 13:50

swashata requested changes Nov 27, 2024

View reviewed changes

DanieleAlessandra added 3 commits November 27, 2024 12:02

[composer] [autoload] Added start.php to autoload.files in composer.json

770e2fc

[composer] [vendor] [themes] Changed logic related to theme to make i…

cdf0d1b

…t work also when SDK is stored in a subfolder (e.g. vendor folder)

[themes] [child theme] [load priority] Correctly determine SDK file t…

9f441c3

…o load, even with themes and child themes

DanieleAlessandra force-pushed the feature/autoload-start-file branch 2 times, most recently from a87f124 to ec88565 Compare November 27, 2024 12:37

Code style, renamed variables, removed unused $is_theme check.

1eaa67a

DanieleAlessandra force-pushed the feature/autoload-start-file branch 2 times, most recently from 79c7a9d to fb64c61 Compare November 28, 2024 08:39

Code Style (wordpress)

d3ac8fa

DanieleAlessandra force-pushed the feature/autoload-start-file branch from fb64c61 to d3ac8fa Compare November 28, 2024 08:52

DanieleFreemius added 2 commits November 28, 2024 10:05

Code styling (spaces instead of tabs)

29c5934

Revert indent spacing

620feeb

swashata reviewed Nov 28, 2024

View reviewed changes

DanieleAlessandra force-pushed the feature/autoload-start-file branch from 980cb5e to e3c1b84 Compare November 28, 2024 14:36

Fix strpos index and use get_stylesheet() instead of private property…

577f8d7

… stylesheet

DanieleAlessandra force-pushed the feature/autoload-start-file branch from e3c1b84 to 577f8d7 Compare November 28, 2024 14:44

swashata approved these changes Nov 28, 2024

View reviewed changes

swashata merged commit 84bbdb1 into develop Nov 28, 2024
5 checks passed

swashata deleted the feature/autoload-start-file branch November 28, 2024 15:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[composer] [autoload] Added start.php to autoload.files in composer.json #756

[composer] [autoload] Added start.php to autoload.files in composer.json #756

DanieleAlessandra commented Nov 5, 2024

swashata Nov 27, 2024

swashata Nov 27, 2024

swashata Nov 27, 2024

swashata Nov 27, 2024

swashata Nov 27, 2024

swashata Nov 27, 2024

swashata left a comment

swashata Nov 28, 2024

swashata Nov 28, 2024

swashata Nov 28, 2024

swashata Nov 28, 2024

swashata left a comment

[composer] [autoload] Added start.php to autoload.files in composer.json #756

[composer] [autoload] Added start.php to autoload.files in composer.json #756

Conversation

DanieleAlessandra commented Nov 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

swashata left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

swashata left a comment

Choose a reason for hiding this comment