Merge branch 'preauth-test' into 'master'
Test all the things! This merge request improves the code coverage of the project's unit tests. I broke up this rather large set of changes into separate commits. See the individual commit messages for details. * 75773b6d - Use PHPUnit provided by Composer instead of downloading a PHAR * 737771f2 - Convert dashes to underscores when converting to HTTP headers * 08aaa966 - Group conditional logic for clarity * 1477621c - Create missing tests for PreauthUserDetailsProvider, introduce an EnvironmentHelper * b74fd618 - Federated preauth tests made consistent with new preauth tests, improved coverage, moved test data from JSON to source code * 09d36d36 - LocalUserDetailsProvider throws Exception if JSON is invalid, returns null if JSON is missing * d021fd72 - Verify missing attributes are set as false * e29430a9 - Docblock and PSR-2 formatting improvements ### PHP Trait In 1477621c, I introduced a lesser-known feature of PHP called a [trait](http://php.net/manual/en/language.oop5.traits.php). It allows one to "inject" common methods into any class without requiring inheritance. @andrew-summers @weizhong-wang @KJOYNER See merge request !12
No related branches found
No related tags found
Showing
- build.xml 2 additions, 16 deletionsbuild.xml
- composer.json 6 additions, 1 deletioncomposer.json
- composer.lock 2 additions, 2 deletionscomposer.lock
- src/main/edu/wisc/doit/uwphps/HttpHeaderMapper.php 21 additions, 0 deletionssrc/main/edu/wisc/doit/uwphps/HttpHeaderMapper.php
- src/main/edu/wisc/doit/uwphps/UserDetailsProvider.php 3 additions, 16 deletionssrc/main/edu/wisc/doit/uwphps/UserDetailsProvider.php
- src/main/edu/wisc/doit/uwphps/local/JsonDecodingException.php 9 additions, 0 deletions...main/edu/wisc/doit/uwphps/local/JsonDecodingException.php
- src/main/edu/wisc/doit/uwphps/local/LocalUserDetailsProvider.php 11 additions, 4 deletions...n/edu/wisc/doit/uwphps/local/LocalUserDetailsProvider.php
- src/main/edu/wisc/doit/uwphps/preauth/FederatedPreauthUserDetailsProvider.php 2 additions, 2 deletions...it/uwphps/preauth/FederatedPreauthUserDetailsProvider.php
- src/main/edu/wisc/doit/uwphps/preauth/PreauthUserDetailsProvider.php 3 additions, 7 deletions...u/wisc/doit/uwphps/preauth/PreauthUserDetailsProvider.php
- src/test/edu/wisc/doit/uwphps/EnvironmentHelper.php 45 additions, 0 deletionssrc/test/edu/wisc/doit/uwphps/EnvironmentHelper.php
- src/test/edu/wisc/doit/uwphps/HttpHeaderMapperTest.php 19 additions, 0 deletionssrc/test/edu/wisc/doit/uwphps/HttpHeaderMapperTest.php
- src/test/edu/wisc/doit/uwphps/local/LocalUserDetailsProviderTest.php 23 additions, 7 deletions...u/wisc/doit/uwphps/local/LocalUserDetailsProviderTest.php
- src/test/edu/wisc/doit/uwphps/preauth/FederatedPreauthUserDetailsProviderTest.php 110 additions, 0 deletions...wphps/preauth/FederatedPreauthUserDetailsProviderTest.php
- src/test/edu/wisc/doit/uwphps/preauth/HTTPFederatedPreauthUserDetailsProviderTest.php 0 additions, 88 deletions...s/preauth/HTTPFederatedPreauthUserDetailsProviderTest.php
- src/test/edu/wisc/doit/uwphps/preauth/PreauthUserDetailsProviderTest.php 96 additions, 0 deletions...sc/doit/uwphps/preauth/PreauthUserDetailsProviderTest.php
- src/test/resources/badjson.json 3 additions, 0 deletionssrc/test/resources/badjson.json
- src/test/resources/testuser_http.json 0 additions, 13 deletionssrc/test/resources/testuser_http.json
... | ... | @@ -15,11 +15,16 @@ |
"source": "https://git.doit.wisc.edu/adi-ia/uw-php-security" | ||
}, | ||
"require-dev": { | ||
"phpunit/phpunit": "^5.4" | ||
"phpunit/phpunit": "5.7.2" | ||
}, | ||
"autoload": { | ||
"psr-4": { | ||
"edu\\wisc\\doit\\uwphps\\": "src/main/edu/wisc/doit/uwphps" | ||
} | ||
}, | ||
"autoload-dev": { | ||
"psr-4": { | ||
"edu\\wisc\\doit\\uwphps\\": "src/test/edu/wisc/doit/uwphps" | ||
} | ||
} | ||
} |
src/test/resources/badjson.json
0 → 100644
Please register or sign in to comment