composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/support/3.2' into develop

Browse Source
This commit is contained in:
Molkobain
2025-12-17 22:22:36 +01:00
parent cef4a52081 f9db405343
commit b3cd79605d
4 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/php-static-analysis/composer.json
View File

@@ -1,5 +1,5 @@
{ {
"require": { "require": {
"phpstan/phpstan": "^1.10" "phpstan/phpstan": "^2.1"
} }
} }

23
tests/php-static-analysis/composer.lock generated
View File

@@ -4,24 +4,19 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "14812c2a05a5972f00f9d67abbd710a9", "content-hash": "cc6d7580a5e98236d68d8b91de9ddebb",
"packages": [ "packages": [
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "1.10.26", "version": "2.1.33",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "5d660cbb7e1b89253a47147ae44044f49832351f"
},
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/5d660cbb7e1b89253a47147ae44044f49832351f", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9e800e6bee7d5bd02784d4c6069b48032d16224f",
"reference": "5d660cbb7e1b89253a47147ae44044f49832351f", "reference": "9e800e6bee7d5bd02784d4c6069b48032d16224f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2|^8.0" "php": "^7.4|^8.0"
}, },
"conflict": { "conflict": {
"phpstan/phpstan-shim": "*" "phpstan/phpstan-shim": "*"
@@ -60,13 +55,9 @@
{ {
"url": "https://github.com/phpstan", "url": "https://github.com/phpstan",
"type": "github" "type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
} }
], ],
"time": "2023-07-19T12:44:37+00:00" "time": "2025-12-05T10:24:31+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],
@@ -77,5 +68,5 @@
"prefer-lowest": false, "prefer-lowest": false,
"platform": [], "platform": [],
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.3.0" "plugin-api-version": "2.6.0"
} }

26
tests/php-static-analysis/config/base.dist.neon
View File

@@ -5,8 +5,8 @@ includes:
parameters: parameters:
level: 0 level: 0
#phpVersion: null # Explicitly commented as we rather use the detected version from the above include (`php-includes/target-php-version.php`) #phpVersion: null # Explicitly commented as we rather use the detected version from the above include (`php-includes/target-php-version.php`)
editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%' # Open in PHPStorm asit is Combodo's default IDE editorUrl: 'phpstorm://open?file=%%file%%&line=%%line%%' # Open in PHPStorm as it's Combodo's default IDE
bootstrapFiles: bootstrapFiles:
- ../../../approot.inc.php - ../../../approot.inc.php
- ../../../bootstrap.inc.php - ../../../bootstrap.inc.php
@@ -22,11 +22,19 @@ parameters:
- ../../../lib # Irrelevant as we only want to analyze our codebase - ../../../lib # Irrelevant as we only want to analyze our codebase
- ../../../node_modules # Irrelevant as we only want to analyze our codebase - ../../../node_modules # Irrelevant as we only want to analyze our codebase
analyseAndScan: analyseAndScan:
#- ../../../data # Left and commented on purpose to show that we want to analyse the generated cache files # This file generates "unignorable errors" for the baseline due to its format, so we don't have any other choice than to exclude it.
# Note 1: We can analyse these folders as if a PHP file requires another PHP element declared in an XML file, it won't find it. So we rely only on `env-production` # But mind that it will prevent PHPStan from warning us about PHP syntax errors in this file.
- ../../../core/oql/build/PHP/Lempar.php
#- ../../../data # Left and commented on purpose to show that we want to analyse the generated cache files
# Note 1: We can't analyse these folders as if a PHP file requires another PHP element declared in an XML file, it won't find it. So we rely only on `env-production`
# Note 2: Only the options selected during the setup will be analysed correctly in `env-production`. For unselected options, we still want to ignore them during the analysis as they would only give a false sentiment of security as their XML PHP classes / snippets / etc would not be tested. # Note 2: Only the options selected during the setup will be analysed correctly in `env-production`. For unselected options, we still want to ignore them during the analysis as they would only give a false sentiment of security as their XML PHP classes / snippets / etc would not be tested.
- ../../../data/production-modules # Irrelevent as it will already be in `env-production` (for local run only, not useful in the CI) - ../../../data/production-modules (?) # Irrelevent as it will already be in `env-production` (for local run only, not useful in the CI)
- ../../../datamodels # Irrelevent as it will already be in `env-production` - ../../../datamodels # Irrelevent as it will already be in `env-production`
- ../../../extensions # Irrelevent as it will already be in `env-production` (for local run only, not useful in the CI) - ../../../extensions # Irrelevent as it will already be in `env-production` (for local run only, not useful in the CI)
- ../../../tests # Exclude tests for now - ../../../env-php-unit-tests (?) # Irrelevant as it will either already be in `env-production` or might be desynchronized from `env-production`
- ../../../toolkit # Exlclude toolkit for now - ../../../env-toolkit (?) # Irrelevent as it will either already be in `env-production` or might be desynchronized from `env-production` (for local run only, not useful in the CI)
- ../../../tests (?) # Exclude tests for now
- ../../../toolkit (?) # Exlclude toolkit for now

6
tests/php-unit-tests/README.md
View File

@@ -2,9 +2,6 @@
Documentation on creating and maintaining tests in iTop. Documentation on creating and maintaining tests in iTop.
## Prerequisites ## Prerequisites
### PHPUnit configuration file ### PHPUnit configuration file
@@ -78,7 +75,8 @@ Example :
$oTagData->DBDelete(); $oTagData->DBDelete();
``` ```
Warning : when the condition is met the test is finished and following code will be ignored ! > [!WARNING]
> When the condition is met the test is finished and following code will be ignored !
Another way to do is using try/catch blocks, for example : Another way to do is using try/catch blocks, for example :
```php ```php