Remove call to PHPUnit's internal method setOutputCallback()

MauricioFauth · MauricioFauth · commit ceaee6ccb8b4 · 2023-02-22T15:17:02.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -17492,15 +17492,7 @@
       <code><![CDATA[$GLOBALS['plugin_param']['single_table']]]></code>
     </PossiblyInvalidArrayOffset>
   </file>
-  <file src="test/classes/Plugins/Export/ExportOdsTest.php">
-    <InternalMethod>
-      <code>setOutputCallback</code>
-    </InternalMethod>
-  </file>
   <file src="test/classes/Plugins/Export/ExportOdtTest.php">
-    <InternalMethod>
-      <code>setOutputCallback</code>
-    </InternalMethod>
     <InvalidArrayOffset>
       <code><![CDATA[$GLOBALS['foo_columns']]]></code>
     </InvalidArrayOffset>
diff --git a/test/classes/Plugins/Export/ExportOdsTest.php b/test/classes/Plugins/Export/ExportOdsTest.php
@@ -23,6 +23,8 @@
 use ReflectionProperty;
 use stdClass;
 
+use function bin2hex;
+
 use const MYSQLI_BLOB_FLAG;
 use const MYSQLI_TYPE_DATE;
 use const MYSQLI_TYPE_DATETIME;
@@ -177,20 +179,12 @@ public function testExportHeader(): void
     public function testExportFooter(): void
     {
         $GLOBALS['ods_buffer'] = 'header';
-
-        $this->expectOutputRegex('/^504b.*636f6e74656e742e786d6c/');
-        $this->setOutputCallback('bin2hex');
-
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-
+        $this->assertTrue($this->object->exportFooter());
+        $output = $this->getActualOutputForAssertion();
+        $this->assertMatchesRegularExpression('/^504b.*636f6e74656e742e786d6c/', bin2hex($output));
         $this->assertStringContainsString('header', $GLOBALS['ods_buffer']);
-
         $this->assertStringContainsString('</office:spreadsheet>', $GLOBALS['ods_buffer']);
-
         $this->assertStringContainsString('</office:body>', $GLOBALS['ods_buffer']);
-
         $this->assertStringContainsString('</office:document-content>', $GLOBALS['ods_buffer']);
     }
 
diff --git a/test/classes/Plugins/Export/ExportOdtTest.php b/test/classes/Plugins/Export/ExportOdtTest.php
@@ -25,6 +25,7 @@
 use stdClass;
 
 use function __;
+use function bin2hex;
 
 use const MYSQLI_BLOB_FLAG;
 use const MYSQLI_NUM_FLAG;
@@ -313,16 +314,10 @@ public function testExportHeader(): void
     public function testExportFooter(): void
     {
         $GLOBALS['odt_buffer'] = 'header';
-
-        $this->expectOutputRegex('/^504b.*636f6e74656e742e786d6c/');
-        $this->setOutputCallback('bin2hex');
-
-        $this->assertTrue(
-            $this->object->exportFooter()
-        );
-
+        $this->assertTrue($this->object->exportFooter());
+        $output = $this->getActualOutputForAssertion();
+        $this->assertMatchesRegularExpression('/^504b.*636f6e74656e742e786d6c/', bin2hex($output));
         $this->assertStringContainsString('header', $GLOBALS['odt_buffer']);
-
         $this->assertStringContainsString(
             '</office:text></office:body></office:document-content>',
             $GLOBALS['odt_buffer']
