Skip to content

Commit

Permalink
updates to make oauth2/api compatible with php8 (openemr#4069)
Browse files Browse the repository at this point in the history
  • Loading branch information
bradymiller committed Dec 3, 2020
1 parent 0ed50c1 commit 7594d44
Show file tree
Hide file tree
Showing 13 changed files with 292 additions and 250 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -799,11 +799,11 @@ jobs:
# build_test_e2e
# if: ${{ success() || failure() }}

# - name: Api testing
# run: |
# source ci/ciLibrary.source
# build_test_api
# if: ${{ success() || failure() }}
- name: Api testing
run: |
source ci/ciLibrary.source
build_test_api
if: ${{ success() || failure() }}

- name: Fixtures testing
run: |
Expand Down
9 changes: 9 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
<fileset dir="${dir.vendor}" includes="**/*.cvs*" defaultexcludes="false"/>
</delete>

<delete dir="${dir.vendor}/lcobucci/jwt/.git" verbose="true"/>
<delete dir="${dir.vendor}/lcobucci/jwt/.github" verbose="true"/>
<delete file="${dir.vendor}/lcobucci/jwt/README.md" verbose="true"/>
<delete dir="${dir.vendor}/lcobucci/jwt/docs" verbose="true"/>
<delete file="${dir.vendor}/lcobucci/jwt/mkdocs.yml" verbose="true"/>
<delete file="${dir.vendor}/lcobucci/jwt/phpunit.xml.dist" verbose="true"/>
<delete file="${dir.vendor}/lcobucci/jwt/roave-bc-check.yaml" verbose="true"/>
<delete dir="${dir.vendor}/lcobucci/jwt/test" verbose="true"/>

<delete dir="${dir.vendor}/adldap2/adldap2/docs" verbose="true"/>
<delete dir="${dir.vendor}/adodb/adodb-php/tests" verbose="true"/>
<delete dir="${dir.vendor}/adodb/adodb-php/docs" verbose="true"/>
Expand Down
7 changes: 6 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
"yubico/u2flib-server": "1.0.2",
"steverhoades/oauth2-openid-connect-server": "1.2",
"nyholm/psr7": "1.3",
"nyholm/psr7-server": "1.0"
"nyholm/psr7-server": "1.0",
"lcobucci/jwt": "dev-34php8 as 3.4.9"
},
"config": {
"platform": {
Expand All @@ -72,6 +73,10 @@
"symfony/panther": "^0.8"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/openemr/jwt"
},
{
"type": "vcs",
"url": "https://github.com/openemr/wkhtmltopdf-openemr"
Expand Down
Loading

0 comments on commit 7594d44

Please sign in to comment.