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

prepare symfony 4 and upgrade to php7.3 #43

Open
wants to merge 1 commit into
base: master
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ The environment is in PHP7.1 and the development containers are on `etc/infrastr

Up environment with: `docker-compose -f etc/infrastructure/dev/docker-compose.yml up -d`

Install dependencies: `docker-compose -f etc/infrastructure/dev/docker-compose.yml exec fpm sh -lc 'composer install'`
Install dependencies: `docker-compose -f etc/infrastructure/dev/docker-compose.yml exec fpm sh -lc 'COMPOSER_MEMORY_LIMIT=-1 composer install'`

Setup database, etc with : `docker-compose -f etc/infrastructure/dev/docker-compose.yml exec fpm sh -lc 'ant build'`

Expand Down
33 changes: 17 additions & 16 deletions app/config/bundles/doc.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
nelmio_api_doc:
sandbox:
authentication:
delivery: header
name: access_token
cache:
enabled: true
exclude_sections: ["private", "exclusive"]
swagger:
api_base_path: /api
swagger_version: 1.2
api_version: 3.14
info:
title: DDD PlayGroud
description: Sandbox environment
contact: [email protected]
license: MIT
documentation:
schemes: [http]
info:
title: DDD Playgroud
description: This is an demo app!
version: 1.0.0
securityDefinitions:
Bearer:
type: apiKey
description: 'Value: Bearer {jwt}'
name: Authorization
in: header
security:
- Bearer: []
areas:
default:
path_patterns: [ ^/api ]
4 changes: 2 additions & 2 deletions app/config/bundles/jwt.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lexik_jwt_authentication:
private_key_path: "%jwt_private_key_path%"
public_key_path: "%jwt_public_key_path%"
secret_key: "%jwt_private_key_path%"
public_key: "%jwt_public_key_path%"
pass_phrase: "%jwt_key_pass_phrase%"
token_ttl: "%jwt_token_ttl%"
user_identity_field: username
Expand Down
2 changes: 1 addition & 1 deletion app/config/routing.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NelmioApiDocBundle:
resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
resource: "@NelmioApiDocBundle/Resources/config/routing/swaggerui.xml"
prefix: /api/doc

api:
Expand Down
28 changes: 14 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
}
},
"require": {
"php": ">=7.0.1",
"symfony/symfony": "3.3.*",
"php": "7.3.5",
"symfony/symfony": "3.4.*",
"doctrine/orm": "^2.5",
"doctrine/doctrine-bundle": "^1.6",
"doctrine/doctrine-cache-bundle": "^1.2",
Expand All @@ -29,19 +29,19 @@
"sensio/framework-extra-bundle": "^3.0.2",
"incenteev/composer-parameter-handler": "^2.0",

"ramsey/uuid": "^3.5",
"snc/redis-bundle": "2.x-dev",
"predis/predis": "^1.0",
"ramsey/uuid": "^3.8",
"snc/redis-bundle": "2.1.9",
"predis/predis": "^1.1",

"nelmio/api-doc-bundle": "^2.13",
"friendsofsymfony/rest-bundle": "^2.2",
"jms/serializer-bundle": "^2.2",
"white-october/pagerfanta-bundle": "^1.0",
"willdurand/hateoas-bundle": "^1.3",
"lexik/jwt-authentication-bundle": "^2.4",
"nelmio/api-doc-bundle": "^3.4",
"friendsofsymfony/rest-bundle": "^2.5",
"jms/serializer-bundle": "^3.3",
"white-october/pagerfanta-bundle": "^1.2",
"willdurand/hateoas-bundle": "^2.0",
"lexik/jwt-authentication-bundle": "^2.6",
"ramsey/uuid-doctrine": "^1.4",
"league/tactician-bundle": "1.0",
"php-amqplib/rabbitmq-bundle": "^1.13",
"league/tactician-bundle": "1.1",
"php-amqplib/rabbitmq-bundle": "^1.14",
"league/tactician-doctrine": "^1.1",
"friendsofsymfony/elastica-bundle": "^4.0"
},
Expand Down Expand Up @@ -76,7 +76,7 @@
},
"config": {
"platform": {
"php": "7.0.9"
"php": "7.3.5"
}
},
"extra": {
Expand Down
Loading