mirror of
https://github.com/Combodo/iTop.git
synced 2026-03-12 12:34:12 +01:00
Merge remote-tracking branch 'origin/support/3.0' into develop
This commit is contained in:
@@ -46,8 +46,6 @@ class ItopTestCase extends TestCase
|
||||
@include_once '../../../../../../../approot.inc.php';
|
||||
@include_once '../../../../../../../../approot.inc.php';
|
||||
@include_once getcwd().'/approot.inc.php'; // this is when launching phpunit from within the IDE
|
||||
|
||||
$this->debug("\n----------\n---------- ".$this->getName()."\n----------\n");
|
||||
}
|
||||
|
||||
protected function debug($sMsg)
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
{
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^8.5.23"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"": "src/"
|
||||
}
|
||||
"phpunit/phpunit": "^8.5.23",
|
||||
"sempro/phpunit-pretty-print": "^1.4"
|
||||
}
|
||||
}
|
||||
|
||||
42
test/composer.lock
generated
42
test/composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "e564642f87b1049582c4001ac479b368",
|
||||
"content-hash": "e34c30ef7d10c0cee9ea3624f8378087",
|
||||
"packages": [],
|
||||
"packages-dev": [
|
||||
{
|
||||
@@ -1597,6 +1597,44 @@
|
||||
},
|
||||
"time": "2016-10-03T07:35:21+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sempro/phpunit-pretty-print",
|
||||
"version": "1.4.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/s360digital/phpunit-pretty-print.git",
|
||||
"reference": "fa623aa8a17aece4a2b69e54b07a5e37572d1f1d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/s360digital/phpunit-pretty-print/zipball/fa623aa8a17aece4a2b69e54b07a5e37572d1f1d",
|
||||
"reference": "fa623aa8a17aece4a2b69e54b07a5e37572d1f1d",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=7.1.0",
|
||||
"phpunit/phpunit": "^7 || ^8 || ^9"
|
||||
},
|
||||
"require-dev": {
|
||||
"friendsofphp/php-cs-fixer": "^2.16"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Sempro\\PHPUnitPrettyPrinter\\": "src/"
|
||||
}
|
||||
},
|
||||
"notification-url": "https://packagist.org/downloads/",
|
||||
"license": [
|
||||
"MIT"
|
||||
],
|
||||
"description": "Prettify PHPUnit output",
|
||||
"support": {
|
||||
"issues": "https://github.com/s360digital/phpunit-pretty-print/issues",
|
||||
"source": "https://github.com/s360digital/phpunit-pretty-print/tree/1.4.0"
|
||||
},
|
||||
"time": "2021-01-04T13:25:10+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
"version": "v1.25.0",
|
||||
@@ -1795,5 +1833,5 @@
|
||||
"prefer-lowest": false,
|
||||
"platform": [],
|
||||
"platform-dev": [],
|
||||
"plugin-api-version": "2.1.0"
|
||||
"plugin-api-version": "2.3.0"
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
stopOnRisky="false"
|
||||
stopOnSkipped="false"
|
||||
verbose="true"
|
||||
printerClass="Sempro\PHPUnitPrettyPrinter\PrettyPrinter"
|
||||
>
|
||||
|
||||
<php>
|
||||
@@ -23,6 +24,7 @@
|
||||
<ini name="display_errors" value="On"/>
|
||||
<ini name="log_errors" value="On"/>
|
||||
<ini name="html_errors" value="Off"/>
|
||||
<env name="PHPUNIT_PRETTY_PRINT_PROGRESS" value="true"/>
|
||||
</php>
|
||||
|
||||
<testsuites>
|
||||
|
||||
Reference in New Issue
Block a user