Merge pull request #1 from trellis-ldp/a-few-modifications

Better file response output

Author: whikloj

appveyor.yml

@@ -7,6 +7,9 @@ init:
     - SET PATH=C:\Program Files\OpenSSL;C:\tools\php71;%PATH%
     - SET COMPOSER_NO_INTERACTION=1
 
+environment:
+    TRELLIS_CONFIG_DIR: test/resources/config/
+
 install:
     - ps: Set-Service wuauserv -StartupType Manual
     - cinst -y OpenSSL.Light

settings.yml.sample

@@ -1,5 +1,5 @@
 sourceDirectory: /mnt/data/ldp/
-template: default.twig
+template: default.html.twig
 defaultRdfFormat: turtle
 extraPropertiesFilename: properties
 contentDisposition: false

src/Model/NonRDFSource.php

@@ -4,9 +4,9 @@
 
 use App\Trellis\StaticLdp\Provider\StaticLdpProvider;
 use Silex\Application;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use Twig\Environment;
 
 /**
@@ -44,11 +44,7 @@ public function respond(Request $request, Environment $twig_provider, array $opt
                     $res->headers->set("Link", $link, false);
                 }
             }
-            $filename = $this->path;
-            $stream = function () use ($filename) {
-                readfile($filename);
-            };
-            return new StreamedResponse($stream, 200, $res->headers->all());
+            return new BinaryFileResponse($this->path, 200, $res->headers->all());
         }
         return $res;
     }

src/Model/RDFSource.php

@@ -4,9 +4,9 @@
 
 use App\TrellisConfiguration;
 use App\Model\Resource;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use Twig\Environment;
 
 /**
@@ -47,11 +47,7 @@ public function respond(Request $request, Environment $twig_provider, array $opt
                     break;
             }
             if ($this->canStream($responseFormat)) {
-                $filename = $this->path;
-                $stream = function () use ($filename) {
-                    readfile($filename);
-                };
-                return new StreamedResponse($stream, 200, $res->headers->all());
+                return new BinaryFileResponse($this->path, 200, $res->headers->all());
             } else {
                 $graph = new \EasyRdf_Graph();
                 $graph->parseFile($this->path, $this->getInputFormat($this->path), $request->getURI());

src/Model/Resource.php

@@ -224,7 +224,7 @@ protected function getResponseMimeType(Request $request)
                 }
             }
         }
-        return "text/turtle";
+        return "text/turtle; charset=UTF-8";
     }
 
     protected function getInputFormat($path)

src/TrellisConfiguration.php

@@ -43,7 +43,7 @@ public function getConfigTreeBuilder()
                     ->end()
                     ->defaultValue([
                         "turtle" => [
-                            "mimeType" => "text/turtle",
+                            "mimeType" => "text/turtle; charset=UTF-8",
                             "extension" => "ttl"
                         ],
                         "jsonld" => [