Remove format, it should be detected automatically

mantas-done · Jul 24, 2023 · aeb46da · aeb46da
1 parent 470a8bb
commit aeb46da
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/tests/formats/CsvTest.php b/tests/formats/CsvTest.php
@@ -63,7 +63,7 @@ public function testClientAnsiFile()
      */
     public function testDifferentContentSeparators($string)
     {
-        $actual_internal_format = Subtitles::loadFromString($string, 'csv')->getInternalFormat();
+        $actual_internal_format = Subtitles::loadFromString($string)->getInternalFormat();
         $expected_internal_format = (new Subtitles())
             ->add(1, 2, ['Oh! Can I believe my eyes!'])
             ->add(2, 3, ['If Heaven and earth.'])->getInternalFormat();
@@ -91,7 +91,7 @@ public function testParseFileWithSingleTimestamp()
 00:00:01    One
 00:00:02    Two
 TEXT;
-        $actual_internal_format = Subtitles::loadFromString($string, 'csv')->getInternalFormat();
+        $actual_internal_format = Subtitles::loadFromString($string)->getInternalFormat();
         $expected_internal_format = (new Subtitles())
             ->add(1, 2, ['One'])
             ->add(2, 3, ['Two'])->getInternalFormat();

diff --git a/tests/formats/SbvTest.php b/tests/formats/SbvTest.php
@@ -35,7 +35,7 @@ public function testFileToInternalFormat()
 Because every child in our society is
 a part of that society
 TEXT;
-        $actual_internal_format = Subtitles::loadFromString($actual_file_content, 'sbv')->getInternalFormat();
+        $actual_internal_format = Subtitles::loadFromString($actual_file_content)->getInternalFormat();
         $expected_internal_format = [[
             'start' => 340,
             'end' => 346,
@@ -95,7 +95,7 @@ public function testParseMultipleNewLines()
 Lisa...Mona Lisa.
 TEXT;
 
-        $actual_internal_format = Subtitles::loadFromString($actual_file_content, 'sbv')->getInternalFormat();
+        $actual_internal_format = Subtitles::loadFromString($actual_file_content)->getInternalFormat();
         $expected_internal_format = [[
             'start' => 64.927,
             'end' => 66.927,

diff --git a/tests/formats/SrtTest.php b/tests/formats/SrtTest.php
@@ -12,8 +12,6 @@ class SrtTest extends TestCase {
 
     use AdditionalAssertionsTrait;
 
-    protected $format = 'srt';
-
     public function testRecognizesSrt()
     {
         $content = file_get_contents('./tests/files/srt.srt');
@@ -36,14 +34,14 @@ public function testConvertingFileFromSrtToSrtDoesNotChangeItContent()
 
     public function testFileToInternalFormat()
     {
-        $actual_internal_format = Subtitles::loadFromString(self::fileContent(), $this->format)->getInternalFormat();
+        $actual_internal_format = Subtitles::loadFromString(self::fileContent())->getInternalFormat();
 
         $this->assertInternalFormatsEqual(self::generatedSubtitles()->getInternalFormat(), $actual_internal_format);
     }
 
     public function testConvertToFile()
     {
-        $actual_file_content = self::generatedSubtitles()->content($this->format);
+        $actual_file_content = self::generatedSubtitles()->content('srt');
 
         $this->assertStringEqualsStringIgnoringLineEndings(self::fileContent(), $actual_file_content);
     }

diff --git a/tests/formats/TxtQuickTimeTest.php b/tests/formats/TxtQuickTimeTest.php
@@ -47,7 +47,7 @@ public function testConvertingToFormat()
 
     public function testConvertingToInternalFormat()
     {
-        $actual = Subtitles::loadFromString($this->qttxt, 'txt_quicktime')->getInternalFormat();
+        $actual = Subtitles::loadFromString($this->qttxt)->getInternalFormat();
 
         $expected = (new Subtitles())
             ->add(137.44, 140.375, ['Senator, we\'re making', 'our final approach into Coruscant.'])

diff --git a/tests/formats/VttTest.php b/tests/formats/VttTest.php
@@ -71,7 +71,7 @@ public function testConvertToInternalFormatWhenFileContainsNumbers() // numbers
 Roger Bingham: We are in New York City
 TEXT;
 
-        $actual_vtt_file_content = (new Subtitles())->loadFromString($input_vtt_file_content, 'vtt')->content('vtt');
+        $actual_vtt_file_content = (new Subtitles())->loadFromString($input_vtt_file_content)->content('vtt');
 
         $this->assertStringEqualsStringIgnoringLineEndings($expected_vtt_file_content, $actual_vtt_file_content);
     }
@@ -113,7 +113,7 @@ public function testFileContainingMultipleNewLinesBetweenBlocks()
 00:00:01.000 --> 00:00:02.000
 text2
 TEXT;
-        $actual = (new Subtitles())->loadFromString($given, 'vtt')->getInternalFormat();
+        $actual = (new Subtitles())->loadFromString($given)->getInternalFormat();
 
         $expected = (new Subtitles())
             ->add(0, 1, 'text1')
@@ -126,7 +126,7 @@ public function testFileContainingMultipleNewLinesBetweenBlocks()
     public function testParsesFileWithStyles()
     {
         $given = file_get_contents('./tests/files/vtt_with_styles.vtt');
-        $actual = (new Subtitles())->loadFromString($given, 'vtt')->getInternalFormat();
+        $actual = (new Subtitles())->loadFromString($given)->getInternalFormat();
 
         $expected = (new Subtitles())
             ->add(0, 10, 'Hello world.')
@@ -138,7 +138,7 @@ public function testParsesFileWithStyles()
     public function testParsesFileWithHtml()
     {
         $given = file_get_contents('./tests/files/vtt_with_html.vtt');
-        $actual = (new Subtitles())->loadFromString($given, 'vtt')->getInternalFormat();
+        $actual = (new Subtitles())->loadFromString($given)->getInternalFormat();
 
         $expected = (new Subtitles())
             ->add(0.0, 10.0, 'Sur les playground, ici à Montpellier')
@@ -150,7 +150,7 @@ public function testParsesFileWithHtml()
     public function testParsesFileWithoutHoursInTimestamp()
     {
         $given = file_get_contents('./tests/files/vtt_without_hours_in_timestamp.vtt');
-        $actual = (new Subtitles())->loadFromString($given, 'vtt')->getInternalFormat();
+        $actual = (new Subtitles())->loadFromString($given)->getInternalFormat();
 
         $expected = (new Subtitles())
             ->add(0.0, 10.0, "I've spent nearly two decades")
@@ -162,7 +162,7 @@ public function testParsesFileWithoutHoursInTimestamp()
     public function testParsesFileWithMultipleNewLines()
     {
         $given = file_get_contents('./tests/files/vtt_with_multiple_new_lines.vtt');
-        $actual = (new Subtitles())->loadFromString($given, 'vtt')->getInternalFormat();
+        $actual = (new Subtitles())->loadFromString($given)->getInternalFormat();
         $expected = (new Subtitles())
             ->add(0.0, 1.0, ['one', 'two'])
             ->add(2.0, 3.0, 'three')
@@ -180,7 +180,7 @@ public function testParseFileWithMetadata()
 00:00:00.000 --> 00:00:01.000
 text1
 TEXT;
-        $actual = (new Subtitles())->loadFromString($given, 'vtt')->getInternalFormat();
+        $actual = (new Subtitles())->loadFromString($given)->getInternalFormat();
         $expected = (new Subtitles())
             ->add(0, 1, 'text1')
             ->getInternalFormat();
@@ -196,7 +196,7 @@ public function testParseFileWithSpacesBetweenTimestamps()
      00:00:00.100    -->    00:00:01.100     
 text1
 TEXT;
-        $actual = (new Subtitles())->loadFromString($given, 'vtt')->getInternalFormat();
+        $actual = (new Subtitles())->loadFromString($given)->getInternalFormat();
         $expected = (new Subtitles())
             ->add(0.1, 1.1, 'text1')
             ->getInternalFormat();