PHP 8.0 support

Author: phpfui

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 before_script:
   - wget http://getcomposer.org/composer.phar

composer.json

@@ -14,7 +14,7 @@
 		"require": {
 				"php": ">=7.1",
 				"phpfui/phpfui": "^6.0",
-				"scrivo/highlight.php": "^9.17",
+				"scrivo/highlight.php": ">=9.17",
 				"phpdocumentor/reflection-docblock": ">=4.0",
 				"gitonomy/gitlib": "^1.2",
 				"cebe/markdown": "^1.2"
@@ -23,7 +23,7 @@
 				"psr-0": {"PHPFUI\\InstaDoc\\": "src/"}
 		},
 		"require-dev": {
-				"phpunit/phpunit": "^7.0|>=8.0",
+				"phpunit/phpunit": ">=7.0",
 				"phpfui/html-unit-tester": "^1.0",
 				"roave/security-advisories": "dev-master",
 				"phpfui/phpunit-syntax-coverage": "^1.0"

src/PHPFUI/InstaDoc/Section/File.php

@@ -13,7 +13,7 @@ public function generate(\PHPFUI\InstaDoc\PageInterface $page, string $fullClass
 
 		if (! file_exists($fullClassPath))
 			{
-			$fullClassPath = $this->controller->getGitFileOffset() . $fullClassPath;
+			$fullClassPath = $this->controller->getGitFileOffset() . '/' . $fullClassPath;
 			}
 		$ts = $this->controller->getParameter(\PHPFUI\InstaDoc\Controller::TAB_SIZE, 2);
 

tests/SectionTest.php

@@ -45,6 +45,7 @@ public function setUp() : void
 		$this->fileManager->addNamespace('PHPFUI', './src', true);
 		$this->fileManager->rescan();
 		$this->controller = new \PHPFUI\InstaDoc\Controller($this->fileManager);
+		$this->controller->setGitFileOffset('/src');
 		}
 
 	public function testHaveSections() : void
@@ -70,9 +71,9 @@ public function testClassesGenerateValidHTML() : void
 			{
 			$this->controller->setParameters($this->controller->getClassParts($section));
 
-			foreach ([\PHPFUI\InstaDoc\Controller::DOC_PAGE, \PHPFUI\InstaDoc\Controller::FILE_PAGE, \PHPFUI\InstaDoc\Controller::GIT_PAGE] as $page)
+			foreach ([\PHPFUI\InstaDoc\Controller::DOC_PAGE, \PHPFUI\InstaDoc\Controller::FILE_PAGE, \PHPFUI\InstaDoc\Controller::GIT_PAGE] as $type)
 				{
-				$this->controller->setParameter(\PHPFUI\InstaDoc\Controller::PAGE, $page);
+				$this->controller->setParameter(\PHPFUI\InstaDoc\Controller::PAGE, $type);
 				$page = $this->controller->display(\PHPFUI\InstaDoc\Controller::VALID_CLASS_PAGES, $this->controller->getPage());
 				$this->assertValidHtml("{$page}");
 				$this->assertNotWarningHtml("{$page}");