Skip to content

Commit d4c9023

Browse files
committed
Remove ant, perform basic testing
1 parent 8958d2e commit d4c9023

7 files changed

Lines changed: 47 additions & 228 deletions

File tree

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.6
65
- 7.0
76
- 7.1
@@ -10,12 +9,17 @@ php:
109

1110
matrix:
1211
fast_finish: true
12+
allow_failures:
13+
- php: 7.3
1314

1415
before_script:
16+
- composer update --no-interaction
1517
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then composer require php-coveralls/php-coveralls; fi
1618

1719
script:
18-
- ant
20+
- vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-php.sh
21+
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit; else php vendor/phpunit/phpunit/phpunit --no-coverage; fi
22+
- if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then vendor/bin/psalm; fi
1923

2024
after_script:
2125
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/bin/php-coveralls -v; fi

build.xml

Lines changed: 0 additions & 149 deletions
This file was deleted.

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
"webmozart/assert": "^1.4"
2020
},
2121
"require-dev": {
22+
"simplesamlphp/simplesamlphp-test-framework": "0.0.11",
2223
"squizlabs/php_codesniffer": "~3.2",
24+
"phpunit/phpunit": "~5.7",
2325
"phpmd/phpmd": "~2.6",
2426
"sensiolabs/security-checker": "~4.1",
25-
"phpunit/phpunit": "~4",
2627
"sebastian/phpcpd": "~2.0",
2728
"mockery/mockery": "~0.9"
2829
},
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
processIsolation="false"
1010
stopOnFailure="false"
1111
syntaxCheck="false"
12-
bootstrap="./../../tests/autoload.php">
12+
bootstrap="./tests/autoload.php">
1313
<testsuites>
1414
<testsuite name="Test Suite">
15-
<directory>./../../tests</directory>
15+
<directory>./tests</directory>
1616
</testsuite>
1717
</testsuites>
1818
<filter>
1919
<whitelist processUncoveredFilesFromWhitelist="true">
20-
<directory>./../../src</directory>
20+
<directory>./src</directory>
2121
</whitelist>
2222
</filter>
2323
<listeners>

psalm.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0"?>
2+
<psalm
3+
name="SimpleSAMLphp"
4+
useDocblockTypes="true"
5+
totallyTyped="false"
6+
hideExternalErrors="true"
7+
>
8+
<projectFiles>
9+
<directory name="src/SAML2" />
10+
<ignoreFiles>
11+
<directory name="vendor" />
12+
</ignoreFiles>
13+
</projectFiles>
14+
15+
<issueHandlers>
16+
<LessSpecificReturnType errorLevel="info" />
17+
18+
<!-- level 3 issues - slightly lazy code writing, but probably low false-negatives -->
19+
<DeprecatedMethod errorLevel="info" />
20+
21+
<MissingClosureReturnType errorLevel="info" />
22+
<MissingReturnType errorLevel="info" />
23+
<MissingPropertyType errorLevel="info" />
24+
<InvalidDocblock errorLevel="info" />
25+
<MisplacedRequiredParam errorLevel="info" />
26+
27+
<PropertyNotSetInConstructor errorLevel="info" />
28+
<MissingConstructor errorLevel="info" />
29+
<MissingClosureParamType errorLevel="info" />
30+
<MissingParamType errorLevel="info" />
31+
<UnusedClass errorLevel="info" />
32+
<PossiblyUnusedMethod errorLevel="info" />
33+
<PropertyNotSetInConstructor errorLevel="suppress" />
34+
<MissingClosureReturnType errorLevel="suppress" />
35+
</issueHandlers>
36+
</psalm>

tools/phpcs/ruleset.xml

Lines changed: 0 additions & 28 deletions
This file was deleted.

tools/phpmd/ruleset.xml

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)