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.

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

Release/0.19.0 #91

Open
wants to merge 17 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ before_install:
script:
- docker-compose -f docker-compose.yml -f docker-compose.test.yml up -d
- while true; do output=`docker-compose exec -T php pidof php-fpm | cat`; if [[ ! -z "${output}" ]]; then break; fi; sleep 1; done;
- docker-compose -f docker-compose.yml -f docker-compose.test.yml exec php php bin/console security:check
- docker-compose -f docker-compose.yml -f docker-compose.test.yml exec php php bin/console doctrine:migration:migrate --no-interaction
- docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -e FIXTURES=test php php bin/console doctrine:fixtures:load --no-interaction
- docker-compose -f docker-compose.yml -f docker-compose.test.yml exec php vendor/bin/behat
2 changes: 1 addition & 1 deletion api/Dockerfile-php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN set -eux; \
\
apk del .build-deps

COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
COPY --from=composer:1.10.16 /usr/bin/composer /usr/bin/composer
COPY docker/php/php.ini /usr/local/etc/php/php.ini

# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
Expand Down
7 changes: 4 additions & 3 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
"ext-iconv": "*",
"api-platform/api-pack": "^1.1",
"defuse/php-encryption": "^2.2",
"digitalstate/core": "0.18.0",
"digitalstate/core": "0.19.0",
"doctrine/doctrine-fixtures-bundle": "^3.0",
"doctrine/doctrine-migrations-bundle": "^1.3",
"guzzlehttp/guzzle": "^6.3",
"justinrainbow/json-schema": "^5.0",
"knplabs/doctrine-behaviors": "^1.5",
"lexik/jwt-authentication-bundle": "^2.6",
"ramsey/uuid": "^3.8",
"scienta/doctrine-json-functions": "^4.1",
"sensio/framework-extra-bundle": "^5.2",
"sensiolabs/security-checker": "^5.0",
"symfony/console": "^4.0",
Expand Down Expand Up @@ -66,8 +68,7 @@
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd",
"security-checker security:check": "script"
"assets:install %PUBLIC_DIR%": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts"
Expand Down
216 changes: 141 additions & 75 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api/config/fixtures/dev/access/anonymous/access.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ objects:

prototype:
uuid: ~
created_at: ~
owner: BusinessUnit
owner_uuid: c11c546e-bd01-47cf-97da-e25388357b5a # Administration
assignee: Anonymous
Expand Down
1 change: 1 addition & 0 deletions api/config/fixtures/dev/access/individual/access.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ objects: []

prototype:
uuid: ~
created_at: ~
owner: BusinessUnit
owner_uuid: c11c546e-bd01-47cf-97da-e25388357b5a # Administration
assignee: Individual
Expand Down
1 change: 1 addition & 0 deletions api/config/fixtures/dev/access/organization/access.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ objects: []

prototype:
uuid: ~
created_at: ~
owner: BusinessUnit
owner_uuid: c11c546e-bd01-47cf-97da-e25388357b5a # Administration
assignee: Organization
Expand Down
1 change: 1 addition & 0 deletions api/config/fixtures/dev/access/role/access.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ objects:

prototype:
uuid: ~
created_at: ~
owner: BusinessUnit
owner_uuid: c11c546e-bd01-47cf-97da-e25388357b5a # Administration
assignee: Role
Expand Down
2 changes: 0 additions & 2 deletions api/config/fixtures/dev/access/role/permission.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@ objects:
scope:
type: owner
entity: BusinessUnit
entity_uuid: ~ # Any BusinessUnit
key: entity
attributes: [BROWSE, READ, EDIT, ADD, DELETE]

- access: a295c397-0dc7-40eb-b4a2-7c2278bf41d2 # Administrator
scope:
type: owner
entity: BusinessUnit
entity_uuid: ~ # Any BusinessUnit
key: property
attributes: [BROWSE, READ, EDIT]

Expand Down
1 change: 1 addition & 0 deletions api/config/fixtures/dev/access/staff/access.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ objects: []

prototype:
uuid: ~
created_at: ~
owner: BusinessUnit
owner_uuid: c11c546e-bd01-47cf-97da-e25388357b5a # Administration
assignee: Staff
Expand Down
Loading