Merge branch 'mimic-template-api' into 1.0

WPP-Public · Apr 17, 2018 · 8ecd551 · 8ecd551
2 parents 0463e16 + b4afc6e
commit 8ecd551
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/code/ResponsiveImageExtension.php b/code/ResponsiveImageExtension.php
@@ -112,6 +112,11 @@ protected function createResponsiveSet($config, $defaultArgs, $set)
             $cssClasses = Config::inst()->get(__CLASS__, 'default_css_classes');
         }
 
+        if (!$this->owner->hasMethod($methodName)) {
+            throw new \RuntimeException(get_class($this->owner) . ' has no method ' . $methodName);
+        }
+
+        // Create the resampled images for each query in the set
         $sizes = ArrayList::create();
         foreach ($config['arguments'] as $query => $args) {
             if (is_numeric($query) || !$query) {
@@ -122,27 +127,31 @@ protected function createResponsiveSet($config, $defaultArgs, $set)
                 throw new Exception("Responsive set $set doesn't have any arguments provided for the query: $query");
             }
 
-            array_unshift($args, $methodName);
-            $image = call_user_func_array(array($this->owner, 'getFormattedImage'), $args);
             $sizes->push(ArrayData::create(array(
-                'Image' => $image,
+                'Image' => $this->getResampledImage($methodName, $args),
                 'Query' => $query
             )));
         }
 
-        // The first argument may be an image method such as 'CroppedImage'
-        if (!isset($defaultArgs[0]) || !$this->owner->hasMethod($defaultArgs[0])) {
-            array_unshift($defaultArgs, $methodName);
-        }
-
-        $image = call_user_func_array(array($this->owner, 'getFormattedImage'), $defaultArgs);
         return $this->owner->customise(array(
             'Sizes' => $sizes,
-            'DefaultImage' => $image,
+            'DefaultImage' => $this->getResampledImage($methodName, $defaultArgs),
             'ExtraClasses' => $cssClasses
         ))->renderWith('ResponsiveImageSet');
     }
 
+    /**
+     * Return a resampled image equivalent to $Image.MethodName(...$args) in a template
+     *
+     * @param string $methodName
+     * @param array $args
+     * @return Image
+     */
+    protected function getResampledImage($methodName, $args)
+    {
+        return call_user_func(array($this->owner, '__call'), $methodName, $args);
+    }
+
     /**
      * Due to {@link Object::allMethodNames()} requiring methods to be expressed
      * in all lowercase, getting the config for a given method requires a