rename getElementPath() to getIdentifierPath()

Author: robocoder

lib/WebDriver/Container.php

@@ -213,7 +213,7 @@ protected function webDriverElement($value)
             $identifier = $value[LegacyElement::LEGACY_ELEMENT_ID];
 
             return new LegacyElement(
-                $this->getElementPath($identifier),
+                $this->getIdentifierPath($identifier),
                 $identifier
             );
         }
@@ -222,7 +222,7 @@ protected function webDriverElement($value)
             $identifier = $value[Element::WEB_ELEMENT_ID];
 
             return new Element(
-                $this->getElementPath($identifier),
+                $this->getIdentifierPath($identifier),
                 $identifier
             );
         }
@@ -244,11 +244,11 @@ public function __call($name, $arguments)
     }
 
     /**
-     * Get wire protocol URL for an element
+     * Get wire protocol URL for an identifier
      *
-     * @param string $elementId
+     * @param string $identifier
      *
      * @return string
      */
-    abstract protected function getElementPath($elementId);
+    abstract protected function getIdentifierPath($identifier);
 }

lib/WebDriver/Element.php

@@ -145,7 +145,7 @@ public function shadow()
             $shadowRootReference = $value[Shadow::SHADOW_ROOT_ID];
 
             return new Shadow(
-                preg_replace('/element/' . preg_quote($this->id, '/') . '$/', '/', $this->url), // remove /element/:elementid
+                preg_replace('/' . preg_quote('element/' . $this->id, '/') . '$/', '/', $this->url), // remove /element/:elementid
                 $shadowRootReference
             );
         }
@@ -156,8 +156,8 @@ public function shadow()
     /**
      * {@inheritdoc}
      */
-    protected function getElementPath($elementId)
+    protected function getIdentifierPath($identifier)
     {
-        return preg_replace('/' . preg_quote($this->id, '/') . '$/', $elementId, $this->url);
+        return preg_replace('/' . preg_quote($this->id) . '$/', $identifier, $this->url);
     }
 }

lib/WebDriver/Execute.php

@@ -140,7 +140,7 @@ protected function webDriverElement($value)
             $identifier = $value[LegacyElement::LEGACY_ELEMENT_ID];
 
             return new LegacyElement(
-                $this->getElementPath('/element/' . $identifier),
+                $this->getIdentifierPath('/element/' . $identifier),
                 $identifier
             );
         }
@@ -149,7 +149,7 @@ protected function webDriverElement($value)
             $identifier = $value[Element::WEB_ELEMENT_ID];
 
             return new Element(
-                $this->getElementPath('/element/' . $identifier),
+                $this->getIdentifierPath('/element/' . $identifier),
                 $identifier
             );
         }
@@ -158,7 +158,7 @@ protected function webDriverElement($value)
             $identifier = $value[Shadow::SHADOW_ROOT_ID];
 
             return new Shadow(
-                $this->getElementPath('/shadow/' . $identifier),
+                $this->getIdentifierPath('/shadow/' . $identifier),
                 $identifier
             );
         }
@@ -169,8 +169,8 @@ protected function webDriverElement($value)
     /**
      * {@inheritdoc}
      */
-    protected function getElementPath($identifier)
+    protected function getIdentifierPath($identifier)
     {
-        return preg_replace('~/execute$~', '', $this->url) . $identifier;
+        return preg_replace('~/execute$~', '', $this->url) . $identifier; // remove /execute from path
     }
 }

lib/WebDriver/LegacyExecute.php

@@ -72,7 +72,7 @@ public function sync(array $jsonScript)
     /**
      * {@inheritdoc}
      */
-    protected function getElementPath($identifier)
+    protected function getIdentifierPath($identifier)
     {
         return $this->url . $identifier;
     }

lib/WebDriver/Session.php

@@ -523,9 +523,9 @@ public function setLegacy($legacy)
     /**
      * {@inheritdoc}
      */
-    protected function getElementPath($elementId)
+    protected function getIdentifierPath($identifier)
     {
-        return sprintf('%s/element/%s', $this->url, $elementId);
+        return sprintf('%s/element/%s', $this->url, $identifier);
     }
 
     /**

lib/WebDriver/Shadow.php

@@ -74,8 +74,8 @@ public function getID()
     /**
      * {@inheritdoc}
      */
-    protected function getElementPath($elementId)
+    protected function getIdentifierPath($identifier)
     {
-        return sprintf('%s/element/%s', $this->url, $elementId);
+        return sprintf('%s/element/%s', $this->url, $identifier);
     }
 }