Merge pull request #35 from mpdude/fetcher

Fix fetcher name checking, simplify transition from Tika 1.x to 2.x

Author: vaites

src/Clients/WebClient.php

@@ -232,11 +232,6 @@ public function getFetcherName(): ?string
      */
     public function setFetcherName(string $fetcherName): self
     {
-        if(!in_array($fetcherName, ['FileSystemFetcher', 'HttpFetcher', 'S3Fetcher', 'GCSFetcher', 'SolrFetcher']))
-        {
-            throw new Exception("Fetcher name $fetcherName is invalid, see https://cwiki.apache.org/confluence/display/TIKA/tika-pipes");
-        }
-
         $this->fetcherName = $fetcherName;
 
         return $this;
@@ -662,13 +657,10 @@ protected function getParameters(string $type, string $file = null): array
         {
             if($this->fetcherName)
             {
-                $headers[] = "fetcherName:$this->fetcherName";
-                $headers[] = "fetchKey:$file";
-            }
-            else
-            {
-                $headers[] = "fileUrl:$file";
+                $headers[] = "fetcherName: $this->fetcherName";
+                $headers[] = "fetchKey: $file";
             }
+            $headers[] = "fileUrl: $file";
         }
 
         switch($type)