Merge branch 'release/2.0.4'

README.md

@@ -344,12 +344,12 @@ $view->render('path/to/file',['var' => 'foo']);
 
 We have a number of hooks you can use to extend or modify how the app works. All of our internal hooks have pinkcrab/pf/app/ prefix, but we have a class of constants you can use `PinkCrab\Perique\Application\Hooks:: APP_INIT_*`
 
-* `Hooks:: APP_INIT_PRE_BOOT`
-* `Hooks:: APP_INIT_PRE_REGISTRATION`
-* `Hooks:: APP_INIT_POST_REGISTRATION`
-* `Hooks:: APP_INIT_CONFIG_VALUES`
-* `Hooks:: APP_INIT_REGISTRATION_CLASS_LIST`
-* `Hooks:: APP_INIT_SET_DI_RULES`
+* `Hooks::APP_INIT_PRE_BOOT`
+* `Hooks::APP_INIT_PRE_REGISTRATION`
+* `Hooks::APP_INIT_POST_REGISTRATION`
+* `Hooks::APP_INIT_CONFIG_VALUES`
+* `Hooks::APP_INIT_REGISTRATION_CLASS_LIST`
+* `Hooks::APP_INIT_SET_DI_RULES`
 * `Hooks::COMPONENT_ALIASES`
 * `Hooks::MODULE_MANAGER`
 
@@ -363,6 +363,7 @@ http://www.opensource.org/licenses/mit-license.html
 
 ## Change Log ##
 
+* 2.0.4 - Fix bugs where component paths were not being resolved correctly when added using the alias filter.
 * 2.0.3 - Add PHP8.3 to test suites
 * 2.0.2 - Test suites updated to include WP6.3 & 6.4
 * 2.0.1 - Update dev dependencies and remove plugin.php from root of repo.

src/Services/View/Component/Component_Compiler.php

@@ -49,7 +49,9 @@ class Component_Compiler {
 	 */
 	private array $component_aliases = array();
 
-	/** @param array<string, string> $component_aliases */
+	/**
+	 * @param array<string, string> $component_aliases
+	 */
 	public function __construct( string $component_base_path = '', array $component_aliases = array() ) {
 		$this->component_base_path = $component_base_path;
 		$this->component_aliases   = \apply_filters( Hooks::COMPONENT_ALIASES, $component_aliases );
@@ -76,7 +78,7 @@ private function get_component_path( Component $component ): string {
 		// Check aliases.
 		$aliases = \apply_filters( Hooks::COMPONENT_ALIASES, $this->component_aliases );
 
-		if ( isset( $aliases[ get_class( $component ) ] ) ) {
+		if ( \array_key_exists( get_class( $component ), $this->component_aliases ) ) {
 			return esc_attr( $aliases[ get_class( $component ) ] );
 		}
 
@@ -104,7 +106,7 @@ private function get_component_path( Component $component ): string {
 	/**
 	 * Attempts to extract a defined Annotation from component class doc block.
 	 *
-	 * @param string $annotation
+	 * @param string    $annotation
 	 * @param Component $component
 	 * @return string|null
 	 */

src/Services/View/PHP_Engine.php

@@ -100,8 +100,12 @@ public function component( Component $component, bool $print = true ): ?string {
 
 		// Compile the component.
 		$compiled = $this->component_compiler->compile( $component ); // @phpstan-ignore-line, checked above.
-		$template = $this->maybe_resolve_dot_notation( $compiled->template() );
-		$view     = sprintf( '%s%s%s.php', $this->base_view_path, \DIRECTORY_SEPARATOR, trim( $template ) );
+		$template = $compiled->template();
+
+		$view = file_exists( $template )
+			? $template
+			: sprintf( '%s%s%s.php', $this->base_view_path, \DIRECTORY_SEPARATOR, trim( $this->maybe_resolve_dot_notation( $template ) ) );
+
 		if ( $print ) {
 			print( $this->render_buffer( $view, $compiled->data() ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 			return null;
@@ -110,7 +114,6 @@ public function component( Component $component, bool $print = true ): ?string {
 		}
 	}
 
-
 	/**
 	 * Renders a view Model
 	 *

tests/Fixtures/views/components/alias-dir/some-view.php

@@ -0,0 +1,2 @@
+<!-- This is the same as the P tag, just a unique path -->
+<p class="<?php echo $class; ?>">ALIAS <?php $this->component( $span ); ?></p>

tests/Integration/View/Test_Use_View.php

@@ -14,6 +14,7 @@
 
 use WP_UnitTestCase;
 use PinkCrab\Loader\Hook_Loader;
+use PinkCrab\Perique\Application\Hooks;
 use PinkCrab\Perique\Application\App_Factory;
 use PinkCrab\Perique\Interfaces\DI_Container;
 use PinkCrab\Perique\Services\Dice\PinkCrab_Dice;
@@ -33,7 +34,6 @@
  * @group integration
  * @group view
  * @group components
- *
  */
 class Test_Use_View extends WP_UnitTestCase {
 
@@ -46,15 +46,16 @@ class Test_Use_View extends WP_UnitTestCase {
 	public function tear_down(): void {
 		parent::tear_down();
 		self::unset_app_instance();
-
 	}
 
 	public function set_up() {
 		parent::set_up();
 		self::unset_app_instance();
 	}
 
-	/** @testdox By default the default component path should be {view_path}/component */
+	/**
+ * @testdox By default the default component path should be {view_path}/component
+*/
 	public function test_render_component_with_base_path() {
 		$app = ( new App_Factory( \FIXTURES_PATH ) )
 			->default_setup()
@@ -65,6 +66,35 @@ public function test_render_component_with_base_path() {
 			array( 'component' => new P_Tag_Component( 'test', new Span( 'span-class', 'span-content' ) ) ),
 			false
 		);
-		$this->assertEquals('<p class="test"><span class="span-class">span-content</span></p>', $output);
+		$this->assertEquals( '<p class="test"><span class="span-class">span-content</span></p>', $output );
+	}
+
+	/**
+	 * @testdox It should be possible to use a component alias and have it use the full path.
+	 * @see  https://github.com/Pink-Crab/Perique-Framework/issues/182
+	 */
+	public function test_render_component_with_alias() {
+		add_filter(
+			Hooks::COMPONENT_ALIASES,
+			function ( array $aliases ): array {
+				$aliases[ P_Tag_Component::class ] = \FIXTURES_PATH . '/views/components/alias-dir/some-view.php';
+				return $aliases;
+			}
+		);
+
+		$app = ( new App_Factory( \FIXTURES_PATH ) )
+			->default_setup()
+			->boot();
+
+		$output = $app::view()->render(
+			'render-component',
+			array( 'component' => new P_Tag_Component( 'test', new Span( 'span-class', 'span-content' ) ) ),
+			false
+		);
+
+		// Remove the filter.
+		add_filter( Hooks::COMPONENT_ALIASES, fn ( array $aliases ): array  => array() );
+
+		$this->assertStringContainsString( '<p class="test">ALIAS <span class="span-class">span-content</span></p>', $output );
 	}
 }