Skip to content

Commit

Permalink
Remove ant, perform basic testing
Browse files Browse the repository at this point in the history
  • Loading branch information
tvdijen committed Aug 29, 2019
1 parent 8958d2e commit d4c9023
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 228 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: php

php:
- 5.5
- 5.6
- 7.0
- 7.1
Expand All @@ -10,12 +9,17 @@ php:

matrix:
fast_finish: true
allow_failures:
- php: 7.3

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

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

after_script:
- if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/bin/php-coveralls -v; fi
149 changes: 0 additions & 149 deletions build.xml

This file was deleted.

3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
"webmozart/assert": "^1.4"
},
"require-dev": {
"simplesamlphp/simplesamlphp-test-framework": "0.0.11",
"squizlabs/php_codesniffer": "~3.2",
"phpunit/phpunit": "~5.7",
"phpmd/phpmd": "~2.6",
"sensiolabs/security-checker": "~4.1",
"phpunit/phpunit": "~4",
"sebastian/phpcpd": "~2.0",
"mockery/mockery": "~0.9"
},
Expand Down
6 changes: 3 additions & 3 deletions tools/phpunit/phpunit.xml → phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
bootstrap="./../../tests/autoload.php">
bootstrap="./tests/autoload.php">
<testsuites>
<testsuite name="Test Suite">
<directory>./../../tests</directory>
<directory>./tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory>./../../src</directory>
<directory>./src</directory>
</whitelist>
</filter>
<listeners>
Expand Down
36 changes: 36 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0"?>
<psalm
name="SimpleSAMLphp"
useDocblockTypes="true"
totallyTyped="false"
hideExternalErrors="true"
>
<projectFiles>
<directory name="src/SAML2" />
<ignoreFiles>
<directory name="vendor" />
</ignoreFiles>
</projectFiles>

<issueHandlers>
<LessSpecificReturnType errorLevel="info" />

<!-- level 3 issues - slightly lazy code writing, but probably low false-negatives -->
<DeprecatedMethod errorLevel="info" />

<MissingClosureReturnType errorLevel="info" />
<MissingReturnType errorLevel="info" />
<MissingPropertyType errorLevel="info" />
<InvalidDocblock errorLevel="info" />
<MisplacedRequiredParam errorLevel="info" />

<PropertyNotSetInConstructor errorLevel="info" />
<MissingConstructor errorLevel="info" />
<MissingClosureParamType errorLevel="info" />
<MissingParamType errorLevel="info" />
<UnusedClass errorLevel="info" />
<PossiblyUnusedMethod errorLevel="info" />
<PropertyNotSetInConstructor errorLevel="suppress" />
<MissingClosureReturnType errorLevel="suppress" />
</issueHandlers>
</psalm>
28 changes: 0 additions & 28 deletions tools/phpcs/ruleset.xml

This file was deleted.

45 changes: 0 additions & 45 deletions tools/phpmd/ruleset.xml

This file was deleted.

0 comments on commit d4c9023

Please sign in to comment.