use same file read wrapper function in all tests

Author: SpacePossum

tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php

@@ -12,6 +12,7 @@
 
 use PHPUnit\Framework\TestCase;
 use SebastianBergmann\Diff\Differ;
+use SebastianBergmann\Diff\Utils\FileUtils;
 use SebastianBergmann\Diff\Utils\UnifiedDiffAssertTrait;
 use Symfony\Component\Process\Process;
 
@@ -37,12 +38,12 @@ final class StrictUnifiedDiffOutputBuilderIntegrationTest extends TestCase
 
     protected function setUp()
     {
-        $this->dir       = realpath(__DIR__ . '/../../fixtures/out').'/';
+        $this->dir       = \realpath(__DIR__ . '/../../fixtures/out') . '/';
         $this->fileFrom  = $this->dir . 'from.txt';
         $this->fileTo    = $this->dir . 'to.txt';
         $this->filePatch = $this->dir . 'diff.patch';
 
-        if (!is_dir($this->dir)) {
+        if (!\is_dir($this->dir)) {
             throw new \RuntimeException('Integration test working directory not found.');
         }
 
@@ -64,8 +65,8 @@ protected function setUp()
      */
     public function testIntegrationUsingPHPFileInVendorGitApply(string $fileFrom, string $fileTo)
     {
-        $from = self::getFileContent($fileFrom);
-        $to   = self::getFileContent($fileTo);
+        $from = FileUtils::getFileContent($fileFrom);
+        $to   = FileUtils::getFileContent($fileTo);
 
         $diff = (new Differ(new StrictUnifiedDiffOutputBuilder(['fromFile' => 'Original', 'toFile' => 'New'])))->diff($from, $to);
 
@@ -94,8 +95,8 @@ public function testIntegrationUsingPHPFileInVendorGitApply(string $fileFrom, st
      */
     public function testIntegrationUsingPHPFileInVendorPatch(string $fileFrom, string $fileTo)
     {
-        $from = self::getFileContent($fileFrom);
-        $to   = self::getFileContent($fileTo);
+        $from = FileUtils::getFileContent($fileFrom);
+        $to   = FileUtils::getFileContent($fileTo);
 
         $diff = (new Differ(new StrictUnifiedDiffOutputBuilder(['fromFile' => 'Original', 'toFile' => 'New'])))->diff($from, $to);
 
@@ -295,20 +296,4 @@ private static function setDiffFileHeader(string $diff, string $file): string
 
         return \implode('', $diffLines);
     }
-
-    private static function getFileContent(string $file): string
-    {
-        $content = @\file_get_contents($file);
-        if (false === $content) {
-            $error = \error_get_last();
-
-            throw new \RuntimeException(\sprintf(
-                'Failed to read content of file "%s".%s',
-                $file,
-                $error ? ' ' . $error['message'] : ''
-            ));
-        }
-
-        return $content;
-    }
 }

tests/ParserTest.php

@@ -11,6 +11,7 @@
 namespace SebastianBergmann\Diff;
 
 use PHPUnit\Framework\TestCase;
+use SebastianBergmann\Diff\Utils\FileUtils;
 
 /**
  * @covers SebastianBergmann\Diff\Parser
@@ -33,7 +34,7 @@ protected function setUp()
 
     public function testParse()
     {
-        $content = \file_get_contents(__DIR__ . '/fixtures/patch.txt');
+        $content = FileUtils::getFileContent(__DIR__ . '/fixtures/patch.txt');
 
         $diffs = $this->parser->parse($content);
 
@@ -54,7 +55,7 @@ public function testParse()
 
     public function testParseWithMultipleChunks()
     {
-        $content = \file_get_contents(__DIR__ . '/fixtures/patch2.txt');
+        $content = FileUtils::getFileContent(__DIR__ . '/fixtures/patch2.txt');
 
         $diffs = $this->parser->parse($content);
 
@@ -166,7 +167,7 @@ public function diffProvider(): array
         return [
             [
                 "--- old.txt	2014-11-04 08:51:02.661868729 +0300\n+++ new.txt	2014-11-04 08:51:02.665868730 +0300\n@@ -1,3 +1,4 @@\n+2222111\n 1111111\n 1111111\n 1111111\n@@ -5,10 +6,8 @@\n 1111111\n 1111111\n 1111111\n +1121211\n 1111111\n -1111111\n -1111111\n -2222222\n 2222222\n 2222222\n 2222222\n@@ -17,5 +16,6 @@\n 2222222\n 2222222\n 2222222\n +2122212\n 2222222\n 2222222\n",
-                \unserialize(\file_get_contents(__DIR__ . '/fixtures/serialized_diff.bin')),
+                \unserialize(FileUtils::getFileContent(__DIR__ . '/fixtures/serialized_diff.bin')),
             ],
         ];
     }

tests/Utils/FileUtils.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of sebastian/diff.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace SebastianBergmann\Diff\Utils;
+
+final class FileUtils
+{
+    public static function getFileContent(string $file): string
+    {
+        $content = @\file_get_contents($file);
+        if (false === $content) {
+            $error = \error_get_last();
+
+            throw new \RuntimeException(\sprintf(
+                'Failed to read content of file "%s".%s',
+                $file,
+                $error ? ' ' . $error['message'] : ''
+            ));
+        }
+
+        return $content;
+    }
+}

tests/Utils/UnifiedDiffAssertTraitIntegrationTest.php

@@ -70,7 +70,7 @@ public function testValidPatches(string $fileFrom, string $fileTo)
             )
         );
 
-        $this->assertValidUnifiedDiffFormat(\file_get_contents($this->filePatch));
+        $this->assertValidUnifiedDiffFormat(FileUtils::getFileContent($this->filePatch));
     }
 
     /**