WIP

src/Controller/Transaction.php

@@ -1167,7 +1167,7 @@ public function process(): ResponseInterface
                 break;
 
             case '$value':
-                $providedTypes = MediaTypes::factory(MediaType::any);
+                $providedTypes = MediaTypes::factory(MediaType::text, MediaType::any);
                 break;
 
             default:
@@ -1196,6 +1196,10 @@ public function process(): ResponseInterface
             $this->version
         );
 
+        if ('text' === $acceptedType->getType() && !$acceptedType->hasParameter(Constants::charset)) {
+            $acceptedType->setParameter(Constants::charset, 'utf-8');
+        }
+
         if ('json' === $acceptedType->getSubtype()) {
             $acceptedType->setParameter(
                 $this->version->prefixParameter(Constants::metadata),

src/PathSegment/Batch.php

@@ -46,7 +46,7 @@ public static function pipe(
 
         $contentType = $transaction->getProvidedContentType();
 
-        switch ($contentType->getType()) {
+        switch ($contentType->getFullType()) {
             case MediaType::multipartMixed:
                 return new Batch\Multipart();
 

src/Transaction/MediaType.php

@@ -4,9 +4,6 @@
 
 namespace Flat3\Lodata\Transaction;
 
-use Flat3\Lodata\Exception\Protocol\NotAcceptableException;
-use Flat3\Lodata\Helper\Constants;
-
 /**
  * Media Type
  * @link https://tools.ietf.org/html/rfc2045
@@ -98,6 +95,16 @@ public function getParameter(string $key): ?string
         return $this->parameter->getParameter($key);
     }
 
+    /**
+     * Check whether the type has the provided parameter
+     * @param  string  $key  Parameter
+     * @return bool
+     */
+    public function hasParameter(string $key): bool
+    {
+        return null !== $this->getParameter($key);
+    }
+
     /**
      * Get all parameter keys in the media type
      * @return array
@@ -112,6 +119,15 @@ public function getParameterKeys()
      * @return string
      */
     public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * Get the type with subtype
+     * @return string
+     */
+    public function getFullType(): string
     {
         return $this->type.'/'.$this->subtype;
     }

src/Transaction/MultipartDocument.php

@@ -72,7 +72,7 @@ public function setBody(string $body): self
     {
         $this->body = $body;
 
-        if ($this->getContentType()->getType() === MediaType::multipartMixed) {
+        if ($this->getContentType()->getFullType() === MediaType::multipartMixed) {
             $this->parseDocuments();
         }
 

tests/Entity/EntityTest.php

@@ -9,6 +9,7 @@
 use Flat3\Lodata\GeneratedProperty;
 use Flat3\Lodata\Tests\Helpers\Request;
 use Flat3\Lodata\Tests\TestCase;
+use Flat3\Lodata\Transaction\MediaType;
 use Flat3\Lodata\Transaction\MetadataType;
 use Flat3\Lodata\Type;
 use Flat3\Lodata\Type\Int32;
@@ -303,24 +304,6 @@ public function test_null_raw_no_content()
         );
     }
 
-    public function test_raw_custom_accept()
-    {
-        $this->assertResponseSnapshot(
-            (new Request)
-                ->header('accept', 'application/octet-stream')
-                ->path($this->entityPath.'/name/$value')
-        );
-    }
-
-    public function test_raw_custom_format()
-    {
-        $this->assertResponseSnapshot(
-            (new Request)
-                ->format('application/octet-stream')
-                ->path($this->entityPath.'/name/$value')
-        );
-    }
-
     public function test_not_entity_or_set_not_found()
     {
         $this->assertNotFound(

tests/Entity/FilesystemTest.php

@@ -110,23 +110,23 @@ public function test_null_raw_no_content()
     {
     }
 
-    public function test_raw_custom_accept()
+    public function test_read_alternative_key()
     {
     }
 
-    public function test_raw_custom_format()
+    public function test_read_collection_property()
     {
     }
 
-    public function test_read_alternative_key()
+    public function test_raw()
     {
     }
 
-    public function test_read_collection_property()
+    public function test_raw_no_accept()
     {
     }
 
-    public function test_raw()
+    public function test_raw_accept_any()
     {
     }
 

tests/Protocol/MediaTypeTest.php

@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Flat3\Lodata\Tests\Protocol;
+
+use Flat3\Lodata\Tests\TestCase;
+use Flat3\Lodata\Transaction\MediaType;
+
+class MediaTypeTest extends TestCase
+{
+    public function typeProvider()
+    {
+        return [
+            [
+                'application/json',
+                'application/json',
+                'application',
+                'json',
+            ],
+            [
+                'text/plain; charset=UTF-8',
+                'text/plain;charset=UTF-8',
+                'text',
+                'plain',
+                ['charset' => 'UTF-8'],
+            ],
+            [
+                'multipart/mixed;param=true',
+                'multipart/mixed;param=true',
+                'multipart',
+                'mixed',
+                ['param' => 'true'],
+            ],
+            [
+                'multipart/mixed; param=true',
+                'multipart/mixed;param=true',
+                'multipart',
+                'mixed',
+                ['param' => 'true'],
+            ],
+            [
+                'multipart/mixed; param=true; this=false',
+                'multipart/mixed;param=true;this=false',
+                'multipart',
+                'mixed',
+                ['param' => 'true', 'this' => 'false'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider typeProvider
+     */
+    public function test_types(
+        string $original,
+        string $normalised,
+        string $type,
+        string $subtype,
+        array $parameters = []
+    ) {
+        $mt = (new MediaType)->parse($original);
+        $this->assertEquals($type, $mt->getType());
+        $this->assertEquals($subtype, $mt->getSubtype());
+
+        foreach ($parameters as $key => $value) {
+            $this->assertEquals($value, $mt->getParameter($key));
+        }
+
+        $this->assertEquals($normalised, (string) $mt);
+    }
+}

tests/Queries/ValueTest.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Flat3\Lodata\Tests\Queries;
+
+use Flat3\Lodata\EntityType;
+use Flat3\Lodata\Facades\Lodata;
+use Flat3\Lodata\Singleton;
+use Flat3\Lodata\Tests\Helpers\Request;
+use Flat3\Lodata\Tests\TestCase;
+use Flat3\Lodata\Transaction\MediaType;
+use Flat3\Lodata\Type;
+
+class ValueTest extends TestCase
+{
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $type = (new EntityType('stype'))
+            ->addDeclaredProperty('sprop', Type::string());
+        $entity = new Singleton('stest', $type);
+        $entity['sprop'] = 'svalue';
+        Lodata::add($entity);
+    }
+
+    public function test_raw_custom_accept()
+    {
+        $this->assertResponseSnapshot(
+            (new Request)
+                ->header('accept', 'application/octet-stream')
+                ->path('/stest/sprop/$value')
+        );
+    }
+
+    public function test_raw_custom_format()
+    {
+        $this->assertResponseSnapshot(
+            (new Request)
+                ->format('application/octet-stream')
+                ->path('/stest/sprop/$value')
+        );
+    }
+
+    public function test_raw_no_accept()
+    {
+        $this->assertResponseSnapshot(
+            (new Request)
+                ->accept('')
+                ->path('/stest/sprop/$value')
+        );
+    }
+
+    public function test_raw_accept_any()
+    {
+        $this->assertResponseSnapshot(
+            (new Request)
+                ->accept(MediaType::any)
+                ->path('/stest/sprop/$value')
+        );
+    }
+}

tests/__snapshots__/Entity/EloquentTest__test_raw_custom_accept__1.yml → tests/__snapshots__/Queries/ValueTest__test_raw_accept_any__1.yml

@@ -1,5 +1,5 @@
 headers:
     cache-control: ['no-cache, private']
-    content-type: [application/octet-stream]
+    content-type: [text/plain;charset=utf-8]
     odata-version: ['4.01']
 status: 200

tests/__snapshots__/Entity/EloquentTest__test_raw_custom_format__1.yml → tests/__snapshots__/Queries/ValueTest__test_raw_no_accept__1.yml

@@ -1,5 +1,5 @@
 headers:
     cache-control: ['no-cache, private']
-    content-type: [application/octet-stream]
+    content-type: [text/plain;charset=utf-8]
     odata-version: ['4.01']
 status: 200