Cleanups

Author: nicolas-grekas

README.md

@@ -41,9 +41,6 @@ Use [Composer](https://getcomposer.org/) to install Panther in your project. You
 
  composer req --dev symfony/panther
 
-**Warning:** On \*nix systems, the `unzip` command must be installed, or you will encounter an error similar to `RuntimeException: sh: 1: exec: /app/vendor/symfony/panther/src/ProcessManager/../../chromedriver-bin/chromedriver_linux64: Permission denied` (or `chromedriver_linux64: not found`).
-The underlying reason is that PHP's `ZipArchive` doesn't preserve UNIX executable permissions.
-
 ### Installing ChromeDriver and geckodriver
 
 Panther uses the WebDriver protocol to control the browser used to crawl websites.

src/DomCrawler/Crawler.php

@@ -61,7 +61,7 @@ public function addHtmlContent($content, $charset = 'UTF-8'): void
  throw $this->createNotSupportedException(__METHOD__);
  }
 
- public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NONET): void
+ public function addXmlContent($content, $charset = 'UTF-8', $options = \LIBXML_NONET): void
  {
  throw $this->createNotSupportedException(__METHOD__);
  }

src/DomCrawler/Field/FileFormField.php

@@ -37,14 +37,14 @@ public function setValue($value)
  $value = $this->sanitizeValue($value);
 
  if (null !== $value && \is_readable($value)) {
- $error = UPLOAD_ERR_OK;
+ $error = \UPLOAD_ERR_OK;
  $size = \filesize($value);
- $name = \pathinfo($value, PATHINFO_BASENAME);
+ $name = \pathinfo($value, \PATHINFO_BASENAME);
 
  $this->setFilePath($value);
  $value = $this->element->getAttribute('value');
  } else {
- $error = UPLOAD_ERR_NO_FILE;
+ $error = \UPLOAD_ERR_NO_FILE;
  $size = 0;
  $name = '';
  $value = '';
@@ -91,11 +91,11 @@ protected function initialize()
  private function setValueFromTmp($tmpValue)
  {
  $value = $tmpValue;
- $error = UPLOAD_ERR_OK;
+ $error = \UPLOAD_ERR_OK;
  // size not determinable
  $size = 0;
  // C:\fakepath\filename.extension
- $basename = \pathinfo($value, PATHINFO_BASENAME);
+ $basename = \pathinfo($value, \PATHINFO_BASENAME);
  $nameParts = \explode('\\', $basename);
  $name = \end($nameParts);
 

src/PantherTestCase.php

@@ -19,11 +19,11 @@
 if (\class_exists(WebTestCase::class)) {
  abstract class PantherTestCase extends WebTestCase
  {
+ use WebTestAssertionsTrait;
+
  public const CHROME = 'chrome';
  public const FIREFOX = 'firefox';
 
- use WebTestAssertionsTrait;
-
  protected function tearDown(): void
  {
  $this->doTearDown();
@@ -39,9 +39,9 @@ private function doTearDown(): void
  // Without Symfony
  abstract class PantherTestCase extends TestCase
  {
+ use PantherTestCaseTrait;
+
  public const CHROME = 'chrome';
  public const FIREFOX = 'firefox';
-
- use PantherTestCaseTrait;
  }
 }

src/ProcessManager/ChromeManager.php

@@ -82,7 +82,7 @@ public function quit(): void
  private function findChromeDriverBinary(): string
  {
  if ($binary = $_SERVER['PANTHER_CHROME_DRIVER_BINARY'] ?? null) {
- @trigger_error('The "PANTHER_CHROME_DRIVER_BINARY" environment variable is deprecated since Panther 0.9, add ChromeDriver to your PATH instead.', E_USER_DEPRECATED);
+ @trigger_error('The "PANTHER_CHROME_DRIVER_BINARY" environment variable is deprecated since Panther 0.9, add ChromeDriver to your PATH instead.', \E_USER_DEPRECATED);
 
  return $binary;
  }

src/ProcessManager/FirefoxManager.php

@@ -81,7 +81,7 @@ public function quit(): void
  private function findGeckodriverBinary(): string
  {
  if ($binary = $_SERVER['PANTHER_GECKO_DRIVER_BINARY'] ?? null) {
- @trigger_error('The "PANTHER_GECKO_DRIVER_BINARY" environment variable is deprecated since Panther 0.9, add geckodriver to your PATH instead.', E_USER_DEPRECATED);
+ @trigger_error('The "PANTHER_GECKO_DRIVER_BINARY" environment variable is deprecated since Panther 0.9, add geckodriver to your PATH instead.', \E_USER_DEPRECATED);
 
  return $binary;
  }

src/ServerListener.php

@@ -29,7 +29,7 @@ final class ServerListener implements TestListener
 
  public function __construct()
  {
- @trigger_error(sprintf('The "%s" class is deprecated since Panther 0.6, use "%s" instead.', self::class, ServerExtension::class), E_USER_DEPRECATED);
+ @trigger_error(sprintf('The "%s" class is deprecated since Panther 0.6, use "%s" instead.', self::class, ServerExtension::class), \E_USER_DEPRECATED);
  }
 
  public function startTestSuite(TestSuite $suite): void

src/ServerTrait.php

@@ -40,7 +40,7 @@ private function pause($message): void
  ) {
  echo "$message\n\nPress enter to continue...";
  if (!$this->testing) {
- fgets(STDIN);
+ fgets(\STDIN);
  }
  }
  }

tests/DomCrawler/Field/FileFormFieldTest.php

@@ -109,7 +109,7 @@ public function testFileUploadWithInvalidValue(callable $clientFactory)
  'name' => '',
  'type' => '',
  'tmp_name' => '',
- 'error' => UPLOAD_ERR_NO_FILE,
+ 'error' => \UPLOAD_ERR_NO_FILE,
  'size' => 0,
  ],
  $fileFormField->getValue()

tests/WebDriver/WebDriverCheckBoxTest.php

@@ -147,7 +147,7 @@ public function testWebDriverCheckboxSelectByIndexInvalid()
  $element = $crawler->filterXPath('//input[@type="checkbox"]')->getElement(0);
 
  $c = new WebDriverCheckbox($element);
- $c->selectByIndex(PHP_INT_MAX);
+ $c->selectByIndex(\PHP_INT_MAX);
  }
 
  /**