build: php 8, github actions

Author: Gemorroj

.editorconfig

@@ -0,0 +1,17 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.php]
+indent_size = 4
+indent_style = space
+
+[*.md]
+trim_trailing_whitespace = false

.github/workflows/ci.yml

@@ -0,0 +1,93 @@
+name: Continuous Integration
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - operating-system: 'ubuntu-latest'
+            php-version: '7.3'
+            job-description: 'Ubuntu; PHP 7.3; latest-deps'
+
+          - operating-system: 'ubuntu-latest'
+            php-version: '7.3'
+            composer-flags: '--prefer-lowest'
+            job-description: 'Ubuntu; PHP 7.3; lowest-deps'
+
+          - operating-system: 'ubuntu-latest'
+            php-version: '7.4'
+            job-description: 'Ubuntu; PHP 7.4; latest-deps'
+
+          - operating-system: 'ubuntu-latest'
+            php-version: '7.4'
+            composer-flags: '--prefer-lowest'
+            job-description: 'Ubuntu; PHP 7.4; lowest-deps'
+
+          - operating-system: 'ubuntu-latest'
+            php-version: '8.0'
+            job-description: 'Ubuntu; PHP 8.0; latest-deps'
+
+          - operating-system: 'ubuntu-latest'
+            php-version: '8.0'
+            composer-flags: '--prefer-lowest'
+            job-description: 'Ubuntu; PHP 8.0; lowest-deps'
+
+          - operating-system: 'windows-latest'
+            php-version: '8.0'
+            job-description: 'Windows; PHP 8.0; latest-deps'
+
+          - operating-system: 'macos-latest'
+            php-version: '8.0'
+            job-description: 'MacOS; PHP 8.0; latest-deps'
+
+
+    name: ${{ matrix.job-description }}
+
+    runs-on: ${{ matrix.operating-system }}
+
+    steps:
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}-${{ matrix.composer-flags }}
+          restore-keys: |
+            composer-${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}-
+            composer-${{ runner.os }}-${{ matrix.php-version }}-
+            composer-${{ runner.os }}-
+            composer-
+
+      - name: Install dependencies
+        uses: nick-invision/retry@v2
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          retry_wait_seconds: 30
+          command: |
+            composer update --optimize-autoloader --no-interaction --ansi --no-progress --prefer-dist ${{ matrix.composer-flags }}
+            composer info -D
+
+      - name: Tests
+        run: vendor/bin/phpunit --configuration phpunit.xml.dist

.gitignore

@@ -2,7 +2,9 @@
 composer.phar
 composer.lock
 vendor/
+
 phpunit.xml
+.phpunit.result.cache
 
 .php_cs
 .php_cs.cache

.php_cs.dist

@@ -6,7 +6,8 @@ $finder = PhpCsFixer\Finder::create()
 
 return PhpCsFixer\Config::create()
     ->setRules([
-        '@PSR2' => true,
+        '@Symfony' => true,
+        '@PHP73Migration' => true,
         'array_syntax' => ['syntax' => 'short'],
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
@@ -15,12 +16,14 @@ return PhpCsFixer\Config::create()
         'list_syntax' => ['syntax' => 'short'],
         // 'mb_str_functions' => true,
         'native_function_invocation' => true,
+        'native_constant_invocation' => true,
         'no_null_property_initialization' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_imports' => ['sortAlgorithm' => 'alpha'],
         'phpdoc_order' => true,
         'strict_comparison' => true,
+        'combine_nested_dirname' => true,
     ])
     ->setRiskyAllowed(true)
     ->setFinder($finder)

.travis.yml

@@ -2,9 +2,14 @@
 
 [![Build Status](https://secure.travis-ci.org/Gemorroj/HTMLValidator.png?branch=master)](https://travis-ci.org/Gemorroj/HTMLValidator)
 
+
+### Not working now
+todo: https://validator.w3.org/docs/api.html
+
+
 ### Requirements:
 
-- PHP >= 7.1.3
+- PHP >= 7.3
 
 ### Installation:
 ```bash

README.md

@@ -4,7 +4,7 @@
     "description": "W3C HTML Validator service.",
     "license": "LGPL-3.0",
     "require": {
-        "php": "^7.1.3",
+        "php": ">=7.3",
         "ext-dom": "*"
     },
     "authors": [
@@ -13,8 +13,8 @@
         }
     ],
     "require-dev": {
-        "phpunit/phpunit": "^7.5",
-        "friendsofphp/php-cs-fixer": "^2.16"
+        "phpunit/phpunit": "^9.5",
+        "friendsofphp/php-cs-fixer": "^2.18"
     },
     "autoload": {
         "psr-4": {

composer.json

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/7.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.5/phpunit.xsd"
+         beStrictAboutTestsThatDoNotTestAnything="false"
          colors="true"
          bootstrap="vendor/autoload.php"
 >

phpunit.xml.dist

@@ -45,32 +45,31 @@ public function setValidatorUri(string $validatorUri): self
         return $this;
     }
 
-
     /**
-     * @param string $uri
      * @param resource $context
+     *
      * @throws Exception
-     * @return string
      */
     protected function sendRequest(string $uri, $context = null): string
     {
         $data = \file_get_contents($uri, null, $context);
-        if ($data === false) {
+        if (false === $data) {
             throw new Exception('Error send request');
         }
 
         return $data;
     }
-    
+
     /**
-     * Validates a given URI
+     * Validates a given URI.
      *
      * Executes the validator using the current parameters and returns a Response
      * object on success.
      *
      * @param string $uri The address to the page to validate ex: http://example.com/
      *
      * @throws Exception
+     *
      * @return Response object HTMLValidator\Response
      */
     public function validateUri(string $uri): Response
@@ -84,47 +83,49 @@ public function validateUri(string $uri): Response
             'http' => [
                 'method' => 'GET',
                 'header' => 'User-Agent: HTMLValidator',
-            ]
+            ],
         ]);
 
-        $data = $this->sendRequest($this->validatorUri . '?' . $query, $context);
+        $data = $this->sendRequest($this->validatorUri.'?'.$query, $context);
 
         return $this->parseSOAP12Response($data);
     }
-    
+
     /**
-     * Validates the local file
+     * Validates the local file.
      *
      * Requests validation on the local file, from an instance of the W3C validator.
      *
-     * @param string $file file to be validated.
+     * @param string $file file to be validated
      *
      * @throws Exception
+     *
      * @return Response object HTMLValidator\Response
      */
     public function validateFile(string $file): Response
     {
-        if (\file_exists($file) !== true) {
+        if (true !== \file_exists($file)) {
             throw new Exception('File not found');
         }
-        if (\is_readable($file) !== true) {
+        if (true !== \is_readable($file)) {
             throw new Exception('File not readable');
         }
 
         $data = \file_get_contents($file);
-        if ($data === false) {
+        if (false === $data) {
             throw new Exception('Failed get file');
         }
 
         return $this->validateFragment($data);
     }
-    
+
     /**
-     * Validate an html string
+     * Validate an html string.
      *
      * @param string $html full html document fragment
      *
      * @throws Exception
+     *
      * @return Response object HTMLValidator\Response
      */
     public function validateFragment(string $html): Response
@@ -139,30 +140,30 @@ public function validateFragment(string $html): Response
                 'method' => 'POST',
                 'header' => "Content-Type: application/x-www-form-urlencoded\r\nUser-Agent: HTMLValidator",
                 'content' => $query,
-            ]
+            ],
         ]);
 
         $data = $this->sendRequest($this->validatorUri, $context);
 
         return $this->parseSOAP12Response($data);
     }
-    
+
     /**
-     * Parse an XML response from the validator
+     * Parse an XML response from the validator.
      *
      * This function parses a SOAP 1.2 response xml string from the validator.
      *
-     * @param string $xml The raw soap12 XML response from the validator.
+     * @param string $xml the raw soap12 XML response from the validator
      *
      * @throws Exception
-     * @return Response object HTMLValidator\Response
      *
+     * @return Response object HTMLValidator\Response
      */
     protected function parseSOAP12Response(string $xml): Response
     {
         $doc = new \DOMDocument('1.0', 'UTF-8');
 
-        if ($doc->loadXML($xml) === false) {
+        if (false === $doc->loadXML($xml)) {
             throw new Exception('Failed load xml');
         }
 
@@ -172,13 +173,13 @@ protected function parseSOAP12Response(string $xml): Response
         foreach (['uri', 'checkedby', 'doctype', 'charset'] as $var) {
             $element = $doc->getElementsByTagName($var);
             if ($element->length) {
-                $response->{'set' . \ucfirst($var)}($element->item(0)->nodeValue);
+                $response->{'set'.\ucfirst($var)}($element->item(0)->nodeValue);
             }
         }
 
         // Handle the bool element validity
         $element = $doc->getElementsByTagName('validity');
-        if ($element->length && $element->item(0)->nodeValue === 'true') {
+        if ($element->length && 'true' === $element->item(0)->nodeValue) {
             $response->setValidity(true);
         } else {
             $response->setValidity(false);