Skip to content

Commit

Permalink
Merge pull request #167 from OpenConext/feature/security-updates
Browse files Browse the repository at this point in the history
Perform security related chores
  • Loading branch information
MKodde authored Jan 21, 2019
2 parents c0d2cc3 + 9f13ad6 commit 62ad305
Show file tree
Hide file tree
Showing 7 changed files with 260 additions and 5,343 deletions.
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ cache:

before_script:
- phpenv config-add .travis.php.ini
# TODO: cleanup after FGA implementation!
# Use a travis composer.json version, that not uses the symlink solution for the middleware bundle, but an installation of a feature branch
- mv composer.json.travis composer.json
- mv composer.lock.travis composer.lock
# TODO: end of FGA specific build settings
- composer self-update
- composer install --prefer-dist

Expand Down
7 changes: 6 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<project name="StepupSelfService-ci" default="build">
<target name="build"
depends="php-lint-ci,phpmd-ci,phpcs-ci,phpcpd-ci,phpunit-ci"/>
depends="php-lint-ci,phpmd-ci,phpcs-ci,phpcpd-ci,phpunit-ci,security-tests"/>

<target name="get-changeset.php.raw"
description="creates a list of changed php files separated by newline">
Expand Down Expand Up @@ -82,4 +82,9 @@
</exec>
</target>

<target name="security-tests">
<exec executable="vendor/bin/security-checker" failonerror="true">
<arg line="security:check" />
</exec>
</target>
</project>
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@
"phpmd/phpmd": "^2.6",
"phpunit/phpunit": "^5.7",
"sebastian/exporter": "~2.0",
"sensiolabs/security-checker": "^3.0",
"sebastian/phpcpd": "^2.0",
"squizlabs/php_codesniffer": "^1.0",
"squizlabs/php_codesniffer": "^3.4",
"symfony/phpunit-bridge": "^3.0"
},
"scripts": {
Expand Down
97 changes: 0 additions & 97 deletions composer.json.travis

This file was deleted.

Loading

0 comments on commit 62ad305

Please sign in to comment.