flat3 · yvo-niedrich · Jun 3, 2025
diff --git a/src/Controller/OData.php b/src/Controller/OData.php
@@ -4,6 +4,7 @@
 
 namespace Flat3\Lodata\Controller;
 
+use Flat3\Lodata\Exception\Protocol\ProtocolException;
 use Flat3\Lodata\Helper\Constants;
 use Illuminate\Routing\Controller;
 
@@ -24,12 +25,20 @@ public function handle(Request $request, Transaction $transaction, Async $job):
     {
         $transaction->initialize($request);
 
-        if ($transaction->hasPreference(Constants::respondAsync)) {
-            $job->setTransaction($transaction);
-            $job->dispatch();
-        }
+        try {
+            if ($transaction->hasPreference(Constants::respondAsync)) {
+                $job->setTransaction($transaction);
+                $job->dispatch();
+            }
+
+            return $transaction->execute();
+        } catch (ProtocolException $e) {
+            if ($e->getHttpCode() < 400) {
+                return $e->toResponse($request);
+            }
 
-        return $transaction->execute();
+            throw $e;
+        }
     }
 
     /**

diff --git a/src/Exception/Protocol/AcceptedException.php b/src/Exception/Protocol/AcceptedException.php
@@ -15,4 +15,5 @@ class AcceptedException extends ProtocolException
     protected $httpCode = Response::HTTP_ACCEPTED;
     protected $odataCode = 'accepted';
     protected $message = 'Accepted';
+    protected $suppressContent = true;
 }
diff --git a/src/Exception/Protocol/ProtocolException.php b/src/Exception/Protocol/ProtocolException.php
@@ -158,6 +158,16 @@ public function toError()
         ];
     }
 
+    /**
+     * Get the HTTP Code associated to the exception
+     *
+     * @return int
+     */
+    public function getHttpCode(): int
+    {
+        return $this->httpCode;
+    }
+
     /**
      * Get the original exception that caused this exception
      *
@@ -188,7 +198,9 @@ public function toResponse($request = null): Response
         $response->setProtocolVersion('1.1');
         $response->setStatusCode($this->httpCode);
         $response->headers->replace($this->headers);
-        $response->headers->set(Constants::contentType, MediaType::json);
+        if (!$this->suppressContent) {
+            $response->headers->set(Constants::contentType, MediaType::json);
+        }
 
         return $response;
     }

diff --git a/tests/Helpers/UseODataAssertions.php b/tests/Helpers/UseODataAssertions.php
@@ -12,7 +12,7 @@ trait UseODataAssertions
 {
     protected function assertODataError(Request $request, int $code): TestResponse
     {
-        $emptyCodes = [Response::HTTP_NO_CONTENT, Response::HTTP_FOUND, Response::HTTP_NOT_MODIFIED];
+        $emptyCodes = [Response::HTTP_ACCEPTED, Response::HTTP_NO_CONTENT, Response::HTTP_FOUND, Response::HTTP_NOT_MODIFIED];
 
         try {
             $response = $this->req($request);
@@ -146,4 +146,4 @@ protected function assertResultCount(TestResponse $response, int $count)
     {
         $this->assertEquals($count, count(json_decode($response->streamedContent())->value));
     }
-}
+}
diff --git a/tests/__snapshots__/EntitySetCreate/EloquentTest__test_create_return_minimal__1.json b/tests/__snapshots__/EntitySetCreate/EloquentTest__test_create_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntitySetCreate/FilesystemTest__test_create_return_minimal__1.json b/tests/__snapshots__/EntitySetCreate/FilesystemTest__test_create_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntitySetCreate/KeyedCollectionTest__test_create_return_minimal__1.json b/tests/__snapshots__/EntitySetCreate/KeyedCollectionTest__test_create_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntitySetCreate/MongoTest__test_create_return_minimal__1.json b/tests/__snapshots__/EntitySetCreate/MongoTest__test_create_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/...s/__snapshots__/EntitySetCreate/NumericCollectionTest__test_create_return_minimal__1.json b/...s/__snapshots__/EntitySetCreate/NumericCollectionTest__test_create_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntitySetCreate/RedisTest__test_create_return_minimal__1.json b/tests/__snapshots__/EntitySetCreate/RedisTest__test_create_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntitySetCreate/SQLTest__test_create_return_minimal__1.json b/tests/__snapshots__/EntitySetCreate/SQLTest__test_create_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntityUpdate/EloquentTest__test_update_return_minimal__1.json b/tests/__snapshots__/EntityUpdate/EloquentTest__test_update_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntityUpdate/KeyedCollectionTest__test_update_return_minimal__1.json b/tests/__snapshots__/EntityUpdate/KeyedCollectionTest__test_update_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntityUpdate/MongoTest__test_update_return_minimal__1.json b/tests/__snapshots__/EntityUpdate/MongoTest__test_update_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntityUpdate/NumericCollectionTest__test_update_return_minimal__1.json b/tests/__snapshots__/EntityUpdate/NumericCollectionTest__test_update_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntityUpdate/RedisTest__test_update_return_minimal__1.json b/tests/__snapshots__/EntityUpdate/RedisTest__test_update_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/EntityUpdate/SQLTest__test_update_return_minimal__1.json b/tests/__snapshots__/EntityUpdate/SQLTest__test_update_return_minimal__1.json
@@ -8,9 +8,6 @@
         ],
         "cache-control": [
             "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
         ]
     },
     "status": 204

diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async__1.json b/tests/__snapshots__/Protocol/AsyncTest__test_async__1.json
@@ -1,9 +1,11 @@
 {
-    "error": {
-        "code": "accepted",
-        "message": "Accepted",
-        "target": null,
-        "details": [],
-        "innererror": {}
-    }
+    "headers": {
+        "location": [
+            "http://localhost/odata/_lodata/monitor/00000000-0000-0000-0000-000000000001"
+        ],
+        "cache-control": [
+            "no-cache, private"
+        ]
+    },
+    "status": 202
 }
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async__2.json b/tests/__snapshots__/Protocol/AsyncTest__test_async__2.json
@@ -1,9 +1,14 @@
 {
-    "error": {
-        "code": "accepted",
-        "message": "Accepted",
-        "target": null,
-        "details": [],
-        "innererror": {}
-    }
+    "headers": {
+        "cache-control": [
+            "no-cache, private"
+        ],
+        "content-type": [
+            "application/json;metadata=minimal"
+        ],
+        "odata-version": [
+            "4.01"
+        ]
+    },
+    "status": 200
 }
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async__3.json b/tests/__snapshots__/Protocol/AsyncTest__test_async__3.json
@@ -1,14 +1,10 @@
 {
-    "headers": {
-        "location": [
-            "http://localhost/odata/_lodata/monitor/00000000-0000-0000-0000-000000000001"
-        ],
-        "cache-control": [
-            "no-cache, private"
-        ],
-        "content-type": [
-            "application/json"
-        ]
-    },
-    "status": 202
+    "@context": "http://localhost/odata/$metadata",
+    "value": [
+        {
+            "name": "passengers",
+            "kind": "EntitySet",
+            "url": "passengers"
+        }
+    ]
 }
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async__4.json b/tests/__snapshots__/Protocol/AsyncTest__test_async__4.json
@@ -1,14 +1,10 @@
 {
-    "headers": {
-        "cache-control": [
-            "no-cache, private"
-        ],
-        "content-type": [
-            "application/json;metadata=minimal"
-        ],
-        "odata-version": [
-            "4.01"
-        ]
-    },
-    "status": 200
+    "@context": "http://localhost/odata/$metadata",
+    "value": [
+        {
+            "name": "passengers",
+            "kind": "EntitySet",
+            "url": "passengers"
+        }
+    ]
 }
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async__5.json b/tests/__snapshots__/Protocol/AsyncTest__test_async__5.json
@@ -1,10 +1,17 @@
 {
-    "@context": "http://localhost/odata/$metadata",
-    "value": [
-        {
-            "name": "passengers",
-            "kind": "EntitySet",
-            "url": "passengers"
-        }
-    ]
+    "headers": {
+        "cache-control": [
+            "no-cache, private"
+        ],
+        "content-type": [
+            "application/json;metadata=minimal"
+        ],
+        "odata-version": [
+            "4.01"
+        ],
+        "asyncresult": [
+            "200"
+        ]
+    },
+    "status": 200
 }
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async__6.json b/tests/__snapshots__/Protocol/AsyncTest__test_async__6.json
@@ -1,10 +1,9 @@
 {
-    "@context": "http://localhost/odata/$metadata",
-    "value": [
-        {
-            "name": "passengers",
-            "kind": "EntitySet",
-            "url": "passengers"
-        }
-    ]
+    "error": {
+        "code": "not_found",
+        "message": "Not found",
+        "target": null,
+        "details": [],
+        "innererror": {}
+    }
 }
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async_batch__1.json b/tests/__snapshots__/Protocol/AsyncTest__test_async_batch__1.json
@@ -1,9 +1,11 @@
 {
-    "error": {
-        "code": "accepted",
-        "message": "Accepted",
-        "target": null,
-        "details": [],
-        "innererror": {}
-    }
+    "headers": {
+        "location": [
+            "http://localhost/odata/_lodata/monitor/00000000-0000-0000-0000-000000000001"
+        ],
+        "cache-control": [
+            "no-cache, private"
+        ]
+    },
+    "status": 202
 }
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async_batch__2.json b/tests/__snapshots__/Protocol/AsyncTest__test_async_batch__2.json
@@ -1,9 +1,14 @@
 {
-    "error": {
-        "code": "accepted",
-        "message": "Accepted",
-        "target": null,
-        "details": [],
-        "innererror": {}
-    }
+    "headers": {
+        "cache-control": [
+            "no-cache, private"
+        ],
+        "content-type": [
+            "multipart/mixed;boundary=00000000-0000-0000-0000-000000000002"
+        ],
+        "odata-version": [
+            "4.01"
+        ]
+    },
+    "status": 200
 }
diff --git a/tests/__snapshots__/Protocol/AsyncTest__test_async_batch__3.txt b/tests/__snapshots__/Protocol/AsyncTest__test_async_batch__3.txt
@@ -0,0 +1,9 @@
+
+--00000000-0000-0000-0000-000000000002
+content-type: application/http
+
+HTTP/1.1 404 Not Found
+content-type: application/json
+
+{"error":{"code":"no_handler","message":"No route handler was able to process this request","target":null,"details":[],"innererror":{}}}
+--00000000-0000-0000-0000-000000000002--