Fix implementation of /session/:sessionid/element/:elementid/shadow

Author: robocoder

lib/WebDriver/Element.php

@@ -132,12 +132,25 @@ public function getID()
      * shadow root method chaining, e.g.,
      * - $element->method()
      *
-     * @return \WebDriver\Shadow
+     * @return \WebDriver\Shadow|null
      *
      */
     public function shadow()
     {
-        return new Shadow($this->url . '/shadow', $this->legacy);
+        $result = $this->curl('POST', '/shadow');
+        $value  = $result['value'];
+
+        if (array_key_exists(Shadow::SHADOW_ROOT_ID, (array) $value)) {
+            $shadowRootReference = $value[Shadow::SHADOW_ROOT_ID];
+
+            return new Shadow(
+                preg_replace('/element/' . preg_quote($this->id, '/') . '$/', '/', $this->url), // remove /element/:elementid
+                $shadowRootReference,
+                $this->legacy
+            );
+        }
+
+        return null;
     }
 
     /**

lib/WebDriver/Shadow.php

@@ -41,11 +41,42 @@ protected function methods()
         return array();
     }
 
+    /**
+     * Shadow ID
+     *
+     * @var string
+     */
+    private $id;
+
+    /**
+     * Constructor
+     *
+     * @param string  $url    URL
+     * @param string  $id     shadow ID
+     * @param boolean $legacy Is legacy?
+     */
+    public function __construct($url, $id, $legacy)
+    {
+        parent::__construct($url, $legacy);
+
+        $this->id = $id;
+    }
+
+    /**
+     * Get shadow ID
+     *
+     * @return string
+     */
+    public function getID()
+    {
+        return $this->id;
+    }
+
     /**
      * {@inheritdoc}
      */
-    protected function getElementPath($elementId)
+    protected function getElementPath($shadowId)
     {
-        return sprintf('%s/element/%s', $this->url, $elementId);
+        return sprintf('%s/shadow/%s', $this->url, $shadowId);
     }
 }