Fixed fallback support for plugins, closes #25

Author: bryannielsen

CHANGELOG.md

@@ -7,6 +7,7 @@
 - Prolet and other ExpressionEngine Control Panel URLs were using old admin route
 - Channel Entries tag support for random ordering
 - An issue preventing the Comment Form Tag from rendering
+- Fallback support for plugins which do not require a method name
 
 ## [2.0.0] - 2025-01-14
 

src/Core.php

@@ -86,7 +86,7 @@ public function runGlobal()
         $headers = $this->getRestrictedProperty($response, 'headers');
 
         if ($body == '') {
-            return (new Response)->fromOutput($status);
+            return (new Response)->fromOutput($status, $headers);
         }
 
         return new \Illuminate\Http\Response($body, $status, $headers);

src/Response.php

@@ -9,9 +9,10 @@ class Response
      * This code is taken from EE_Output::_display() with some modifications
      *
      * @param  int  $status
+     * @param array $headers
      * @return Illuminate\Http\Response
      */
-    public function fromOutput($status = 200)
+    public function fromOutput($status = 200, $headers = [])
     {
         $output = ee()->output->final_output;
         $response = ee('Response') ?: new \ExpressionEngine\Core\Response;
@@ -36,7 +37,6 @@ public function fromOutput($status = 200)
 
         // Content Type Headers
         // Also need to do some extra work for feeds
-
         switch (ee()->output->out_type) {
             case 'webpage':
                 if (! $response->hasHeader('Content-Type')) {
@@ -258,7 +258,7 @@ public function fromOutput($status = 200)
 
         // Transform headers that have already been set on the request
         // to the correct format ["header_name" => "value"]
-        $headers = array_reduce(headers_list(), function ($carry, $header) use ($exclude, $duplicates) {
+        $headers = array_merge($headers, array_reduce(headers_list(), function ($carry, $header) use ($exclude, $duplicates) {
             $header = $this->parseHeader($header);
 
             if (! in_array(strtolower($header->name), $exclude)) {
@@ -271,7 +271,7 @@ public function fromOutput($status = 200)
             }
 
             return $carry;
-        }, []);
+        }, []));
 
         // Transform and set headers that have been assigned to the Output class
         // but not yet set on the request to be ["header_name" => "value"]

src/TemplateOutput.php

@@ -26,7 +26,10 @@ public function value($value)
         if (is_array($value) || $value instanceof Arrayable) {
             $this->array(is_array($value) ? $value : $value->toArray());
         } else {
-            $this->string(is_string($value) ? $value : (string) $value);
+            try {
+                $this->string(is_string($value) ? $value : (string) $value);
+            } catch (\Throwable $e) {
+            }
         }
 
         return $this;

src/View/Exp.php

@@ -29,7 +29,7 @@ public static function boot()
         })->all();
 
         $plugins = Addon\Plugin::get()->keyBy(function ($plugin) {
-            return strtolower($plugin->plugin_name);
+            return strtolower($plugin->plugin_package);
         })->all();
 
         static::$addons = array_merge($plugins, $modules);
@@ -148,6 +148,19 @@ public function __get($key)
         return $fallback;
     }
 
+    public function __call($method, $arguments)
+    {
+        static::boot();
+
+        if ($this->__isset($method)) {
+            $tag = $this->$method;
+
+            if ($tag && $tag instanceof Tag) {
+                return $tag(...$arguments);
+            }
+        }
+    }
+
     public function __isset($key)
     {
         static::boot();

src/View/LegacyTag.php

@@ -35,7 +35,7 @@ public function run()
         }, []);
 
         return Coilpack::isolateTemplateLibrary(function ($template) {
-            $output = $this->getInstanceClass()->{$this->method}();
+            $output = $this->method ? $this->getInstanceClass()->{$this->method}() : $this->getInstanceClass();
             $templateData = $template->get_data();
             $templateOutput = \Expressionengine\Coilpack\TemplateOutput::make();