diff --git a/src/Extractor/FileTextExtractor.php b/src/Extractor/FileTextExtractor.php index 57a82ef..9289846 100644 --- a/src/Extractor/FileTextExtractor.php +++ b/src/Extractor/FileTextExtractor.php @@ -140,7 +140,9 @@ abstract class FileTextExtractor } // Remove any existing temp files with this name - unlink($path); + if (file_exists($path)) { + unlink($path); + } $bytesWritten = file_put_contents($path, $file->getStream()); if (false === $bytesWritten) { diff --git a/src/Extractor/PDFTextExtractor.php b/src/Extractor/PDFTextExtractor.php index f3e914c..1ff0947 100644 --- a/src/Extractor/PDFTextExtractor.php +++ b/src/Extractor/PDFTextExtractor.php @@ -4,7 +4,6 @@ namespace SilverStripe\TextExtraction\Extractor; use SilverStripe\Assets\File; use SilverStripe\TextExtraction\Extractor\FileTextExtractor\Exception; -use function tempnam; /** * Text extractor that calls pdftotext to do the conversion. diff --git a/src/Rest/TikaRestClient.php b/src/Rest/TikaRestClient.php index cd8b5c7..0c62f29 100644 --- a/src/Rest/TikaRestClient.php +++ b/src/Rest/TikaRestClient.php @@ -25,9 +25,9 @@ class TikaRestClient extends Client /** * * @param string $baseUrl - * @param array $config + * @param array $config */ - public function __construct($baseUrl = '', $config = null) + public function __construct($baseUrl = '', $config = []) { $password = Environment::getEnv('SS_TIKA_PASSWORD'); diff --git a/tests/TikaTextExtractorTest.php b/tests/TikaTextExtractorTest.php index 6c8e801..7d88780 100644 --- a/tests/TikaTextExtractorTest.php +++ b/tests/TikaTextExtractorTest.php @@ -2,6 +2,7 @@ namespace SilverStripe\TextExtraction\Tests; +use SilverStripe\Assets\File; use SilverStripe\Dev\SapphireTest; use SilverStripe\TextExtraction\Extractor\TikaServerTextExtractor; use SilverStripe\TextExtraction\Extractor\TikaTextExtractor; @@ -11,6 +12,8 @@ use SilverStripe\TextExtraction\Extractor\TikaTextExtractor; */ class TikaTextExtractorTest extends SapphireTest { + protected $usesDatabase = true; + public function testExtraction() { $extractor = new TikaTextExtractor(); @@ -19,7 +22,10 @@ class TikaTextExtractorTest extends SapphireTest } // Check file - $file = dirname(__FILE__) . '/fixtures/test1.pdf'; + $file = new File(); + $file->setFromLocalFile(dirname(__FILE__) . '/fixtures/test1.pdf'); + $file->write(); + $content = $extractor->getContent($file); $this->assertContains('This is a test file with a link', $content); @@ -37,7 +43,10 @@ class TikaTextExtractorTest extends SapphireTest } // Check file - $file = dirname(__FILE__) . '/fixtures/test1.pdf'; + $file = new File(); + $file->setFromLocalFile(dirname(__FILE__) . '/fixtures/test1.pdf'); + $file->write(); + $content = $extractor->getContent($file); $this->assertContains('This is a test file with a link', $content);