Removed deprecated features

Author: stof

src/Element/Element.php

@@ -11,7 +11,6 @@
 namespace Behat\Mink\Element;
 
 use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Exception\ElementNotFoundException;
 use Behat\Mink\Selector\SelectorsHandler;
 use Behat\Mink\Selector\Xpath\Manipulator;
 use Behat\Mink\Session;
@@ -23,11 +22,6 @@
  */
 abstract class Element implements ElementInterface
 {
-    /**
-     * @var Session
-     */
-    private $session;
-
     /**
      * Driver.
      *
@@ -53,26 +47,11 @@ abstract class Element implements ElementInterface
     public function __construct(Session $session)
     {
         $this->xpathManipulator = new Manipulator();
-        $this->session = $session;
 
         $this->driver = $session->getDriver();
         $this->selectorsHandler = $session->getSelectorsHandler();
     }
 
-    /**
-     * Returns element session.
-     *
-     * @return Session
-     *
-     * @deprecated Accessing the session from the element is deprecated as of 1.6 and will be impossible in 2.0.
-     */
-    public function getSession()
-    {
-        @trigger_error(sprintf('The method %s is deprecated as of 1.6 and will be removed in 2.0', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->session;
-    }
-
     /**
      * Returns element's driver.
      *
@@ -83,20 +62,6 @@ protected function getDriver()
         return $this->driver;
     }
 
-    /**
-     * Returns selectors handler.
-     *
-     * @return SelectorsHandler
-     *
-     * @deprecated Accessing the selectors handler in the element is deprecated as of 1.7 and will be impossible in 2.0.
-     */
-    protected function getSelectorsHandler()
-    {
-        @trigger_error(sprintf('The method %s is deprecated as of 1.7 and will be removed in 2.0', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->selectorsHandler;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -193,22 +158,4 @@ public function getOuterHtml()
     {
         return $this->getDriver()->getOuterHtml($this->getXpath());
     }
-
-    /**
-     * Builds an ElementNotFoundException.
-     *
-     * @param string      $type
-     * @param string|null $selector
-     * @param string|null $locator
-     *
-     * @return ElementNotFoundException
-     *
-     * @deprecated as of 1.7, to be removed in 2.0
-     */
-    protected function elementNotFound($type, $selector = null, $locator = null)
-    {
-        @trigger_error(sprintf('The method %s is deprecated as of 1.7 and will be removed in 2.0', __METHOD__), E_USER_DEPRECATED);
-
-        return new ElementNotFoundException($this->driver, $type, $selector, $locator);
-    }
 }

src/Element/ElementInterface.php

@@ -10,8 +10,6 @@
 
 namespace Behat\Mink\Element;
 
-use Behat\Mink\Session;
-
 /**
  * Element interface.
  *
@@ -26,15 +24,6 @@ interface ElementInterface
      */
     public function getXpath();
 
-    /**
-     * Returns element's session.
-     *
-     * @return Session
-     *
-     * @deprecated Accessing the session from the element is deprecated as of 1.6 and will be impossible in 2.0.
-     */
-    public function getSession();
-
     /**
      * Checks whether element with specified selector exists inside the current element.
      *

src/Exception/ElementException.php

@@ -12,7 +12,6 @@
 
 use Behat\Mink\Driver\DriverInterface;
 use Behat\Mink\Element\Element;
-use Behat\Mink\Session;
 
 /**
  * Exception thrown when an expectation on the HTML of an element fails.
@@ -31,12 +30,12 @@ class ElementHtmlException extends ExpectationException
     /**
      * Initializes exception.
      *
-     * @param string                  $message   optional message
-     * @param DriverInterface|Session $driver    driver instance
-     * @param Element                 $element   element
+     * @param string          $message   optional message
+     * @param DriverInterface $driver    driver instance
+     * @param Element         $element   element
      * @param \Exception|null         $exception expectation exception
      */
-    public function __construct($message, $driver, Element $element, \Exception $exception = null)
+    public function __construct($message, DriverInterface $driver, Element $element, \Exception $exception = null)
     {
         $this->element = $element;
 

src/Exception/ElementHtmlException.php

@@ -11,7 +11,6 @@
 namespace Behat\Mink\Exception;
 
 use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Session;
 
 /**
  * Exception thrown when an expected element is not found.
@@ -23,12 +22,12 @@ class ElementNotFoundException extends ExpectationException
     /**
      * Initializes exception.
      *
-     * @param DriverInterface|Session $driver   driver instance
-     * @param string|null             $type     element type
-     * @param string|null             $selector element selector type
+     * @param DriverInterface $driver   driver instance
+     * @param string|null          $type     element type
+     * @param string|null          $selector element selector type
      * @param string|null             $locator  element locator
      */
-    public function __construct($driver, $type = null, $selector = null, $locator = null)
+    public function __construct(DriverInterface $driver, $type = null, $selector = null, $locator = null)
     {
         $message = '';
 

src/Exception/ElementNotFoundException.php

@@ -11,7 +11,6 @@
 namespace Behat\Mink\Exception;
 
 use Behat\Mink\Driver\DriverInterface;
-use Behat\Mink\Session;
 
 /**
  * Exception thrown for failed expectations.
@@ -22,10 +21,6 @@
  */
 class ExpectationException extends Exception
 {
-    /**
-     * @var Session|null
-     */
-    private $session;
     /**
      * @var DriverInterface
      */
@@ -34,23 +29,13 @@ class ExpectationException extends Exception
     /**
      * Initializes exception.
      *
-     * @param string                  $message   optional message
-     * @param DriverInterface|Session $driver    driver instance (or session for BC)
-     * @param \Exception|null         $exception expectation exception
+     * @param string          $message   optional message
+     * @param DriverInterface $driver    driver instance
+     * @param \Exception|null $exception expectation exception
      */
-    public function __construct($message, $driver, \Exception $exception = null)
+    public function __construct($message, DriverInterface $driver, \Exception $exception = null)
     {
-        if ($driver instanceof Session) {
-            @trigger_error('Passing a Session object to the ExpectationException constructor is deprecated as of Mink 1.7. Pass the driver instead.', E_USER_DEPRECATED);
-
-            $this->session = $driver;
-            $this->driver = $driver->getDriver();
-        } elseif (!$driver instanceof DriverInterface) {
-            // Trigger an exception as we cannot typehint a disjunction
-            throw new \InvalidArgumentException('The ExpectationException constructor expects a DriverInterface or a Session.');
-        } else {
-            $this->driver = $driver;
-        }
+        $this->driver = $driver;
 
         if (!$message && null !== $exception) {
             $message = $exception->getMessage();
@@ -96,24 +81,6 @@ protected function getDriver()
         return $this->driver;
     }
 
-    /**
-     * Returns exception session.
-     *
-     * @return Session
-     *
-     * @deprecated since 1.7, to be removed in 2.0. Use getDriver and the driver API instead.
-     */
-    protected function getSession()
-    {
-        if (null === $this->session) {
-            throw new \LogicException(sprintf('The deprecated method %s cannot be used when passing a driver in the constructor', __METHOD__));
-        }
-
-        @trigger_error(sprintf('The method %s is deprecated as of Mink 1.7 and will be removed in 2.0. Use getDriver and the driver API instead.', __METHOD__), E_USER_DEPRECATED);
-
-        return $this->session;
-    }
-
     /**
      * Prepends every line in a string with pipe (|).
      *

src/Exception/ExpectationException.php

@@ -272,21 +272,6 @@ public function registerReplacement($from, $to)
 
     private function escapeLocator(string $locator): string
     {
-        // If the locator looks like an escaped one, don't escape it again for BC reasons.
-        if (
-            preg_match('/^\'[^\']*+\'$/', $locator)
-            || (false !== strpos($locator, '\'') && preg_match('/^"[^"]*+"$/', $locator))
-            || ((8 < $length = strlen($locator)) && 'concat(' === substr($locator, 0, 7) && ')' === $locator[$length - 1])
-        ) {
-            @trigger_error(
-                'Passing an escaped locator to the named selector is deprecated as of 1.7 and will be removed in 2.0.'
-                .' Pass the raw value instead.',
-                E_USER_DEPRECATED
-            );
-
-            return $locator;
-        }
-
         return $this->xpathEscaper->escapeLiteral($locator);
     }
 }

src/Selector/NamedSelector.php

@@ -10,8 +10,6 @@
 
 namespace Behat\Mink\Selector;
 
-use Behat\Mink\Selector\Xpath\Escaper;
-
 /**
  * Selectors handler.
  *
@@ -23,10 +21,6 @@ class SelectorsHandler
      * @var array<string, SelectorInterface>
      */
     private $selectors = [];
-    /**
-     * @var Escaper
-     */
-    private $escaper;
 
     /**
      * Initializes selectors handler.
@@ -35,8 +29,6 @@ class SelectorsHandler
      */
     public function __construct(array $selectors = array())
     {
-        $this->escaper = new Escaper();
-
         $this->registerSelector('named_partial', new PartialNamedSelector());
         $this->registerSelector('named_exact', new ExactNamedSelector());
         $this->registerSelector('css', new CssSelector());
@@ -82,15 +74,6 @@ public function isSelectorRegistered($name)
      */
     public function getSelector($name)
     {
-        if ('named' === $name) {
-            @trigger_error(
-                'Using the "named" selector directly from the handler is deprecated as of 1.6 and will be removed in 2.0.'
-                .' Use the "named_partial" or use the "named" selector through the Element API instead.',
-                E_USER_DEPRECATED
-            );
-            $name = 'named_partial';
-        }
-
         if (!$this->isSelectorRegistered($name)) {
             throw new \InvalidArgumentException("Selector \"$name\" is not registered.");
         }
@@ -118,26 +101,4 @@ public function selectorToXpath($selector, $locator)
 
         return $this->getSelector($selector)->translateToXPath($locator);
     }
-
-    /**
-     * Translates string to XPath literal.
-     *
-     * @deprecated since Mink 1.7. Use \Behat\Mink\Selector\Xpath\Escaper::escapeLiteral when building Xpath
-     *             or pass the unescaped value when using the named selector.
-     *
-     * @param string $s
-     *
-     * @return string
-     */
-    public function xpathLiteral($s)
-    {
-        @trigger_error(
-            'The '.__METHOD__.' method is deprecated as of 1.7 and will be removed in 2.0.'
-            .' Use \Behat\Mink\Selector\Xpath\Escaper::escapeLiteral instead when building Xpath'
-            .' or pass the unescaped value when using the named selector.',
-            E_USER_DEPRECATED
-        );
-
-        return $this->escaper->escapeLiteral($s);
-    }
 }