build: drop php 7.1 and 7.2 support add php 8 support

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

.gitignore

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

.php_cs.dist

@@ -7,6 +7,8 @@ $finder = PhpCsFixer\Finder::create()
 return PhpCsFixer\Config::create()
     ->setRules([
         '@PSR2' => true,
+        '@PhpCsFixer' => true,
+        '@PHP73Migration' => true,
         'array_syntax' => ['syntax' => 'short'],
         'combine_consecutive_issets' => true,
         'combine_consecutive_unsets' => true,
@@ -15,12 +17,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

@@ -1,9 +1,8 @@
 language: php
 php:
-    - 7.1
-    - 7.2
     - 7.3
     - 7.4
+    - 8.0
     - nightly
 
 matrix:

README.md

@@ -19,7 +19,7 @@ print_r($resultCheckFile);
 
 ### Requirements:
 
-- PHP >= 7.1.3
+- PHP >= 7.3
 
 ### Installation:
 ```bash

composer.json

@@ -4,12 +4,12 @@
     "description": "PHP code syntax checker.",
     "license": "LGPL-3.0",
     "require": {
-        "php": "^7.1.3",
-        "symfony/process": "^4.2|5.0"
+        "php": ">=7.3",
+        "symfony/process": "^4.4|^5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5",
-        "friendsofphp/php-cs-fixer": "^2.16"
+        "phpunit/phpunit": "^9.5",
+        "friendsofphp/php-cs-fixer": "^2.17"
     },
     "authors": [
         {

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?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"
          colors="true"
          bootstrap="vendor/autoload.php"
 >

src/Php.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Syntax;
 
 use Symfony\Component\Process\Process;
@@ -13,7 +14,6 @@ class Php
     private $sourceCharset;
     private $resultCharset = 'UTF-8';
 
-
     public function __construct()
     {
         $this->tempDirectory = \sys_get_temp_dir();
@@ -22,6 +22,7 @@ public function __construct()
     public function setResultCharset(string $resultCharset): self
     {
         $this->resultCharset = $resultCharset;
+
         return $this;
     }
 
@@ -33,6 +34,7 @@ public function getResultCharset(): string
     public function setSourceCharset(?string $sourceCharset): self
     {
         $this->sourceCharset = $sourceCharset;
+
         return $this;
     }
 
@@ -44,6 +46,7 @@ public function getSourceCharset(): ?string
     public function setCli(string $path): self
     {
         $this->cli = $path;
+
         return $this;
     }
 
@@ -55,6 +58,7 @@ public function getCli(): string
     public function setTempDirectory(string $path): self
     {
         $this->tempDirectory = $path;
+
         return $this;
     }
 
@@ -82,11 +86,11 @@ public function check(string $source): array
             throw new \Exception('Could not close temp file');
         }
 
-
         try {
             $result = $this->checkFile($file);
         } catch (\Throwable $e) {
             \unlink($file);
+
             throw $e;
         }
 
@@ -95,31 +99,20 @@ public function check(string $source): array
         return $this->formatCheckOutput($result);
     }
 
-    protected function formatCheckOutput(array $result): array
-    {
-        if (isset($result['errors'])) {
-            \array_walk($result['errors'], static function (&$item) {
-                $item['file'] = null;
-            });
-        }
-
-        return $result;
-    }
-
     public function checkFile(string $file): array
     {
         $result = $this->execute($file);
 
         if (0 === $result['code']) {
             return [
                 'validity' => true,
-                'errors' => null
+                'errors' => null,
             ];
         }
 
         $fullMessage = \preg_replace('/ in (?:.+) on line (?:[0-9]+)$/', '', $result['output']);
         \preg_match('/ on line ([0-9]+)$/', $result['output'], $matchLine);
-        $line = isset($matchLine[1]) ? (int)($matchLine[1]) : null;
+        $line = isset($matchLine[1]) ? (int) ($matchLine[1]) : null;
 
         [$type, $message] = \explode(': ', $fullMessage);
 
@@ -131,12 +124,28 @@ public function checkFile(string $file): array
                     'code' => $result['code'],
                     'line' => $line,
                     'type' => $type,
-                    'message' => $this->convertMessage($message)
+                    'message' => $this->convertMessage($message),
                 ],
             ],
         ];
     }
 
+    public static function formatOutputHelper(string $source, int $line, string $cssCodeClass = 'syntax-code', string $cssCodeCorrectLineClass = 'syntax-correct-line', string $cssCodeIncorrectLineClass = 'syntax-incorrect-line'): string
+    {
+        return '<div class="'.\htmlspecialchars($cssCodeClass).'"><pre><code>'.self::formatCode($source, $line, $cssCodeCorrectLineClass, $cssCodeIncorrectLineClass).'</code></pre></div>';
+    }
+
+    protected function formatCheckOutput(array $result): array
+    {
+        if (isset($result['errors'])) {
+            \array_walk($result['errors'], static function (&$item) {
+                $item['file'] = null;
+            });
+        }
+
+        return $result;
+    }
+
     protected function convertMessage(string $message): string
     {
         if (null !== $this->getSourceCharset()) {
@@ -169,11 +178,6 @@ protected function execute(string $file): array
         ];
     }
 
-    public static function formatOutputHelper(string $source, int $line, string $cssCodeClass = 'syntax-code', string $cssCodeCorrectLineClass = 'syntax-correct-line', string $cssCodeIncorrectLineClass = 'syntax-incorrect-line'): string
-    {
-        return '<div class="' . \htmlspecialchars($cssCodeClass) . '"><pre><code>' . self::formatCode($source, $line, $cssCodeCorrectLineClass, $cssCodeIncorrectLineClass) . '</code></pre></div>';
-    }
-
     protected static function formatCode(string $source, int $line, string $cssCodeCorrectLineClass = 'syntax-correct-line', string $cssCodeIncorrectLineClass = 'syntax-incorrect-line'): string
     {
         $array = self::formatXhtmlHighlight($source);
@@ -183,7 +187,7 @@ protected static function formatCode(string $source, int $line, string $cssCodeC
         for ($i = 0; $i < $all; ++$i) {
             $next = $i + 1;
             $l = \strlen($next);
-            $page .= '<span class="' . \htmlspecialchars($line === $next ? $cssCodeIncorrectLineClass : $cssCodeCorrectLineClass) . '">' . ($l < $len ? \str_repeat('&#160;', $len - $l) : '') . $next . '</span> ' . $array[$i] . "\n";
+            $page .= '<span class="'.\htmlspecialchars($line === $next ? $cssCodeIncorrectLineClass : $cssCodeCorrectLineClass).'">'.($l < $len ? \str_repeat('&#160;', $len - $l) : '').$next.'</span> '.$array[$i]."\n";
         }
 
         return $page;

tests/PhpTest.php

@@ -1,17 +1,22 @@
 <?php
+
 namespace Syntax\Tests;
 
 use PHPUnit\Framework\TestCase;
 use Syntax\Php;
 
+/**
+ * @internal
+ * @coversNothing
+ */
 class PhpTest extends TestCase
 {
     /**
      * @var Php
      */
     private $syntax;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->syntax = new Php();
     }
@@ -23,15 +28,13 @@ public function testCheck()
         self::assertEquals(['validity' => true, 'errors' => null], $result);
     }
 
-
     public function testCheckFile()
     {
-        $result = $this->syntax->checkFile(__DIR__ . '/fixtures/correct.php');
+        $result = $this->syntax->checkFile(__DIR__.'/fixtures/correct.php');
 
         self::assertEquals(['validity' => true, 'errors' => null], $result);
     }
 
-
     public function testCheckFail()
     {
         $result = $this->syntax->check('<?php echo "; ?>');
@@ -49,10 +52,9 @@ public function testCheckFail()
         self::assertTrue(\is_string($result['errors'][0]['message']));
     }
 
-
     public function testCheckFileFail()
     {
-        $result = $this->syntax->checkFile(__DIR__ . '/fixtures/fail.php');
+        $result = $this->syntax->checkFile(__DIR__.'/fixtures/fail.php');
 
         self::assertTrue(\is_array($result));
 
@@ -66,14 +68,13 @@ public function testCheckFileFail()
         self::assertTrue(\is_string($result['errors'][0]['type']));
         self::assertTrue(\is_string($result['errors'][0]['message']));
 
-        self::assertEquals(__DIR__ . '/fixtures/fail.php', $result['errors'][0]['file']);
+        self::assertEquals(__DIR__.'/fixtures/fail.php', $result['errors'][0]['file']);
     }
 
-
     public function testFormatOutputHelper()
     {
         $result = Php::formatOutputHelper(
-            '<?php echo ";' . "\n" . 'echo 1; ?>',
+            '<?php echo ";'."\n".'echo 1; ?>',
             1
         );