Move to github actions

phpfui · phpfui · commit 2fe1a488c0c2 · 2021-10-26T19:57:02.000-04:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,40 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  php-tests:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.0, 7.4, 7.3, 7.2]
+        dependency-version: [prefer-stable]
+        os: [ubuntu-latest, windows-latest]
+
+    name: ${{ matrix.os }} - PHP${{ matrix.php }} - ${{ matrix.dependency-version }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, intl
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --ignore-platform-reqs
+
+      - name: Execute tests
+        run: vendor/bin/phpunit
+
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,6 @@ vendor/
 .idea/
 bin/
 composer.lock
-.php_cs.cache
 .phpunit.result.cache
+.php-cs-fixer.cache
 phpunit.xml
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
diff --git a/.php_cs.dist b/.php_cs.dist
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PHPFUI\HTMLUnitTester [![Build Status](https://api.travis-ci.com/phpfui/HTMLUnitTester.png?branch=master)](https://api.travis-ci.com/phpfui/HTMLUnitTester) [![Latest Packagist release](https://img.shields.io/packagist/v/phpfui/html-unit-tester.svg)](https://packagist.org/packages/phpfui/html-unit-tester)
+# PHPFUI\HTMLUnitTester [![Tests](https://github.com/phpfui/HTMLUnitTester/actions/workflows/tests.yml/badge.svg)](https://github.com/phpfui/HTMLUnitTester/actions?query=workflow%3Atests) [![Latest Packagist release](https://img.shields.io/packagist/v/phpfui/html-unit-tester.svg)](https://packagist.org/packages/phpfui/html-unit-tester)
 
 [PHPUnit](https://phpunit.de/) Testing extensions for HMTL and CSS. **PHPFUI\HTMLUnitTester** allows you to unit test HTML and CSS for errors and warnings. Often simple errors in HTML or CSS create hard to debug issues where a simple check will reveal bad code.
 
diff --git a/composer.json b/composer.json
@@ -12,14 +12,14 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": "^7.2 | <8.1",
         "rexxars/html-validator": ">=2.2"
     },
     "require-dev": {
         "phpunit/phpunit": ">=7.0",
         "phpfui/phpunit-syntax-coverage": ">=1.0",
         "roave/security-advisories": "dev-latest",
-        "fabpot/php-cs-fixer": "dev-master"
+        "friendsofphp/php-cs-fixer": "^3.2"
     },
     "autoload": {
         "psr-0": {"PHPFUI": "src/"}
diff --git a/src/PHPFUI/HTMLUnitTester/Extensions.php b/src/PHPFUI/HTMLUnitTester/Extensions.php
@@ -93,8 +93,9 @@ public function assertDirectory(string $type, string $directory, string $message
 		if ($recurseSubdirectories)
 			{
 			$iterator = new \RecursiveIteratorIterator(
-					new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),
-					\RecursiveIteratorIterator::SELF_FIRST);
+				new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),
+				\RecursiveIteratorIterator::SELF_FIRST
+			);
 			}
 		else
 			{
diff --git a/tests/SyntaxTest.php b/tests/SyntaxTest.php
@@ -2,10 +2,8 @@
 
 class SyntaxTest extends \PHPFUI\PHPUnitSyntaxCoverage\Extensions
 	{
-
 	public function testDirectory() : void
 		{
 		$this->assertValidPHPDirectory(__DIR__ . '/../src', 'src directory has an error');
 		}
-
 	}
diff --git a/tests/UnitTest.php b/tests/UnitTest.php
@@ -9,12 +9,8 @@
  * the LICENSE.md file that was distributed with this source
  * code
  */
-
-use \PHPFUI\HTMLUnitTester\Extensions;
-
 class UnitTest extends \PHPFUI\HTMLUnitTester\Extensions
 	{
-
 	public function testNotWarningCss() : void
 		{
 		$this->assertNotWarningCss('strong {font-weight: bolder;}');
@@ -65,7 +61,7 @@ public function testValidFile() : void
 		$this->assertValidFile('examples/valid.html');
 		}
 
-	public function testValidHtml()
+	public function testValidHtml() : void
 		{
 		$this->assertValidHtml('<h1>Header</h1>');
 		$this->assertValidHtml('<!DOCTYPE html><html><head><meta charset="utf-8"/><title>Title</title></head><body><div>This is a test</div></body></html>');
@@ -83,5 +79,4 @@ public function testDirectory() : void
 		$this->assertDirectory('NotWarning', 'examples');
 		$this->assertDirectory('NotWarningCSS', 'examples');
 		}
-
-	}
+	}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,35 +1,37 @@
 <?php
 
-error_reporting(E_ALL);
+\error_reporting(E_ALL);
 
 function classNameExists(string $className) : string
   {
-  $path = ".\\src\\$className.php";
-  if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
-    {
-    $path = str_replace('\\', '/', $path);
-    }
+  $path = ".\\src\\{$className}.php";
 
-  return file_exists($path) ? $path : '';
+  if ('WIN' !== \strtoupper(\substr(PHP_OS, 0, 3)))
+	{
+	$path = \str_replace('\\', '/', $path);
+	}
+
+  return \file_exists($path) ? $path : '';
   }
 
-function autoload($className)
+function autoload($className) : void
   {
-  $path = classNameExists($className);
+  $path = \classNameExists($className);
+
   if ($path)
-    {
-    /** @noinspection PhpIncludeInspection */
-    include $path;
-    }
+	{
+	/** @noinspection PhpIncludeInspection */
+	include $path;
+	}
   }
-spl_autoload_register('autoload');
+\spl_autoload_register('autoload');
 
 $vendorDir = __DIR__ . '/../../..';
 
-if (file_exists($file = $vendorDir . '/autoload.php')) {
-    require_once $file;
-} elseif (file_exists($file = './vendor/autoload.php')) {
-    require_once $file;
+if (\file_exists($file = $vendorDir . '/autoload.php')) {
+	require_once $file;
+} elseif (\file_exists($file = './vendor/autoload.php')) {
+	require_once $file;
 } else {
-    throw new \RuntimeException('Composer autoload file not found');
-}
+	throw new \RuntimeException('Composer autoload file not found');
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# PHPFUI\HTMLUnitTester [![Build Status](https://api.travis-ci.com/phpfui/HTMLUnitTester.png?branch=master)](https://api.travis-ci.com/phpfui/HTMLUnitTester) [![Latest Packagist release](https://img.shields.io/packagist/v/phpfui/html-unit-tester.svg)](https://packagist.org/packages/phpfui/html-unit-tester)`
	`1`	`+# PHPFUI\HTMLUnitTester [![Tests](https://github.com/phpfui/HTMLUnitTester/actions/workflows/tests.yml/badge.svg)](https://github.com/phpfui/HTMLUnitTester/actions?query=workflow%3Atests) [![Latest Packagist release](https://img.shields.io/packagist/v/phpfui/html-unit-tester.svg)](https://packagist.org/packages/phpfui/html-unit-tester)`
`2`	`2`
`3`	`3`	`[PHPUnit](https://phpunit.de/) Testing extensions for HMTL and CSS. PHPFUI\HTMLUnitTester allows you to unit test HTML and CSS for errors and warnings. Often simple errors in HTML or CSS create hard to debug issues where a simple check will reveal bad code.`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,9 @@ public function assertDirectory(string $type, string $directory, string $message`
`93`	`93`	`if ($recurseSubdirectories)`
`94`	`94`	`{`
`95`	`95`	`$iterator = new \RecursiveIteratorIterator(`
`96`		`- new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),`
`97`		`- \RecursiveIteratorIterator::SELF_FIRST);`
	`96`	`+ new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),`
	`97`	`+ \RecursiveIteratorIterator::SELF_FIRST`
	`98`	`+ );`
`98`	`99`	`}`
`99`	`100`	`else`
`100`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,8 @@`
`2`	`2`
`3`	`3`	`class SyntaxTest extends \PHPFUI\PHPUnitSyntaxCoverage\Extensions`
`4`	`4`	`{`
`5`		`-`
`6`	`5`	`public function testDirectory() : void`
`7`	`6`	`{`
`8`	`7`	`$this->assertValidPHPDirectory(__DIR__ . '/../src', 'src directory has an error');`
`9`	`8`	`}`
`10`		`-`
`11`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,8 @@`
`9`	`9`	`* the LICENSE.md file that was distributed with this source`
`10`	`10`	`* code`
`11`	`11`	`*/`
`12`		`-`
`13`		`-use \PHPFUI\HTMLUnitTester\Extensions;`
`14`		`-`
`15`	`12`	`class UnitTest extends \PHPFUI\HTMLUnitTester\Extensions`
`16`	`13`	`{`
`17`		`-`
`18`	`14`	`public function testNotWarningCss() : void`
`19`	`15`	`{`
`20`	`16`	`$this->assertNotWarningCss('strong {font-weight: bolder;}');`
`@@ -65,7 +61,7 @@ public function testValidFile() : void`
`65`	`61`	`$this->assertValidFile('examples/valid.html');`
`66`	`62`	`}`
`67`	`63`
`68`		`- public function testValidHtml()`
	`64`	`+ public function testValidHtml() : void`
`69`	`65`	`{`
`70`	`66`	`$this->assertValidHtml('<h1>Header</h1>');`
`71`	`67`	`$this->assertValidHtml('<!DOCTYPE html><html><head><meta charset="utf-8"/><title>Title</title></head><body><div>This is a test</div></body></html>');`
`@@ -83,5 +79,4 @@ public function testDirectory() : void`
`83`	`79`	`$this->assertDirectory('NotWarning', 'examples');`
`84`	`80`	`$this->assertDirectory('NotWarningCSS', 'examples');`
`85`	`81`	`}`
`86`		`-`
`87`		`- }`
	`82`	`+ }`