Release for v1.0.2

README.md

@@ -25,7 +25,7 @@ class View {
     }
 
     public function display_page() {
-		$plugin_family = $this->plugin_family->get_filtered_plugins( 'imagify-plugin/imagify' );
+		$plugin_family = $this->plugin_family->get_filtered_plugins( 'imagify/imagify' );
 
 		$data = [
 			'plugin_family' => $plugin_family['uncategorized'],

src/Controller/PluginFamily.php

@@ -35,7 +35,7 @@ public static function get_post_install_event(): array {
 		$allowed_plugin = [
 			'uk-cookie-consent',
 			'backwpup',
-			'imagify-plugin',
+			'imagify',
 			'seo-by-rank-math',
 			'wp-rocket',
 		];

src/Model/PluginFamily.php

@@ -13,7 +13,7 @@ class PluginFamily {
 	 * @var array
 	 */
 	protected $wp_rocket_referrer = [
-		'imagify-plugin'    => 'imagify',
+		'imagify'           => 'imagify',
 		'seo-by-rank-math'  => '',
 		'backwpup'          => '',
 		'uk-cookie-consent' => '',
@@ -60,7 +60,7 @@ public function filter_plugins_by_activation( array $plugins, string $main_plugi
 				 * to re-add them back using array_merge to be displayed after
 				 * plugins that are not installed or not activated.
 				 */
-				if ( is_plugin_active( $plugin_path ) ) {
+				if ( is_plugin_active( $plugin_path ) && $main_plugin . '.php' !== $plugin_path ) {
 					// set cta data of active plugins.
 					$plugins[ $cat ]['plugins'][ $plugin ]['cta'] = [
 						'text' => 'Activated',
@@ -71,16 +71,18 @@ public function filter_plugins_by_activation( array $plugins, string $main_plugi
 					$active_plugins[ $plugin ] = $plugins[ $cat ]['plugins'][ $plugin ];
 
 					// Remove active plugin from current category.
-					unset( $cat_data['plugins'][ $plugin ] );
+					$active_plugin = $plugins[ $cat ]['plugins'][ $plugin ];
+					unset( $plugins[ $cat ]['plugins'][ $plugin ] );
 
 					// Send active plugin to the end of array in current category.
-					$cat_data['plugins'][ $plugin ] = $plugins[ $cat ]['plugins'][ $plugin ];
+					$plugins[ $cat ]['plugins'][ $plugin ] = $active_plugin;
 
 					// Remove category with active plugin from current array.
+					$active_cat = $plugins[ $cat ];
 					unset( $plugins[ $cat ] );
 
 					// Send category with active plugins to the end of array.
-					$plugins[ $cat ] = $cat_data;
+					$plugins[ $cat ] = $active_cat;
 					continue;
 				}
 
@@ -92,7 +94,7 @@ public function filter_plugins_by_activation( array $plugins, string $main_plugi
 					'plugin_to_install' => rawurlencode( $plugin ),
 				];
 
-				if ( 'imagify-plugin' === $plugin_slug ) {
+				if ( 'imagify' === $plugin_slug ) {
 					$args = [
 						'action'           => 'install_imagify_from_partner_' . $main_plugin_slug,
 						'_wpnonce'         => wp_create_nonce( 'install_imagify_from_partner' ),

src/Model/wp_media_plugins.php

@@ -7,7 +7,7 @@
 	'optimize_performance' => [
 		'title'   => 'Optimize Performance',
 		'plugins' => [
-			'wp-rocket/wp-rocket'    => [
+			'wp-rocket/wp-rocket' => [
 				'logo'  => [
 					'file'  => 'logo-wp-rocket.svg',
 					'width' => '50%',
@@ -16,7 +16,7 @@
 				'desc'  => 'WP Rocket is the easiest way to make your WordPress website faster and boost your Google PageSpeed score. Get more traffic, better engagement, and higher conversions effortlessly.',
 				'link'  => '',
 			],
-			'imagify-plugin/imagify' => [
+			'imagify/imagify'     => [
 				'logo'  => [
 					'file'  => 'logo-imagify.svg',
 					'width' => '50%',

tests/Fixtures/src/Model/PluginFamily/filterPluginsByActivation.php

@@ -13,7 +13,7 @@
 				'desc'  => 'WP Rocket is the easiest way to make your WordPress website faster and boost your Google PageSpeed score. Get more traffic, better engagement, and higher conversions effortlessly.',
 				'link'  => 'https://wp-rocket.me/?utm_source=imagify-coupon&utm_medium=plugin&utm_campaign=imagify',
 			],
-			'imagify-plugin/imagify' => [
+			'imagify/imagify' => [
 				'logo'  => [
 					'file'  => 'logo-imagify.svg',
 					'width' => '50%',
@@ -116,7 +116,7 @@
     'optimize_performance' => [
 		'title'   => 'Optimize Performance',
 		'plugins' => [
-			'imagify-plugin/imagify' => [
+			'imagify/imagify' => [
 				'logo'  => [
 					'file'  => 'logo-imagify.svg',
 					'width' => '50%',
@@ -202,7 +202,7 @@
             'url'  => 'http://example.org/wp-admin/admin-post.php?action=plugin_family_install_wp-rocket&_wpnonce=9a68f00b8d&plugin_to_install=wp-rocket%2Fwp-rocket'
         ],
     ],
-    'imagify-plugin/imagify' => [
+    'imagify/imagify' => [
         'logo'  => [
             'file'  => 'logo-imagify.svg',
             'width' => '50%',
@@ -257,7 +257,7 @@
             'url'  => 'https://wp-rocket.me/?utm_source=-coupon&utm_medium=plugin&utm_campaign='
         ],
     ],
-    'imagify-plugin/imagify' => [
+    'imagify/imagify' => [
         'logo'  => [
             'file'  => 'logo-imagify.svg',
             'width' => '50%',
@@ -298,6 +298,146 @@
     ],
 ];
 
+$expectedWithSecondOrLastPluginActiveInCategory = [
+    'optimize_performance' => [
+		'title'   => 'Optimize Performance',
+		'plugins' => [
+			'imagify/imagify' => [
+				'logo'  => [
+					'file'  => 'logo-imagify.svg',
+					'width' => '50%',
+				],
+				'title' => 'Speed Up Your Website With Lighter Images',
+				'desc'  => 'Imagify is the easiest WordPress image optimizer. It automatically compresses images, converts them to WebP and AVIF formats, and lets you resize and optimize with just one click!',
+				'link'  => 'https://imagify.io/',
+                'cta'   => [
+                    'text' => 'Install',
+                    'url'  => 'http://example.org/wp-admin/admin-post.php?action=install_imagify_from_partner_wp-rocket&_wpnonce=9a68f00b8d&_wp_http_referer=https%3A%2F%2Fexample.org%2Fwp-admin'
+                ],
+			],
+		],
+	],
+    'boost_traffic'        => [
+		'title'   => 'Boost Traffic',
+		'plugins' => [
+			'seo-by-rank-math/rank-math' => [
+				'logo'  => [
+					'file'  => 'logo-rank-math.svg',
+					'width' => '60%',
+				],
+				'title' => 'The Swiss Army Knife of SEO Tools',
+				'desc'  => 'Rank Math SEO is the Best WordPress SEO plugin with the features of many SEO and AI SEO tools in a single package to help multiply your SEO traffic.',
+				'link'  => 'https://rankmath.com/wordpress/plugin/seo-suite/',
+                'cta'   => [
+                    'text' => 'Install',
+                    'url'  => 'http://example.org/wp-admin/admin-post.php?action=plugin_family_install_seo-by-rank-math&_wpnonce=9a68f00b8d&plugin_to_install=seo-by-rank-math%2Frank-math'
+                ], 
+			],
+		],
+	],
+	'protect_secure'       => [
+		'title'   => 'Protect & Secure',
+		'plugins' => [
+			'backwpup/backwpup'                   => [
+				'logo'  => [
+					'file'  => 'logo-backwpup.svg',
+					'width' => '60%',
+				],
+				'title' => 'The Easiest Way to Protect Your Website',
+				'desc'  => 'BackWPup is the most comprehensive and user-friendly backup & restore plugin for WordPress. Easily schedule automatic backups, securely store and restore with just a few clicks!',
+				'link'  => 'https://backwpup.com/',
+                'cta'   => [
+                    'text' => 'Install',
+                    'url'  => 'http://example.org/wp-admin/admin-post.php?action=plugin_family_install_backwpup&_wpnonce=9a68f00b8d&plugin_to_install=backwpup%2Fbackwpup'
+                ],
+			],
+			'uk-cookie-consent/uk-cookie-consent' => [
+				'logo'  => [
+					'file'  => 'logo-termly.svg',
+					'width' => '50%',
+				],
+				'title' => 'GDPR/CCPA Cookie Consent Banner',
+				'desc'  => 'One of the easiest, most comprehensive, and popular cookie consent plugins available. Google Gold Certified Partner to quickly comply with data privacy laws from around the world.',
+				'link'  => 'https://termly.io/resources/articles/wordpress-cookies-guide/',
+                'cta'   => [
+                    'text' => 'Activated',
+                    'url'  => '#'
+                ],
+			],
+		],
+	],
+];
+
+$expectedOptimizeCategoryAsFirstWhenContainingMainPlugin = [
+    'optimize_performance' => [
+		'title'   => 'Optimize Performance',
+		'plugins' => [
+			'imagify/imagify' => [
+				'logo'  => [
+					'file'  => 'logo-imagify.svg',
+					'width' => '50%',
+				],
+				'title' => 'Speed Up Your Website With Lighter Images',
+				'desc'  => 'Imagify is the easiest WordPress image optimizer. It automatically compresses images, converts them to WebP and AVIF formats, and lets you resize and optimize with just one click!',
+				'link'  => 'https://imagify.io/',
+                'cta'   => [
+                    'text' => 'Install',
+                    'url'  => 'http://example.org/wp-admin/admin-post.php?action=install_imagify_from_partner_wp-rocket&_wpnonce=9a68f00b8d&_wp_http_referer=https%3A%2F%2Fexample.org%2Fwp-admin'
+                ],
+			],
+		],
+	],
+    'boost_traffic'        => [
+		'title'   => 'Boost Traffic',
+		'plugins' => [
+			'seo-by-rank-math/rank-math' => [
+				'logo'  => [
+					'file'  => 'logo-rank-math.svg',
+					'width' => '60%',
+				],
+				'title' => 'The Swiss Army Knife of SEO Tools',
+				'desc'  => 'Rank Math SEO is the Best WordPress SEO plugin with the features of many SEO and AI SEO tools in a single package to help multiply your SEO traffic.',
+				'link'  => 'https://rankmath.com/wordpress/plugin/seo-suite/',
+                'cta'   => [
+                    'text' => 'Install',
+                    'url'  => 'http://example.org/wp-admin/admin-post.php?action=plugin_family_install_seo-by-rank-math&_wpnonce=9a68f00b8d&plugin_to_install=seo-by-rank-math%2Frank-math'
+                ], 
+			],
+		],
+	],
+	'protect_secure'       => [
+		'title'   => 'Protect & Secure',
+		'plugins' => [
+			'backwpup/backwpup'                   => [
+				'logo'  => [
+					'file'  => 'logo-backwpup.svg',
+					'width' => '60%',
+				],
+				'title' => 'The Easiest Way to Protect Your Website',
+				'desc'  => 'BackWPup is the most comprehensive and user-friendly backup & restore plugin for WordPress. Easily schedule automatic backups, securely store and restore with just a few clicks!',
+				'link'  => 'https://backwpup.com/',
+                'cta'   => [
+                    'text' => 'Install',
+                    'url'  => 'http://example.org/wp-admin/admin-post.php?action=plugin_family_install_backwpup&_wpnonce=9a68f00b8d&plugin_to_install=backwpup%2Fbackwpup'
+                ],
+			],
+			'uk-cookie-consent/uk-cookie-consent' => [
+				'logo'  => [
+					'file'  => 'logo-termly.svg',
+					'width' => '50%',
+				],
+				'title' => 'GDPR/CCPA Cookie Consent Banner',
+				'desc'  => 'One of the easiest, most comprehensive, and popular cookie consent plugins available. Google Gold Certified Partner to quickly comply with data privacy laws from around the world.',
+				'link'  => 'https://termly.io/resources/articles/wordpress-cookies-guide/',
+                'cta'   => [
+                    'text' => 'Install',
+                    'url'  => 'http://example.org/wp-admin/admin-post.php?action=plugin_family_install_uk-cookie-consent&_wpnonce=9a68f00b8d&plugin_to_install=uk-cookie-consent%2Fuk-cookie-consent'
+                ],
+			],
+		],
+	],
+];
+
 return [
     'testShouldReturnEmptyArrayIfEmptyArrayParsed' => [
         'config' => [
@@ -312,14 +452,14 @@
             'plugins' => $plugins,
             'main_plugin' => 'wp-rocket/wp-rocket',
             'order' => 'categorized',
-            'active_plugin' => 'imagify-plugin/imagify.php',
+            'active_plugin' => 'imagify/imagify.php',
         ],
         'expected' => $expectedActivePluginAsTheLastElement,
     ],
     'testShouldReturnCategoryWithActivePluginAsTheLastElement' => [
         'config' => [
             'plugins' => $plugins,
-            'main_plugin' => 'imagify-plugin/imagify',
+            'main_plugin' => 'imagify/imagify',
             'order' => 'uncategorized',
             'active_plugin' => 'seo-by-rank-math/rank-math.php',
         ],
@@ -344,4 +484,22 @@
         ],
         'expected' => $expectedUniqueInstallLinkForImagify,
     ],
+    'testShouldReturnAsExpectedWithSecondOrLastPluginActiveInCategory' => [
+        'config' => [
+            'plugins' => $plugins,
+            'main_plugin' => 'wp-rocket/wp-rocket',
+            'order' => 'categorized',
+            'active_plugin' => 'uk-cookie-consent/uk-cookie-consent.php',
+        ],
+        'expected' => $expectedWithSecondOrLastPluginActiveInCategory,
+    ],
+    'testShouldStillReturnOptimizeCategoryAsFirstWhenContainingMainPlugin' => [
+        'config' => [
+            'plugins' => $plugins,
+            'main_plugin' => 'wp-rocket/wp-rocket',
+            'order' => 'categorized',
+            'active_plugin' => 'wp-rocket/wp-rocket.php',
+        ],
+        'expected' => $expectedOptimizeCategoryAsFirstWhenContainingMainPlugin,
+    ]
 ];