Merge pull request #450

Author: AlfredoRamos

.github/workflows/ci.yml

@@ -144,6 +144,9 @@ jobs:
           - php-version: '8.4'
             db-type: 'mariadb'
             db-version: '10.11'
+          - php-version: '8.5'
+            db-type: 'mariadb'
+            db-version: '10.11'
     steps:
       - name: Checkout phpBB
         uses: actions/checkout@v6
@@ -245,6 +248,9 @@ jobs:
           - php-version: '8.4'
             db-type: 'postgres'
             db-version: '18-alpine'
+          - php-version: '8.5'
+            db-type: 'postgres'
+            db-version: '18-alpine'
     steps:
       - name: Checkout phpBB
         uses: actions/checkout@v6

tests/functional/markdown_test.php

@@ -65,29 +65,13 @@ public function test_post_markdown()
 			$this->sid
 		));
 
-		if (version_compare(PHP_VERSION, '7.3.0', '>='))
-		{
-			$expected = <<<EOT
+		$expected = <<<EOT
 <p>Code:</p>
 
 <div class="codebox"><p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>echo 'message';</code></pre></div>
 
 <p>Inline <code>code</code></p>
 EOT;
-		}
-		else
-		{
-			$expected = <<<EOT
-<p>Code:</p>
-
-<div class="codebox">
-<p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p>
-<pre><code>echo 'message';</code></pre>
-</div>
-
-<p>Inline <code>code</code></p>
-EOT;
-		}
 
 		$result = $crawler->filter(sprintf(
 			'#post_content%d .content',
@@ -120,29 +104,13 @@ public function test_private_message()
 			$this->sid
 		));
 
-		if (version_compare(PHP_VERSION, '7.3.0', '>='))
-		{
-			$expected = <<<EOT
+		$expected = <<<EOT
 <p>Code:</p>
 
 <div class="codebox"><p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p><pre><code>echo 'message';</code></pre></div>
 
 <p>Inline <code>code</code></p>
 EOT;
-		}
-		else
-		{
-			$expected = <<<EOT
-<p>Code:</p>
-
-<div class="codebox">
-<p>Code: <a href="#" onclick="selectCode(this); return false;">Select all</a></p>
-<pre><code>echo 'message';</code></pre>
-</div>
-
-<p>Inline <code>code</code></p>
-EOT;
-		}
 
 		$result = $crawler->filter(sprintf(
 			'#post-%d .content',
@@ -172,28 +140,10 @@ public function test_simple_table()
 			$this->sid
 		));
 
-		if (version_compare(PHP_VERSION, '7.3.0', '>='))
-		{
-			$expected = <<<EOT
+		$expected = <<<EOT
 <table class="markdown"><thead><tr><th>Header 1</th><th>Header 2</th></tr></thead>
 <tbody><tr><td>Cell 1</td><td>Cell 2</td></tr></tbody></table>
 EOT;
-		}
-		else
-		{
-			$expected = <<<EOT
-<table class="markdown">
-<thead><tr>
-<th>Header 1</th>
-<th>Header 2</th>
-</tr></thead>
-<tbody><tr>
-<td>Cell 1</td>
-<td>Cell 2</td>
-</tr></tbody>
-</table>
-EOT;
-		}
 
 		$result = $crawler->filter(sprintf(
 			'#post_content%d .content',
@@ -224,28 +174,10 @@ public function test_compact_table()
 			$this->sid
 		));
 
-		if (version_compare(PHP_VERSION, '7.3.0', '>='))
-		{
-			$expected = <<<EOT
+		$expected = <<<EOT
 <table class="markdown"><thead><tr><th>Header 1</th><th>Header 2</th></tr></thead>
 <tbody><tr><td>Cell 1</td><td>Cell 2</td></tr></tbody></table>
 EOT;
-		}
-		else
-		{
-			$expected = <<<EOT
-<table class="markdown">
-<thead><tr>
-<th>Header 1</th>
-<th>Header 2</th>
-</tr></thead>
-<tbody><tr>
-<td>Cell 1</td>
-<td>Cell 2</td>
-</tr></tbody>
-</table>
-EOT;
-		}
 
 		$result = $crawler->filter(sprintf(
 			'#post_content%d .content',
@@ -276,30 +208,10 @@ public function test_table_text_aligntment()
 			$this->sid
 		));
 
-		if (version_compare(PHP_VERSION, '7.3.0', '>='))
-		{
-			$expected = <<<EOT
+		$expected = <<<EOT
 <table class="markdown"><thead><tr><th style="text-align:left">Left</th><th style="text-align:center">Center</th><th style="text-align:right">Right</th></tr></thead>
 <tbody><tr><td style="text-align:left">x</td><td style="text-align:center">x</td><td style="text-align:right">x</td></tr></tbody></table>
 EOT;
-		}
-		else
-		{
-			$expected = <<<EOT
-<table class="markdown">
-<thead><tr>
-<th style="text-align:left">Left</th>
-<th style="text-align:center">Center</th>
-<th style="text-align:right">Right</th>
-</tr></thead>
-<tbody><tr>
-<td style="text-align:left">x</td>
-<td style="text-align:center">x</td>
-<td style="text-align:right">x</td>
-</tr></tbody>
-</table>
-EOT;
-		}
 
 		$result = $crawler->filter(sprintf(
 			'#post_content%d .content',
@@ -407,28 +319,11 @@ public function test_task_list()
 		$this->assertSame(2, $list->count());
 		$this->assertSame(3, $items->count());
 
-		if (version_compare(PHP_VERSION, '7.3.0', '>='))
-		{
-			$expected = <<<EOT
+		$expected = <<<EOT
 <ul class="markdown"><li data-task-id="..." data-task-state="checked"><input data-task-id="..." type="checkbox" checked disabled> Task 1
 	<ul class="markdown"><li data-task-id="..." data-task-state="checked"><input data-task-id="..." type="checkbox" checked disabled> Task 1.1</li></ul></li>
 <li data-task-id="..." data-task-state="unchecked"><input data-task-id="..." type="checkbox" disabled> Task 2</li></ul>
 EOT;
-		}
-		else
-		{
-			$expected = <<<EOT
-<ul class="markdown">
-<li data-task-id="..." data-task-state="checked">
-<input data-task-id="..." type="checkbox" checked disabled> Task 1
-	<ul class="markdown"><li data-task-id="..." data-task-state="checked">
-<input data-task-id="..." type="checkbox" checked disabled> Task 1.1</li></ul>
-</li>
-<li data-task-id="..." data-task-state="unchecked">
-<input data-task-id="..." type="checkbox" disabled> Task 2</li>
-</ul>
-EOT;
-		}
 
 		$html = $this->task_id_placeholder($result->html());
 		$expected = $this->task_id_placeholder($expected);