Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies on pdsinterop modules #64

Closed
wants to merge 10 commits into from
Closed

Update dependencies on pdsinterop modules #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
274ac2b
Update dependencies on pdsinterop modules
michielbdejong Sep 26, 2022
aa21fb2
composer update
Sep 26, 2022
4d50834
Thanks to https://stackoverflow.com/questions/59251008/docker-laravel…
Sep 26, 2022
2b138ce
composer.json php 8 and jwt 4
Sep 26, 2022
ce62abf
composer.lock for php 8
Sep 26, 2022
c90333f
Default clientId to ''
michielbdejong Sep 26, 2022
73d28ce
learn from https://github.com/pdsinterop/solid-nextcloud/commit/be7a0…
michielbdejong Sep 26, 2022
c9e945a
vim inside Docker for development
Sep 26, 2022
3bd81ba
learn from https://github.com/pdsinterop/solid-nextcloud/commit/750fe…
michielbdejong Sep 26, 2022
7c94e4b
web-access-control-tests v7.1.0
michielbdejong Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.3-apache
FROM php:8.0-apache

# ==============================================================================
# Set up the machine
Expand All @@ -11,6 +11,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update && \
apt-get install -y --no-install-recommends \
git \
libonig-dev \
libzip-dev \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -37,6 +38,8 @@ WORKDIR /app
EXPOSE 443
# ==============================================================================

# For debugging, remove this before merging the PR:
RUN apt-get update && apt-get install -yq vim

# ==============================================================================
# Add the source code
Expand Down
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "MIT",
"name": "pdsinterop/solid-server",
"require": {
"php": "^7.3",
"php": "^8.0",
"ext-dom": "*",
"ext-json": "*",
"ext-mbstring": "*",
Expand All @@ -21,14 +21,14 @@
"defuse/php-encryption": "^2.3",
"laminas/laminas-diactoros": " ^2.8",
"laminas/laminas-httphandlerrunner": "^1.5",
"lcobucci/jwt": "3.3.3",
"lcobucci/jwt": "4.1",
"league/container": "^3.4",
"league/flysystem": "^1.1",
"league/oauth2-server": "^8.1",
"league/route": "^4.5",
"pdsinterop/flysystem-rdf": "^0.3",
"pdsinterop/solid-auth": "^0.6",
"pdsinterop/solid-crud": "^0.3",
"pdsinterop/flysystem-rdf": "^0.5",
"pdsinterop/solid-auth": "^0.7",
"pdsinterop/solid-crud": "^0.6",
"php-http/httplug": "^2.2",
"phptal/phptal": "^1.5"
},
Expand Down
Loading