diff --git a/src/Language/DefaultRegistrations.php b/src/Language/DefaultRegistrations.php
index 05b1e04..6777fa1 100644
--- a/src/Language/DefaultRegistrations.php
+++ b/src/Language/DefaultRegistrations.php
@@ -78,6 +78,7 @@ class DefaultRegistrations implements LanguageRegistration
 
     public function registerExtension(Compiler $compiler) : void
     {
+        $compiler->registerExtension(new \Picea\Extension\PhpExtension());
         $compiler->registerExtension(new \Picea\Extension\JsonExtension($this->context));
         $compiler->registerExtension(new \Picea\Extension\AssetExtension());
         
diff --git a/src/Method/Request.php b/src/Method/Request.php
index 0a222ef..7b8f761 100644
--- a/src/Method/Request.php
+++ b/src/Method/Request.php
@@ -48,17 +48,13 @@ class Request implements Extension {
     {
         return $variableName === null ? $this->request->getParsedBody() : static::arrayGet($this->request->getParsedBody(), $variableName) ?? $default;
     }
-
-<<<<<<< Updated upstream
-    public function server(? string $variableName = null, $default = null)
-=======
+    
     public function request(? string $variableName = null)
     {
-        return $this->post($variableName) ?? $this->get($variableName);
+        return $variableName === null ? array_merge(get(null), post(null)) : $this->post($variableName) ?? $this->get($variableName);
     }
     
     public function server(? string $variableName = null)
->>>>>>> Stashed changes
     {
         return $variableName === null ? $this->request->getServerParams() : static::arrayGet($this->request->getServerParams(), $variableName) ?? $default;
     }