Merge pull request #95 from stof/cleanup

Minor code cleanup

Author: stof

Diff for: src/Behat/Mink/Driver/BrowserKitDriver.php

@@ -415,7 +415,7 @@ public function getAttribute($xpath, $name)
      */
     public function getValue($xpath)
     {
-        if (in_array($this->getAttribute($xpath, 'type'), array('submit', 'image', 'button'))) {
+        if (in_array($this->getAttribute($xpath, 'type'), array('submit', 'image', 'button'), true)) {
             return $this->getAttribute($xpath, 'value');
         }
 
@@ -487,25 +487,25 @@ public function isSelected($xpath)
         $selectField = $this->getFormField('(' . $xpath . ')/ancestor-or-self::*[local-name()="select"]');
         $selectValue = $selectField->getValue();
 
-        return is_array($selectValue) ? in_array($optionValue, $selectValue) : $optionValue == $selectValue;
+        return is_array($selectValue) ? in_array($optionValue, $selectValue, true) : $optionValue === $selectValue;
     }
 
     /**
      * {@inheritdoc}
      */
     public function click($xpath)
     {
-        $node = $this->getFilteredCrawler($xpath);
-        $crawlerNode = $this->getCrawlerNode($node);
-        $tagName = $crawlerNode->nodeName;
+        $crawler = $this->getFilteredCrawler($xpath);
+        $node = $this->getCrawlerNode($crawler);
+        $tagName = $node->nodeName;
 
         if ('a' === $tagName) {
-            $this->client->click($node->link());
+            $this->client->click($crawler->link());
             $this->forms = array();
-        } elseif ($this->canSubmitForm($crawlerNode)) {
-            $this->submit($node->form());
-        } elseif ($this->canResetForm($crawlerNode)) {
-            $this->resetForm($crawlerNode);
+        } elseif ($this->canSubmitForm($node)) {
+            $this->submit($crawler->form());
+        } elseif ($this->canResetForm($node)) {
+            $this->resetForm($node);
         } else {
             $message = sprintf('%%s supports clicking on links and submit or reset buttons only. But "%s" provided', $tagName);
 
@@ -810,11 +810,11 @@ private function canSubmitForm(\DOMElement $node)
     {
         $type = $node->hasAttribute('type') ? $node->getAttribute('type') : null;
 
-        if ('input' == $node->nodeName && in_array($type, array('submit', 'image'))) {
+        if ('input' === $node->nodeName && in_array($type, array('submit', 'image'), true)) {
             return true;
         }
 
-        return 'button' == $node->nodeName && (null === $type || 'submit' == $type);
+        return 'button' === $node->nodeName && (null === $type || 'submit' === $type);
     }
 
     /**
@@ -828,7 +828,7 @@ private function canResetForm(\DOMElement $node)
     {
         $type = $node->hasAttribute('type') ? $node->getAttribute('type') : null;
 
-        return in_array($node->nodeName, array('input', 'button')) && 'reset' == $type;
+        return in_array($node->nodeName, array('input', 'button'), true) && 'reset' === $type;
     }
 
     /**
@@ -881,10 +881,10 @@ private function mergeForms(Form $to, Form $from)
             $nodeReflection->setAccessible(true);
             $valueReflection->setAccessible(true);
 
-            if (!($field instanceof InputFormField && in_array(
-                $nodeReflection->getValue($field)->getAttribute('type'),
-                array('submit', 'button', 'image')
-            ))) {
+            $isIgnoredField = $field instanceof InputFormField &&
+                in_array($nodeReflection->getValue($field)->getAttribute('type'), array('submit', 'button', 'image'), true);
+
+            if (!$isIgnoredField) {
                 $valueReflection->setValue($to[$name], $valueReflection->getValue($field));
             }
         }