Commit 54238f07 authored by Jacob Priddy's avatar Jacob Priddy 👌

Remove references to web folder and fix

parent 5b4ebaf5
Pipeline #9092 passed with stages
in 3 minutes and 1 second
......@@ -14,40 +14,40 @@ stages:
build_web_backend:
stage: build
script:
- src/web/backend/install-dev.sh
- src/backend/install-dev.sh
artifacts:
paths:
- src/web/backend/vendor
- src/web/backend/.env
- src/web/backend/composer.lock
- src/backend/vendor
- src/backend/.env
- src/backend/composer.lock
# Currently set to build timeout
expire_in: 1 hour
build_web_frontend:
stage: build
script:
- src/web/frontend/install-dev.sh
- src/frontend/install-dev.sh
test_php_styles:
stage: test
script:
- cd src/web/backend
- cd src/backend
- vendor/bin/php-cs-fixer fix --config=.php_cs -v --dry-run --stop-on-violation --using-cache=no
test_web_backend_unit:
stage: test
script:
- cd src/web/backend
- cd src/backend
- vendor/bin/phpunit --testsuite Unit
test_web_backend_feature:
stage: test
script:
- cd src/web/backend
- cd src/backend
- vendor/bin/phpunit --testsuite Feature
test_web_backend_database:
stage: test
script:
- cd src/web/backend
- cd src/backend
- vendor/bin/phpunit --testsuite Database
......@@ -36,7 +36,7 @@ RUN groupadd -g 1000 www && \
useradd -u 1000 -ms /bin/bash -g www www
# Copy existing application directory permissions
COPY --chown=www:www src/web ${WORKDIR}
COPY --chown=www:www src/ ${WORKDIR}
COPY php/dev.ini /usr/local/etc/php/conf.d/local.ini
# Change current user to www
......
......@@ -28,7 +28,7 @@ services:
ports:
- "8080:443"
volumes:
- ./src/web:/var/www
- ./src:/var/www
- ./nginx/conf.d/:/etc/nginx/conf.d
- ./nginx/dhparam/:/run/dhparam
# Saml config
......@@ -78,7 +78,7 @@ services:
dockerfile: Dockerfile
container_name: api
volumes:
- ./src/web:/var/www
- ./src:/var/www
- ./php/dev.ini:/usr/local/etc/php/conf.d/local.ini
# Map saml files to the php-fpm server so it has access to them as well
- ./simplesamlphp-1.18.5:/var/simplesamlphp
......
......@@ -102,6 +102,12 @@
"brick",
"math"
],
"funding": [
{
"url": "https://tidelift.com/funding/github/packagist/brick/math",
"type": "tidelift"
}
],
"time": "2020-04-15T15:59:35+00:00"
},
{
......@@ -848,16 +854,16 @@
},
{
"name": "league/flysystem",
"version": "1.0.68",
"version": "1.0.69",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
"reference": "3e4198372276ec99ac3409a21d7c9d1ced9026e4"
"reference": "7106f78428a344bc4f643c233a94e48795f10967"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3e4198372276ec99ac3409a21d7c9d1ced9026e4",
"reference": "3e4198372276ec99ac3409a21d7c9d1ced9026e4",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
"reference": "7106f78428a344bc4f643c233a94e48795f10967",
"shasum": ""
},
"require": {
......@@ -934,7 +940,7 @@
"type": "other"
}
],
"time": "2020-05-12T20:33:44+00:00"
"time": "2020-05-18T15:13:39+00:00"
},
{
"name": "monolog/monolog",
......@@ -1670,6 +1676,12 @@
"identifier",
"uuid"
],
"funding": [
{
"url": "https://github.com/ramsey",
"type": "github"
}
],
"time": "2020-03-29T20:13:32+00:00"
},
{
......@@ -3519,6 +3531,24 @@
"clean",
"php"
],
"funding": [
{
"url": "https://www.paypal.me/moelleken",
"type": "custom"
},
{
"url": "https://github.com/voku",
"type": "github"
},
{
"url": "https://www.patreon.com/voku",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
"type": "tidelift"
}
],
"time": "2020-03-13T01:23:26+00:00"
}
],
......@@ -3672,6 +3702,12 @@
"Xdebug",
"performance"
],
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
}
],
"time": "2020-03-01T12:26:26+00:00"
},
{
......@@ -3851,20 +3887,26 @@
"flare",
"reporting"
],
"funding": [
{
"url": "https://www.patreon.com/spatie",
"type": "patreon"
}
],
"time": "2020-03-02T15:52:04+00:00"
},
{
"name": "facade/ignition",
"version": "2.0.2",
"version": "2.0.4",
"source": {
"type": "git",
"url": "https://github.com/facade/ignition.git",
"reference": "67f1677954ad33ca6b77f2c41cf43a58624f27fc"
"reference": "749fba7bf560fe2600ea55bf8734a7c9b8c30cfd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/facade/ignition/zipball/67f1677954ad33ca6b77f2c41cf43a58624f27fc",
"reference": "67f1677954ad33ca6b77f2c41cf43a58624f27fc",
"url": "https://api.github.com/repos/facade/ignition/zipball/749fba7bf560fe2600ea55bf8734a7c9b8c30cfd",
"reference": "749fba7bf560fe2600ea55bf8734a7c9b8c30cfd",
"shasum": ""
},
"require": {
......@@ -3873,7 +3915,7 @@
"facade/flare-client-php": "^1.0",
"facade/ignition-contracts": "^1.0",
"filp/whoops": "^2.4",
"illuminate/support": "^7.0",
"illuminate/support": "^7.0|^8.0",
"monolog/monolog": "^2.0",
"php": "^7.2.5",
"scrivo/highlight.php": "^9.15",
......@@ -3922,7 +3964,7 @@
"laravel",
"page"
],
"time": "2020-03-18T19:20:44+00:00"
"time": "2020-05-18T15:20:13+00:00"
},
{
"name": "facade/ignition-contracts",
......@@ -4118,6 +4160,12 @@
}
],
"description": "A tool to automatically fix PHP code style",
"funding": [
{
"url": "https://github.com/keradus",
"type": "github"
}
],
"time": "2020-04-15T18:51:10+00:00"
},
{
......@@ -5516,6 +5564,12 @@
"highlight.php",
"syntax"
],
"funding": [
{
"url": "https://github.com/allejo",
"type": "github"
}
],
"time": "2020-03-02T05:59:21+00:00"
},
{
......
......@@ -35,7 +35,7 @@ class ApiAuthorizer implements Authorizer
/**
* @var string[]
*/
protected array $userGroups;
protected array $userGroups = [];
public function __construct(
?string $currentUserId,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment