Load page route loader by checking Symfony version

Author: iMattPro

routing/page_loader.php

@@ -11,29 +11,23 @@
 
 namespace phpbb\pages\routing;
 
-use ReflectionMethod;
-use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 if (!defined('IN_PHPBB'))
 {
 	exit;
 }
 
 /**
- * This code determines which page_loader class to use based on the phpBB version.
- * It checks if the Symfony LoaderInterface::load() method has a return type,
- * which indicates Symfony 7+ (phpBB4), otherwise falls back to phpBB3 compatibility.
- * The conditional is mandatory to ensure we only define the class if it does not
- * already exist in this request.
+ * This code determines which page_loader class to use based on the Symfony version.
+ * Symfony 7+ (phpBB4) uses page_loader_phpbb4, otherwise page_loader_phpbb3.
  *
  * @noinspection PhpMultipleClassDeclarationsInspection
  */
 if (!class_exists(page_loader::class, false))
 {
-	$method = new ReflectionMethod(LoaderInterface::class, 'load');
-
 	// phpcs:disable PSR1.Classes.ClassDeclaration.MultipleClasses
-	if ($method->hasReturnType())
+	if (version_compare(Kernel::VERSION, '7.0.0', '>='))
 	{
 		class page_loader extends page_loader_phpbb4 {}
 	}

tests/operators/page_routing_loader_test.php

@@ -96,4 +96,16 @@ public function test_page_loader($id, $expected)
 		// Assert the route contains the expected path
 		self::assertSame($expected, $route->getPath());
 	}
+
+	public function test_loader_is_correct_adapter()
+	{
+		if (version_compare(\Symfony\Component\HttpKernel\Kernel::VERSION, '7.0.0', '>='))
+		{
+			self::assertInstanceOf(\phpbb\pages\routing\page_loader_phpbb4::class, $this->loader);
+		}
+		else
+		{
+			self::assertInstanceOf(\phpbb\pages\routing\page_loader_phpbb3::class, $this->loader);
+		}
+	}
 }

tests/routing/page_loader_phpbb3_test.php

@@ -10,8 +10,7 @@
 
 namespace phpbb\pages\tests\routing;
 
-use ReflectionMethod;
-use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class page_loader_phpbb3_test extends \phpbb_database_test_case
 {
@@ -35,8 +34,7 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		$method = new ReflectionMethod(LoaderInterface::class, 'load');
-		if ($method->hasReturnType())
+		if (version_compare(Kernel::VERSION, '7.0.0', '>='))
 		{
 			self::markTestSkipped('phpbb3 adapter tests only run on Symfony 3-6 (phpBB3)');
 		}

tests/routing/page_loader_phpbb4_test.php

@@ -10,8 +10,7 @@
 
 namespace phpbb\pages\tests\routing;
 
-use ReflectionMethod;
-use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class page_loader_phpbb4_test extends \phpbb_database_test_case
 {
@@ -35,8 +34,7 @@ protected function setUp(): void
 	{
 		parent::setUp();
 
-		$method = new ReflectionMethod(LoaderInterface::class, 'load');
-		if (!$method->hasReturnType())
+		if (version_compare(Kernel::VERSION, '7.0.0', '<'))
 		{
 			self::markTestSkipped('phpbb4 adapter tests only run on Symfony 7+ (phpBB4)');
 		}

tests/routing/page_loader_version_detection_test.php

@@ -10,8 +10,7 @@
 
 namespace phpbb\pages\tests\routing;
 
-use ReflectionMethod;
-use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\Kernel;
 
 class page_loader_version_detection_test extends \phpbb_test_case
 {
@@ -27,33 +26,28 @@ public function test_page_loader_class_exists()
 
 	public function test_page_loader_extends_correct_adapter()
 	{
-		$method = new ReflectionMethod(LoaderInterface::class, 'load');
-
-		if ($method->hasReturnType())
+		if (version_compare(Kernel::VERSION, '7.0.0', '>='))
 		{
 			self::assertInstanceOf(\phpbb\pages\routing\page_loader_phpbb4::class,
 				new \phpbb\pages\routing\page_loader($this->createMock(\phpbb\db\driver\driver_interface::class), 'test_table'),
-				'page_loader should extend page_loader_phpbb4 when LoaderInterface::load() has return type (Symfony 7/phpBB4)'
+				'page_loader should extend page_loader_phpbb4 when Symfony >= 7.0 (phpBB4)'
 			);
 		}
 		else
 		{
 			self::assertInstanceOf(\phpbb\pages\routing\page_loader_phpbb3::class,
 				new \phpbb\pages\routing\page_loader($this->createMock(\phpbb\db\driver\driver_interface::class), 'test_table'),
-				'page_loader should extend page_loader_phpbb3 when LoaderInterface::load() has no return type (Symfony 3-6/phpBB3)'
+				'page_loader should extend page_loader_phpbb3 when Symfony < 7.0 (phpBB3)'
 			);
 		}
 	}
 
 	public function test_version_detection_logic()
 	{
-		$method = new ReflectionMethod(LoaderInterface::class, 'load');
-		$hasReturnType = $method->hasReturnType();
-
 		$reflection = new \ReflectionClass(\phpbb\pages\routing\page_loader::class);
 		$parent = $reflection->getParentClass();
 
-		if ($hasReturnType)
+		if (version_compare(Kernel::VERSION, '7.0.0', '>='))
 		{
 			self::assertSame(\phpbb\pages\routing\page_loader_phpbb4::class, $parent->getName(),
 				'Symfony 7+ detected: page_loader must extend page_loader_phpbb4'