update

Author: iruzevic

src/AdminMenus/AbstractAdminMenu.php

@@ -10,17 +10,15 @@
 
 namespace EightshiftLibs\AdminMenus;
 
-use EightshiftLibs\Helpers\Helpers;
 use EightshiftLibs\Services\ServiceInterface;
-use EightshiftLibs\Blocks\RenderableBlockInterface;
 use Exception;
 
 /**
  * Abstract class AbstractAdminMenu class.
  *
  * Class responsible for creating admin menus, separately from CPT admin menus.
  */
-abstract class AbstractAdminMenu implements ServiceInterface, RenderableBlockInterface
+abstract class AbstractAdminMenu implements ServiceInterface
 {
 	/**
 	 * Register all the hooks
@@ -78,29 +76,7 @@ public function processAdminMenu($attr): void
 		$attr['adminMenuSlug'] = $this->getMenuSlug();
 		$attr['nonceField'] = $this->renderNonce();
 
-		echo $this->render((array)$attr); // phpcs:ignore
-	}
-
-	/**
-	 * Render the current view.
-	 *
-	 * @param array<string, mixed>  $attributes Array of attributes passed to the view.
-	 * @param string $innerBlockContent Not used here.
-	 *
-	 * @return string Rendered HTML.
-	 * @throws Exception On missing attributes OR missing template.
-	 */
-	public function render(array $attributes = [], string $innerBlockContent = ''): string
-	{
-		try {
-			return Helpers::render($this->getViewComponent(), $attributes);
-		} catch (Exception $exception) { // To do: once new libs are released, replace with ComponentException.
-			// Don't let exceptions bubble up. Just render the exception message into the admin menu.
-			return \sprintf(
-				'<pre>%s</pre>',
-				$exception->getMessage()
-			);
-		}
+		echo $this->getViewComponent($attr); // phpcs:ignore
 	}
 
 	/**

src/AdminMenus/AbstractAdminSubMenu.php

@@ -27,21 +27,36 @@ abstract class AbstractAdminSubMenu extends AbstractAdminMenu
 	 */
 	public function register(): void
 	{
-		\add_action(
-			'admin_menu',
-			function () {
-				\add_submenu_page(
-					$this->getParentMenu(),
-					$this->getTitle(),
-					$this->getMenuTitle(),
-					$this->getCapability(),
-					$this->getMenuSlug(),
-					[$this, 'processAdminSubmenu']
-				);
-			}
+		\add_action('admin_menu', [$this, 'callback'], $this->getPriorityOrder());
+	}
+
+	/**
+	 * Return action callback method.
+	 *
+	 * @return void
+	 */
+	public function callback(): void
+	{
+		\add_submenu_page(
+			$this->getParentMenu(),
+			$this->getTitle(),
+			$this->getMenuTitle(),
+			$this->getCapability(),
+			$this->getMenuSlug(),
+			[$this, 'processAdminSubmenu']
 		);
 	}
 
+	/**
+	 * Return hook priority order.
+	 *
+	 * @return integer
+	 */
+	public function getPriorityOrder(): int
+	{
+		return 200;
+	}
+
 	/**
 	 * Process the admin submenu attributes and prepare rendering.
 	 *
@@ -60,7 +75,7 @@ public function processAdminSubmenu($attr): void
 		$attr['adminMenuSlug'] = $this->getMenuSlug();
 		$attr['nonceField'] = $this->renderNonce();
 
-		echo $this->render((array)$attr); // phpcs:ignore
+		echo $this->getViewComponent($attr); // phpcs:ignore
 	}
 
 	/**

src/AdminMenus/AdminMenuExample.php

@@ -11,6 +11,7 @@
 namespace %g_namespace%\AdminMenus;
 
 use %g_use_libs%\AdminMenus\AbstractAdminMenu;
+use %g_use_libs%\Helpers\Helpers;
 
 /**
  * AdminMenuExample class.
@@ -126,11 +127,16 @@ protected function getPosition(): int
 	/**
 	 * Get the view component that will render correct view.
 	 *
+	 * @param array<string, mixed> $attributes Attributes passed to the view.
+	 *
 	 * @return string View uri.
 	 */
-	protected function getViewComponent(): string
+	protected function getViewComponent(array $attributes): string
 	{
-		return '%view_component%';
+		return Helpers::render(
+			'%view_component%',
+			$attributes
+		);
 	}
 
 	/**

src/AdminMenus/AdminSubMenuExample.php

@@ -11,6 +11,7 @@
 namespace %g_namespace%\AdminMenus;
 
 use %g_use_libs%\AdminMenus\AbstractAdminSubMenu;
+use %g_use_libs%\Helpers\Helpers;
 
 /**
  * AdminSubMenuExample class.
@@ -93,11 +94,16 @@ protected function getParentMenu(): string
 	/**
 	 * Get the view component that will render correct view.
 	 *
+	 * @param array<string, mixed> $attributes Attributes passed to the view.
+	 *
 	 * @return string View uri.
 	 */
-	protected function getViewComponent(): string
+	protected function getViewComponent(array $attributes): string
 	{
-		return '%view_component%';
+		return Helpers::render(
+			'%view_component%',
+			$attributes
+		);
 	}
 
 	/**

src/Geolocation/GeolocationExample.php

@@ -11,6 +11,7 @@
 namespace %g_namespace%\Geolocation;
 
 use %g_use_libs%\Geolocation\AbstractGeolocation;
+use %g_use_libs%\Helpers\Helpers;
 
 /**
  * Class Geolocation
@@ -42,7 +43,7 @@ public function getGeolocationCookieName(): string
 	 */
 	public function getGeolocationPharLocation(): string
 	{
-		return __DIR__ . \DIRECTORY_SEPARATOR . 'geoip2.phar';
+		return Helpers::getEightshiftOutputPath('geoip2.phar');
 	}
 
 	/**
@@ -52,6 +53,6 @@ public function getGeolocationPharLocation(): string
 	 */
 	public function getGeolocationDbLocation(): string
 	{
-		return __DIR__ . \DIRECTORY_SEPARATOR . 'GeoLite2-Country.mmdb';
+		return Helpers::getEightshiftOutputPath('GeoLite2-Country.mmdb');
 	}
 }