From a57b0e0dfbeda157b2f17097e10bb74a59897935 Mon Sep 17 00:00:00 2001 From: Ruben van der Linde Date: Tue, 5 Nov 2019 08:03:10 +0100 Subject: [PATCH 01/11] Small name fix --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index d1030720..6f87e0eb 100644 --- a/.env +++ b/.env @@ -9,7 +9,7 @@ ################################################## # Depracticed, now set as CONTAINER_PROJECT_NAME -APP_NAME=pc +APP_NAME=vtc # Do you want to dsiplay the symfony debug toolbar? APP_DEBUG=1 # What is the enviroment type you want to use for local production? (choose between dec,stag,prod, acce or test) From 2d231267df86e876cfcee45383105c495810bb16 Mon Sep 17 00:00:00 2001 From: Ruben van der Linde Date: Tue, 5 Nov 2019 17:48:01 +0100 Subject: [PATCH 02/11] Updated helm chart --- INSTALLATION.md | 25 ++-- api/helm/Chart.yaml | 6 +- api/helm/values.yaml | 8 +- api/public/schema/openapi.yaml | 263 +++++++++++++++++++++++++-------- 4 files changed, 219 insertions(+), 83 deletions(-) diff --git a/INSTALLATION.md b/INSTALLATION.md index 377f7b33..3a8ae6da 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -65,32 +65,25 @@ $ helm dependency update ./api/helm If you want to create a new instance ```CLI -$ helm install --name pc-dev ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=dev --set settings.env=dev,settings.debug=1 -$ helm install --name pc-stag ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=stag --set settings.env=stag,settings.debug=0 -$ helm install --name pc-prod ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=prod --set settings.env=prod,settings.debug=0 +$ helm install --name vtc-dev ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=dev --set settings.env=dev,settings.debug=1 +$ helm install --name vtc-stag ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=stag --set settings.env=stag,settings.debug=0 +$ helm install --name vtc-prod ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" --namespace=prod --set settings.env=prod,settings.debug=0 ``` Or update if you want to update an existing one ```CLI -$ helm upgrade pc-dev ./api/helm --kubeconfig="api/helm/kubeconfig.yaml --namespace=dev --set settings.env=dev, settings.debug=1" -$ helm upgrade pc-stag ./api/helm --kubeconfig="api/helm/kubeconfig.yaml --namespace=stag --set settings.env=stag, settings.debug=0" -$ helm upgrade pc-prod ./api/helm --kubeconfig="api/helm/kubeconfig.yaml --namespace=prod --set settings.env=prod, settings.debug=0" +$ helm upgrade vtc-dev ./api/helm --kubeconfig="api/helm/kubeconfig.yaml --namespace=dev --set settings.env=dev, settings.debug=1" +$ helm upgrade vtc-stag ./api/helm --kubeconfig="api/helm/kubeconfig.yaml --namespace=stag --set settings.env=stag, settings.debug=0" +$ helm upgrade vtc-prod ./api/helm --kubeconfig="api/helm/kubeconfig.yaml --namespace=prod --set settings.env=prod, settings.debug=0" ``` Or del if you want to delete an existing one ```CLI -$ helm del pc-dev --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=dev" -$ helm del pc-stag --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=stag" -$ helm del pp-prod --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=prod" +$ helm del vtc-dev --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=dev" +$ helm del vtc-stag --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=stag" +$ helm del vtc-prod --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=prod" ``` -or for the dev enviroments -$ helm install ./api/helm --name vtc-dev --kubeconfig="api/helm/kubeconfig.yaml" -$ helm upgrade vtc-dev ./api/helm --kubeconfig="api/helm/kubeconfig.yaml" -$ helm del vtc-dev --purge --kubeconfig="api/helm/kubeconfig.yaml" - -Note that you can replace commonground with the namespace that you want to use (normally the name of your component). - ## Making your app known on NLX The proto component commes with an default NLX setup, if you made your own component however you might want to provide it trough the [NLX](https://www.nlx.io/) service. Furntunatly the proto component commes with an nice setup for NLX integration. diff --git a/api/helm/Chart.yaml b/api/helm/Chart.yaml index b9ee5312..24a465d4 100644 --- a/api/helm/Chart.yaml +++ b/api/helm/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 -appVersion: 0.1.0 -description: A Helm chart for an Common Ground VTC API component -name: vtc +appVersion: V.0.1 +description: Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar. +name: verzoektypecatalogus version: 0.1.0 home: https://common-ground.dev icon: https://common-ground.dev/logo-250x250.png \ No newline at end of file diff --git a/api/helm/values.yaml b/api/helm/values.yaml index 55b4a798..325e6fea 100644 --- a/api/helm/values.yaml +++ b/api/helm/values.yaml @@ -32,15 +32,15 @@ php: secret: "" nginx: - repository: docker.io/conduction/vtc-nginx + repository: docker.io/conduction/protocomponent-nginx tag: latest pullPolicy: Always replicaCount: 1 varnish: enabled: true - url: https://vtc-varnish - repository: docker.io/conduction/vtc-varnish + #url: https://example.com + repository: docker.io/conduction/protocomponent-varnish tag: latest pullPolicy: Always replicaCount: 1 @@ -63,7 +63,7 @@ postgresql: # tag: alpine mercure: - enabled: false + enabled: true publishUrl: http://mercure/hub subscribeUrl: https://mercure.example.com/hub allowAnonymous: "1" diff --git a/api/public/schema/openapi.yaml b/api/public/schema/openapi.yaml index ebd47dde..b6158435 100644 --- a/api/public/schema/openapi.yaml +++ b/api/public/schema/openapi.yaml @@ -1,10 +1,21 @@ openapi: 3.0.2 info: - title: 'Verzoek Type Catalogus (VTC)' - version: 0.0.1 + title: 'Verzoek Type Catalogus' + version: V.0.1 description: | - Dit is een commonground voorbeeld applicatie - + API Details + - Component: Verzoek Type Catalogus + - Reference: vtc + - Enviroment: dev + - Version: V.0.1 + - Repository: []() / [zip](/archive/master.zip) + - Datamodel: [postman](/schema/openapi.postman_collection) / [oas](/schema/openapi.yaml) / [pdf](/schema/datamodel.pdf) / [mwb](/schema/datamodel.mwb) + + Naast deze JSON rest API is er ook een [graphql](/graphql) interface beschikbaar. + + Voor het gebruik van deze applicatie is een JWT Token nodig, deze hangt altijd vast aan een applicatie, ofwel user. Geldige JWT Tokens worden aangemaakt bij het registreren van een applicatie en kennen een beperkte houdbaarheid. + JWT Tokens kunnen zowel worden verlengd, als opnieuw worden aangevraagd, dit aan de hand van de applicatie id en sleutel. + Let er bij het meegeven van JWT tokens op dat deze moet worden voorafgegaan door een Bearer en een spatie, onder de header Authorization. De volledig naam wordt daarmee: 'Authorization: Bearer [TOKEN]'. paths: /properties: @@ -100,6 +111,44 @@ paths: name: X-Audit-Clarification description: 'A clarification as to why a request has been made (doelbinding)' in: header + - + name: 'extend[]' + required: false + description: 'An array of nested objects to include in the return object' + in: query + schema: + type: array + - + name: 'fields[]' + required: false + description: 'An array of fields to return in output, wil return all fields is not supplied' + in: query + schema: + type: array + - + name: validOn + required: false + description: 'Returns object as valid on a given date time' + schema: + type: string + format: date-time + in: query + - + name: validFrom + required: false + description: 'Returns objects valid from a given date time' + schema: + type: string + format: date-time + in: query + - + name: validUntil + required: false + description: 'Returns objects valid until a given date time' + schema: + type: string + format: date-time + in: query post: tags: - Property @@ -242,6 +291,44 @@ paths: name: X-Audit-Clarification description: 'A clarification as to why a request has been made (doelbinding)' in: header + - + name: 'extend[]' + required: false + description: 'An array of nested objects to include in the return object' + in: query + schema: + type: array + - + name: 'fields[]' + required: false + description: 'An array of fields to return in output, wil return all fields is not supplied' + in: query + schema: + type: array + - + name: validOn + required: false + description: 'Returns object as valid on a given date time' + schema: + type: string + format: date-time + in: query + - + name: validFrom + required: false + description: 'Returns objects valid from a given date time' + schema: + type: string + format: date-time + in: query + - + name: validUntil + required: false + description: 'Returns objects valid until a given date time' + schema: + type: string + format: date-time + in: query responses: 200: description: 'Property resource response' @@ -577,22 +664,18 @@ paths: schema: type: integer default: 1 + - + name: Authorization + description: 'The JWT of the entity performing the request' + in: header - name: API-Version description: 'The version of the API conform [Landelijke API-strategie.](https://geonovum.github.io/KP-APIs/#versioning)' example: 1.0.1 in: header - - name: X-NLX-Request-User-Id - description: 'The id of the user performing the request' - in: header - - - name: X-NLX-Request-Application-Id - description: 'The id of the application performing the request' - in: header - - - name: X-NLX-Request-Subject-Identifier - description: 'An subject identifier for purpose registration (doelbinding)' + name: X-NLX-Logrecord-ID + description: 'A globally unique id of the request, which makes a request traceable throughout the network.' in: header - name: X-NLX-Request-Process-Id @@ -604,12 +687,50 @@ paths: in: header - name: X-NLX-Request-Data-Subject - description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678,kenteken=ab-12-fg`' + description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678, kenteken=ab-12-fg`' in: header - name: X-Audit-Clarification description: 'A clarification as to why a request has been made (doelbinding)' in: header + - + name: 'extend[]' + required: false + description: 'An array of nested objects to include in the return object' + in: query + schema: + type: array + - + name: 'fields[]' + required: false + description: 'An array of fields to return in output, wil return all fields is not supplied' + in: query + schema: + type: array + - + name: validOn + required: false + description: 'Returns object as valid on a given date time' + schema: + type: string + format: date-time + in: query + - + name: validFrom + required: false + description: 'Returns objects valid from a given date time' + schema: + type: string + format: date-time + in: query + - + name: validUntil + required: false + description: 'Returns objects valid until a given date time' + schema: + type: string + format: date-time + in: query post: tags: - RequestType @@ -681,22 +802,18 @@ paths: $ref: '#/components/schemas/RequestType-write' description: 'The new RequestType resource' parameters: + - + name: Authorization + description: 'The JWT of the entity performing the request' + in: header - name: API-Version description: 'The version of the API conform [Landelijke API-strategie.](https://geonovum.github.io/KP-APIs/#versioning)' example: 1.0.1 in: header - - name: X-NLX-Request-User-Id - description: 'The id of the user performing the request' - in: header - - - name: X-NLX-Request-Application-Id - description: 'The id of the application performing the request' - in: header - - - name: X-NLX-Request-Subject-Identifier - description: 'An subject identifier for purpose registration (doelbinding)' + name: X-NLX-Logrecord-ID + description: 'A globally unique id of the request, which makes a request traceable throughout the network.' in: header - name: X-NLX-Request-Process-Id @@ -708,7 +825,7 @@ paths: in: header - name: X-NLX-Request-Data-Subject - description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678,kenteken=ab-12-fg`' + description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678, kenteken=ab-12-fg`' in: header - name: X-Audit-Clarification @@ -727,22 +844,18 @@ paths: required: true schema: type: string + - + name: Authorization + description: 'The JWT of the entity performing the request' + in: header - name: API-Version description: 'The version of the API conform [Landelijke API-strategie.](https://geonovum.github.io/KP-APIs/#versioning)' example: 1.0.1 in: header - - name: X-NLX-Request-User-Id - description: 'The id of the user performing the request' - in: header - - - name: X-NLX-Request-Application-Id - description: 'The id of the application performing the request' - in: header - - - name: X-NLX-Request-Subject-Identifier - description: 'An subject identifier for purpose registration (doelbinding)' + name: X-NLX-Logrecord-ID + description: 'A globally unique id of the request, which makes a request traceable throughout the network.' in: header - name: X-NLX-Request-Process-Id @@ -754,12 +867,50 @@ paths: in: header - name: X-NLX-Request-Data-Subject - description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678,kenteken=ab-12-fg`' + description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678, kenteken=ab-12-fg`' in: header - name: X-Audit-Clarification description: 'A clarification as to why a request has been made (doelbinding)' in: header + - + name: 'extend[]' + required: false + description: 'An array of nested objects to include in the return object' + in: query + schema: + type: array + - + name: 'fields[]' + required: false + description: 'An array of fields to return in output, wil return all fields is not supplied' + in: query + schema: + type: array + - + name: validOn + required: false + description: 'Returns object as valid on a given date time' + schema: + type: string + format: date-time + in: query + - + name: validFrom + required: false + description: 'Returns objects valid from a given date time' + schema: + type: string + format: date-time + in: query + - + name: validUntil + required: false + description: 'Returns objects valid until a given date time' + schema: + type: string + format: date-time + in: query responses: 200: description: 'RequestType resource response' @@ -802,22 +953,18 @@ paths: required: true schema: type: string + - + name: Authorization + description: 'The JWT of the entity performing the request' + in: header - name: API-Version description: 'The version of the API conform [Landelijke API-strategie.](https://geonovum.github.io/KP-APIs/#versioning)' example: 1.0.1 in: header - - name: X-NLX-Request-User-Id - description: 'The id of the user performing the request' - in: header - - - name: X-NLX-Request-Application-Id - description: 'The id of the application performing the request' - in: header - - - name: X-NLX-Request-Subject-Identifier - description: 'An subject identifier for purpose registration (doelbinding)' + name: X-NLX-Logrecord-ID + description: 'A globally unique id of the request, which makes a request traceable throughout the network.' in: header - name: X-NLX-Request-Process-Id @@ -829,7 +976,7 @@ paths: in: header - name: X-NLX-Request-Data-Subject - description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678,kenteken=ab-12-fg`' + description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678, kenteken=ab-12-fg`' in: header - name: X-Audit-Clarification @@ -911,22 +1058,18 @@ paths: required: true schema: type: string + - + name: Authorization + description: 'The JWT of the entity performing the request' + in: header - name: API-Version description: 'The version of the API conform [Landelijke API-strategie.](https://geonovum.github.io/KP-APIs/#versioning)' example: 1.0.1 in: header - - name: X-NLX-Request-User-Id - description: 'The id of the user performing the request' - in: header - - - name: X-NLX-Request-Application-Id - description: 'The id of the application performing the request' - in: header - - - name: X-NLX-Request-Subject-Identifier - description: 'An subject identifier for purpose registration (doelbinding)' + name: X-NLX-Logrecord-ID + description: 'A globally unique id of the request, which makes a request traceable throughout the network.' in: header - name: X-NLX-Request-Process-Id @@ -938,7 +1081,7 @@ paths: in: header - name: X-NLX-Request-Data-Subject - description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678,kenteken=ab-12-fg`' + description: 'A key-value list of data subjects related to this request. e.g. `bsn=12345678, kenteken=ab-12-fg`' in: header - name: X-Audit-Clarification @@ -1598,7 +1741,7 @@ components: type: array items: $ref: '#/components/schemas/Property:jsonld-write' -host: pc.zaakonline.nl +host: irc.zaakonline.nl servers: - description: 'Demo Omgeving' From 050631a4c6dd318c8d2468ac14c8832b94639a5c Mon Sep 17 00:00:00 2001 From: Ruben van der Linde Date: Tue, 5 Nov 2019 18:05:48 +0100 Subject: [PATCH 03/11] Nginx fix --- api/helm/templates/api-deployment.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/api/helm/templates/api-deployment.yaml b/api/helm/templates/api-deployment.yaml index 28a49457..68e774de 100644 --- a/api/helm/templates/api-deployment.yaml +++ b/api/helm/templates/api-deployment.yaml @@ -31,6 +31,11 @@ spec: configMapKeyRef: name: {{ template "fullname" . }} key: php-service + - name: NGINX_HOST + valueFrom: + configMapKeyRef: + name: {{ template "fullname" . }} + key: php-service resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} From 786b3cfb4b3e1aae0c6261056b191e678db6b08b Mon Sep 17 00:00:00 2001 From: Ruben van der Linde Date: Tue, 5 Nov 2019 18:19:03 +0100 Subject: [PATCH 04/11] Test --- INSTALLATION.md | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALLATION.md b/INSTALLATION.md index 3a8ae6da..56580970 100644 --- a/INSTALLATION.md +++ b/INSTALLATION.md @@ -85,6 +85,7 @@ $ helm del vtc-prod --purge --kubeconfig="api/helm/kubeconfig.yaml --namespace=p ``` + ## Making your app known on NLX The proto component commes with an default NLX setup, if you made your own component however you might want to provide it trough the [NLX](https://www.nlx.io/) service. Furntunatly the proto component commes with an nice setup for NLX integration. From d4b997b84a5be5d1fc05a8c5ebb739c535f19abb Mon Sep 17 00:00:00 2001 From: Robert Zondervan Date: Mon, 11 Nov 2019 15:41:36 +0100 Subject: [PATCH 05/11] Replace two double "maxLength" descriptions to "minLength", added assert on second variable with this issue --- .gitignore | 2 + api/src/Entity/Property.php | 131 ++++++++++++++++++------------------ 2 files changed, 68 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index c4dd0691..baa17284 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ api/helm/kubeconfig.yaml !/api/public/bundle/* + +.idea/ diff --git a/api/src/Entity/Property.php b/api/src/Entity/Property.php index a1fc67f1..36cc7ce0 100644 --- a/api/src/Entity/Property.php +++ b/api/src/Entity/Property.php @@ -19,10 +19,10 @@ /** * This property follows the following schemes (in order of importance) - * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md + * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md * https://tools.ietf.org/html/draft-wright-json-schema-validation-00 * http://json-schema.org/ - * + * * @ApiResource( * normalizationContext={"groups"={"read"}, "enable_max_depth"=true}, * denormalizationContext={"groups"={"write"}, "enable_max_depth"=true} @@ -57,15 +57,15 @@ class Property /** * @var Object $requestType The requestType that this property belongs to - * + * * @Assert\NotBlank * @MaxDepth(1) * @Groups({"read", "write"}) * @ORM\ManyToOne(targetEntity="App\Entity\RequestType", inversedBy="properties",cascade={"persist"}) * @ORM\JoinColumn(nullable=false) */ - private $requestType; - + private $requestType; + /** * @var string $title The title of this property * @example My Property @@ -77,7 +77,7 @@ class Property * "description" = "The title of this property", * "type"="string", * "example"="My Property", - * "maxLength"="15", + * "minLength"="15", * "maxLength"="255", * "required" = true * } @@ -89,7 +89,7 @@ class Property * @ORM\Column(type="string", length=255) */ private $title; - + /** * * @var string $name The name of the property as used in api calls, extracted from title on snake_case basis * @example my_property @@ -101,17 +101,18 @@ class Property * "description" = "The name of the property as used in api calls, extracted from title on snake_case basis", * "type"="string", * "example"="my_property", - * "maxLength"="15", + * "minLength"="15", * "maxLength"="255", * "required" = true * } * } * ) + * @Assert\Length(min = 15, max = 255) * @Groups({"read"}) */ private $name; - - /** + + /** * @var string $type The type of this property * @example string * @@ -134,9 +135,9 @@ class Property * @Groups({"read", "write"}) * @ORM\Column(type="string", length=255) */ - private $type; - - /** + private $type; + + /** * @var string $type The swagger type of the property as used in api calls * @example string * @@ -152,7 +153,7 @@ class Property * } * } * ) - * + * * @Assert\NotBlank * @Assert\Length(max = 255) * @Assert\Choice({"int32","int64","float","double","byte","binary","date","date-time","duration","password","boolean","string","uuid","uri","email","rsin","bag","bsn","iban","challenge","service","assent"}) @@ -162,7 +163,7 @@ class Property private $format; /** - * @var string $multipleOf *Can only be used in combination with type integer* Specifies a number where the value should be a multiple of, e.g. a multiple of 2 would validate 2,4 and 6 but would prevent 5 + * @var string $multipleOf *Can only be used in combination with type integer* Specifies a number where the value should be a multiple of, e.g. a multiple of 2 would validate 2,4 and 6 but would prevent 5 * @example 2 * * @ApiProperty( @@ -175,7 +176,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -183,7 +184,7 @@ class Property private $multipleOf; /** - * @var string $multipleOf *Can only be used in combination with type integer* The maximum allowed value + * @var string $multipleOf *Can only be used in combination with type integer* The maximum allowed value * @example 2 * * @ApiProperty( @@ -196,7 +197,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -216,7 +217,7 @@ class Property * } * } * ) - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -224,7 +225,7 @@ class Property private $exclusiveMaximum; /** - * @var string $minimum *Can only be used in combination with type integer* The minimum allowed value + * @var string $minimum *Can only be used in combination with type integer* The minimum allowed value * @example 2 * * @ApiProperty( @@ -237,7 +238,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -245,7 +246,7 @@ class Property private $minimum; /** - * + * * @var string $exclusiveMinimum *Can only be used in combination with type integer* Defines if the minimum is exclusive, e.g. a exclusive minimum of 5 would invalidate 5 but validate 6 * @example true * @@ -258,7 +259,7 @@ class Property * } * } * ) - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -266,7 +267,7 @@ class Property private $exclusiveMinimum; /** - * @var string $maxLength The maximum amount of characters in the value + * @var string $maxLength The maximum amount of characters in the value * @example 2 * * @ApiProperty( @@ -278,7 +279,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -298,7 +299,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -319,7 +320,7 @@ class Property * } * } * ) - * + * * @Assert\Length(max = 255) * @Groups({"read", "write"}) * @ORM\Column(type="string", length=255, nullable=true) @@ -328,14 +329,14 @@ class Property /** * Not yet supported by business logic - * + * * @ORM\ManyToMany(targetEntity="App\Entity\Property") */ private $items; /** * Not yet supported by business logic - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -343,7 +344,7 @@ class Property private $additionalItems; /** - * @var string $maxItems *Can only be used in combination with type array* The maximum array length + * @var string $maxItems *Can only be used in combination with type array* The maximum array length * @example 2 * * @ApiProperty( @@ -356,7 +357,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -364,7 +365,7 @@ class Property private $maxItems; /** - * @var string $minItems *Can only be used in combination with type array* The minimum allowed value + * @var string $minItems *Can only be used in combination with type array* The minimum allowed value * @example 2 * * @ApiProperty( @@ -377,7 +378,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -397,7 +398,7 @@ class Property * } * } * ) - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -405,7 +406,7 @@ class Property private $uniqueItems; /** - * @var string $maxProperties *Can only be used in combination with type integer* The maximum amount of properties an object should contain + * @var string $maxProperties *Can only be used in combination with type integer* The maximum amount of properties an object should contain * @example 2 * * @ApiProperty( @@ -418,7 +419,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -439,7 +440,7 @@ class Property * } * } * ) - * + * * @Assert\Type("integer") * @Groups({"read", "write"}) * @ORM\Column(type="integer", nullable=true) @@ -459,7 +460,7 @@ class Property * } * } * ) - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -468,7 +469,7 @@ class Property /** * Not yet supported by business logic - * + * * @Groups({"read", "write"}) * @ORM\Column(type="object", nullable=true) */ @@ -476,7 +477,7 @@ class Property /** * Not yet supported by business logic - * + * * @Groups({"read", "write"}) * @ORM\Column(type="object", nullable=true) */ @@ -484,7 +485,7 @@ class Property /** * Not yet supported by business logic - * + * * @Groups({"read", "write"}) * @ORM\Column(type="object", nullable=true) */ @@ -503,7 +504,7 @@ class Property * } * } * ) - * + * * @Groups({"read", "write"}) * @ORM\Column(type="array", nullable=true) */ @@ -522,7 +523,7 @@ class Property * } * } * ) - * + * * @ORM\Column(type="array", nullable=true) */ private $allOf = []; @@ -540,7 +541,7 @@ class Property * } * } * ) - * + * * @ORM\Column(type="array", nullable=true) */ private $anyOf = []; @@ -558,14 +559,14 @@ class Property * } * } * ) - * + * * @ORM\Column(type="array", nullable=true) */ private $oneOf = []; /** * Not yet supported by business logic - * + * * @ORM\Column(type="object", nullable=true) */ private $definitions; @@ -584,7 +585,7 @@ class Property * } * } * ) - * + * * @Groups({"read", "write"}) * @ORM\Column(type="text", nullable=true) */ @@ -604,7 +605,7 @@ class Property * } * } * ) - * + * * @Assert\Length(max = 255) * @Groups({"read", "write"}) * @ORM\Column(type="string", length=255, nullable=true) @@ -625,7 +626,7 @@ class Property * } * } * ) - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -646,7 +647,7 @@ class Property * } * } * ) - * + * * @Assert\Length(max = 255) * @Groups({"read", "write"}) * @ORM\Column(type="string", length=255, nullable=true) @@ -666,7 +667,7 @@ class Property * } * } * ) - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -686,7 +687,7 @@ class Property * } * } * ) - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -708,7 +709,7 @@ class Property * } * } * ) - * + * * @Groups({"read", "write"}) * @ORM\Column(type="text", nullable=true) */ @@ -729,7 +730,7 @@ class Property * } * } * ) - * + * * @Assert\Length(max = 255) * @Groups({"read", "write"}) * @ORM\Column(type="string", length=255, nullable=true) @@ -750,7 +751,7 @@ class Property * } * } * ) - * + * * @Assert\Length(max = 255) * @Groups({"read", "write"}) * @ORM\Column(type="string", length=255, nullable=true) @@ -770,7 +771,7 @@ class Property * } * } * ) - * + * * @Assert\Type("bool") * @Groups({"read", "write"}) * @ORM\Column(type="boolean", nullable=true) @@ -791,7 +792,7 @@ class Property * } * } * ) - * + * * @Groups({"read", "write"}) * @Assert\DateTime * @ORM\Column(type="datetime", nullable=true) @@ -812,7 +813,7 @@ class Property * } * } * ) - * + * * @Groups({"read", "write"}) * @Assert\DateTime * @ORM\Column(type="datetime", nullable=true) @@ -833,7 +834,7 @@ class Property * } * } * ) - * + * * @Groups({"read", "write"}) * @ORM\Column(type="string", length=255, nullable=true) */ @@ -853,7 +854,7 @@ class Property * } * } * ) - * + * * @Groups({"read", "write"}) * @ORM\Column(type="string", length=255, nullable=true) */ @@ -868,11 +869,11 @@ public function getId() { return $this->id; } - + public function setId(string $id): self { $this->id = $id; - + return $this; } @@ -894,12 +895,12 @@ public function getTitle(): ?string } public function setTitle(string $title): self - { + { $this->title = $title; return $this; } - + public function getName(): ?string { // titles wil be used as strings so lets convert the to camelcase @@ -907,7 +908,7 @@ public function getName(): ?string $string = trim($string); //removes whitespace at begin and ending $string = preg_replace('/\s+/', '_', $string); // replaces other whitespaces with _ $string = strtolower($string); - + return $string; } From 8c6d8e7bd84bd108f41b47cdf2c9cb53c0a7e9be Mon Sep 17 00:00:00 2001 From: Robert Zondervan Date: Mon, 11 Nov 2019 15:42:59 +0100 Subject: [PATCH 06/11] Changed import of UuidInterface to be more consistent. --- api/src/Entity/Property.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/Entity/Property.php b/api/src/Entity/Property.php index 36cc7ce0..e7066d90 100644 --- a/api/src/Entity/Property.php +++ b/api/src/Entity/Property.php @@ -10,6 +10,7 @@ use Doctrine\Common\Collections\Collection; use Gedmo\Mapping\Annotation as Gedmo; use Doctrine\ORM\Mapping as ORM; +use Ramsey\Uuid\UuidInterface; use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Serializer\Annotation\MaxDepth; @@ -32,7 +33,7 @@ class Property { /** - * @var \Ramsey\Uuid\UuidInterface $id The UUID identifier of this object + * @var UuidInterface $id The UUID identifier of this object * @example e2984465-190a-4562-829e-a8cca81aa35d * * @ApiProperty( From bcfe8ebd6d429096491a266291f1180c440c70ac Mon Sep 17 00:00:00 2001 From: Robert Zondervan Date: Mon, 11 Nov 2019 15:54:32 +0100 Subject: [PATCH 07/11] Added validators for cascaded inputs --- api/src/Entity/Property.php | 1 + api/src/Entity/RequestType.php | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/api/src/Entity/Property.php b/api/src/Entity/Property.php index e7066d90..02c84a65 100644 --- a/api/src/Entity/Property.php +++ b/api/src/Entity/Property.php @@ -60,6 +60,7 @@ class Property * @var Object $requestType The requestType that this property belongs to * * @Assert\NotBlank + * @Assert\Valid * @MaxDepth(1) * @Groups({"read", "write"}) * @ORM\ManyToOne(targetEntity="App\Entity\RequestType", inversedBy="properties",cascade={"persist"}) diff --git a/api/src/Entity/RequestType.php b/api/src/Entity/RequestType.php index bbebd23c..314944ba 100644 --- a/api/src/Entity/RequestType.php +++ b/api/src/Entity/RequestType.php @@ -16,7 +16,7 @@ use Symfony\Component\Serializer\Annotation\MaxDepth; /** - * @ApiResource( + * @ApiResource( * normalizationContext={"groups"={"read"}, "enable_max_depth"=true}, * denormalizationContext={"groups"={"write"}, "enable_max_depth"=true}, * collectionOperations={ @@ -35,7 +35,7 @@ * "type" : "boolean" * } * } - * } + * } * }, * "put", * "delete" @@ -72,7 +72,7 @@ class RequestType /** * @var string $sourceOrganization The RSIN of the organization that owns this process * @example 002851234 - * + * * @ApiProperty( * attributes={ * "swagger_context"={ @@ -83,7 +83,7 @@ class RequestType * } * } * ) - * + * * @Assert\NotNull * @Assert\Length( * min = 8, @@ -111,7 +111,7 @@ class RequestType * } * } * ) - * + * * @Assert\NotNull * @Assert\Length( * max = 255 @@ -136,7 +136,7 @@ class RequestType * } * } * ) - * + * * @Assert\Length( * max = 2550 * ) @@ -149,12 +149,13 @@ class RequestType * @Groups({"read", "write"}) * @MaxDepth(1) * @ORM\OneToMany(targetEntity="App\Entity\Property", mappedBy="requestType", orphanRemoval=true, fetch="EAGER", cascade={"persist"}) + * @Assert\Valid */ private $properties; /** * @var object $extends The requestType that this requestType extends - * + * * @Groups({"write-requesttype"}) * @ORM\ManyToOne(targetEntity="App\Entity\RequestType", inversedBy="extendedBy", fetch="EAGER") */ @@ -162,7 +163,7 @@ class RequestType /** * @var object $extendedBy The requestTypes that extend this requestType - * + * * @ORM\OneToMany(targetEntity="App\Entity\RequestType", mappedBy="extends") */ private $extendedBy; @@ -188,11 +189,11 @@ public function getId() { return $this->id; } - + public function setId(string $id): self { $this->id = $id; - + return $this; } @@ -249,7 +250,7 @@ public function addProperty(Property $property): self return $this; } - + /* * Used for soft adding properties for the extension functionality */ @@ -258,7 +259,7 @@ public function extendProperty(Property $property): self if (!$this->properties->contains($property)) { $this->properties[] = $property; } - + return $this; } From aef6f4ca5f3fa46cc1206e55b698ecc7ffda8846 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 20:18:13 +0000 Subject: [PATCH 08/11] Bump symfony/cache from 4.3.5 to 4.3.9 in /api Bumps [symfony/cache](https://github.com/symfony/cache) from 4.3.5 to 4.3.9. - [Release notes](https://github.com/symfony/cache/releases) - [Changelog](https://github.com/symfony/cache/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/cache/compare/v4.3.5...v4.3.9) Signed-off-by: dependabot[bot] --- api/composer.lock | 50 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/api/composer.lock b/api/composer.lock index 09187981..b784716f 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -2231,8 +2231,8 @@ "authors": [ { "name": "Luís Otávio Cobucci Oblonczyk", - "role": "Developer", - "email": "lcobucci@gmail.com" + "email": "lcobucci@gmail.com", + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -3027,16 +3027,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -3045,7 +3045,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -3070,7 +3070,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "ralouphie/getallheaders", @@ -3422,16 +3422,16 @@ }, { "name": "symfony/cache", - "version": "v4.3.5", + "version": "v4.3.9", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "40c62600ebad1ed2defbf7d35523d918a73ab330" + "reference": "2a7bcc592adcaab9efc165bbced5a91fe905fad4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/40c62600ebad1ed2defbf7d35523d918a73ab330", - "reference": "40c62600ebad1ed2defbf7d35523d918a73ab330", + "url": "https://api.github.com/repos/symfony/cache/zipball/2a7bcc592adcaab9efc165bbced5a91fe905fad4", + "reference": "2a7bcc592adcaab9efc165bbced5a91fe905fad4", "shasum": "" }, "require": { @@ -3496,7 +3496,7 @@ "caching", "psr6" ], - "time": "2019-10-04T10:57:53+00:00" + "time": "2019-12-01T10:50:31+00:00" }, { "name": "symfony/cache-contracts", @@ -6315,16 +6315,16 @@ }, { "name": "symfony/service-contracts", - "version": "v1.1.7", + "version": "v1.1.8", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0" + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0", - "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf", "shasum": "" }, "require": { @@ -6369,7 +6369,7 @@ "interoperability", "standards" ], - "time": "2019-09-17T11:12:18+00:00" + "time": "2019-10-14T12:27:06+00:00" }, { "name": "symfony/stopwatch", @@ -6751,28 +6751,28 @@ }, { "name": "symfony/var-exporter", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "d5b4e2d334c1d80e42876c7d489896cfd37562f2" + "reference": "e566070effe60b8d16b99e958cdbd92aa2e470cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/d5b4e2d334c1d80e42876c7d489896cfd37562f2", - "reference": "d5b4e2d334c1d80e42876c7d489896cfd37562f2", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/e566070effe60b8d16b99e958cdbd92aa2e470cb", + "reference": "e566070effe60b8d16b99e958cdbd92aa2e470cb", "shasum": "" }, "require": { "php": "^7.1.3" }, "require-dev": { - "symfony/var-dumper": "^4.1.1" + "symfony/var-dumper": "^4.1.1|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -6807,7 +6807,7 @@ "instantiate", "serialize" ], - "time": "2019-08-22T07:33:08+00:00" + "time": "2019-12-01T08:39:58+00:00" }, { "name": "symfony/web-link", From 3587596c1f5b8369045c3821fec8168aedcf4c69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 20:59:09 +0000 Subject: [PATCH 09/11] Bump symfony/security-http from 4.3.5 to 4.3.9 in /api Bumps [symfony/security-http](https://github.com/symfony/security-http) from 4.3.5 to 4.3.9. - [Release notes](https://github.com/symfony/security-http/releases) - [Commits](https://github.com/symfony/security-http/compare/v4.3.5...v4.3.9) Signed-off-by: dependabot[bot] --- api/composer.lock | 220 +++++++++++++++++++++++----------------------- 1 file changed, 112 insertions(+), 108 deletions(-) diff --git a/api/composer.lock b/api/composer.lock index 09187981..8418a5b3 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -2231,8 +2231,8 @@ "authors": [ { "name": "Luís Otávio Cobucci Oblonczyk", - "role": "Developer", - "email": "lcobucci@gmail.com" + "email": "lcobucci@gmail.com", + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -3027,16 +3027,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -3045,7 +3045,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -3070,7 +3070,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "ralouphie/getallheaders", @@ -3768,16 +3768,16 @@ }, { "name": "symfony/debug", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe" + "reference": "b8600a1d7d20b0e80906398bb1f50612fa074a8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", - "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", + "url": "https://api.github.com/repos/symfony/debug/zipball/b8600a1d7d20b0e80906398bb1f50612fa074a8e", + "reference": "b8600a1d7d20b0e80906398bb1f50612fa074a8e", "shasum": "" }, "require": { @@ -3788,12 +3788,12 @@ "symfony/http-kernel": "<3.4" }, "require-dev": { - "symfony/http-kernel": "~3.4|~4.0" + "symfony/http-kernel": "^3.4|^4.0|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -3820,7 +3820,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-09-19T15:51:53+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/dependency-injection", @@ -4105,16 +4105,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "6229f58993e5a157f6096fc7145c0717d0be8807" + "reference": "b3c3068a72623287550fe20b84a2b01dcba2686f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807", - "reference": "6229f58993e5a157f6096fc7145c0717d0be8807", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b3c3068a72623287550fe20b84a2b01dcba2686f", + "reference": "b3c3068a72623287550fe20b84a2b01dcba2686f", "shasum": "" }, "require": { @@ -4130,12 +4130,12 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/http-foundation": "^3.4|^4.0", - "symfony/service-contracts": "^1.1", - "symfony/stopwatch": "~3.4|~4.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/stopwatch": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/dependency-injection": "", @@ -4144,7 +4144,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4171,7 +4171,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-10-01T16:40:32+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4758,31 +4758,31 @@ }, { "name": "symfony/http-foundation", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "76590ced16d4674780863471bae10452b79210a5" + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/76590ced16d4674780863471bae10452b79210a5", - "reference": "76590ced16d4674780863471bae10452b79210a5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8bccc59e61b41963d14c3dbdb23181e5c932a1d5", + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/mime": "^4.3", + "symfony/mime": "^4.3|^5.0", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "~3.4|~4.0" + "symfony/expression-language": "^3.4|^4.0|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4809,20 +4809,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-10-04T19:48:13+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.5", + "version": "v4.3.9", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "5f08141850932e8019c01d8988bf3ed6367d2991" + "reference": "3feb99b01560f94173d8fbc5a203ea497d01d499" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f08141850932e8019c01d8988bf3ed6367d2991", - "reference": "5f08141850932e8019c01d8988bf3ed6367d2991", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3feb99b01560f94173d8fbc5a203ea497d01d499", + "reference": "3feb99b01560f94173d8fbc5a203ea497d01d499", "shasum": "" }, "require": { @@ -4901,20 +4901,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-10-07T15:06:41+00:00" + "time": "2019-12-01T14:00:23+00:00" }, { "name": "symfony/inflector", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", - "reference": "fc488a52c79b2bbe848fa9def35f2cccb47c4798" + "reference": "98581481d9ddabe4db3a66e10202fe1fa08d791b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/inflector/zipball/fc488a52c79b2bbe848fa9def35f2cccb47c4798", - "reference": "fc488a52c79b2bbe848fa9def35f2cccb47c4798", + "url": "https://api.github.com/repos/symfony/inflector/zipball/98581481d9ddabe4db3a66e10202fe1fa08d791b", + "reference": "98581481d9ddabe4db3a66e10202fe1fa08d791b", "shasum": "" }, "require": { @@ -4924,7 +4924,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4959,7 +4959,7 @@ "symfony", "words" ], - "time": "2019-09-17T11:12:06+00:00" + "time": "2019-11-06T12:02:32+00:00" }, { "name": "symfony/intl", @@ -5228,16 +5228,16 @@ }, { "name": "symfony/mime", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "32f71570547b91879fdbd9cf50317d556ae86916" + "reference": "010cc488e56cafe5f7494dea70aea93100c234df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916", - "reference": "32f71570547b91879fdbd9cf50317d556ae86916", + "url": "https://api.github.com/repos/symfony/mime/zipball/010cc488e56cafe5f7494dea70aea93100c234df", + "reference": "010cc488e56cafe5f7494dea70aea93100c234df", "shasum": "" }, "require": { @@ -5245,14 +5245,17 @@ "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, + "conflict": { + "symfony/mailer": "<4.4" + }, "require-dev": { "egulias/email-validator": "^2.1.10", - "symfony/dependency-injection": "~3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -5283,7 +5286,7 @@ "mime", "mime-type" ], - "time": "2019-09-19T17:00:15+00:00" + "time": "2019-11-30T08:27:26+00:00" }, { "name": "symfony/options-resolver", @@ -5399,16 +5402,16 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2" + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", - "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", "shasum": "" }, "require": { @@ -5422,7 +5425,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5457,20 +5460,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -5482,7 +5485,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5516,20 +5519,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T14:18:11+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "04ce3335667451138df4307d6a9b61565560199e" + "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e", - "reference": "04ce3335667451138df4307d6a9b61565560199e", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", + "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", "shasum": "" }, "require": { @@ -5538,7 +5541,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5571,20 +5574,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188" + "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188", - "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/4b0e2222c55a25b4541305a053013d5647d3a25f", + "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f", "shasum": "" }, "require": { @@ -5593,7 +5596,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5629,7 +5632,7 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T16:25:15+00:00" }, { "name": "symfony/process", @@ -5682,24 +5685,24 @@ }, { "name": "symfony/property-access", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "bb0c302375ffeef60c31e72a4539611b7f787565" + "reference": "bafdc8c3a9d2671af4a81baec0fcc4687c0c17bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/bb0c302375ffeef60c31e72a4539611b7f787565", - "reference": "bb0c302375ffeef60c31e72a4539611b7f787565", + "url": "https://api.github.com/repos/symfony/property-access/zipball/bafdc8c3a9d2671af4a81baec0fcc4687c0c17bc", + "reference": "bafdc8c3a9d2671af4a81baec0fcc4687c0c17bc", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/inflector": "~3.4|~4.0" + "symfony/inflector": "^3.4|^4.0|^5.0" }, "require-dev": { - "symfony/cache": "~3.4|~4.0" + "symfony/cache": "^3.4|^4.0|^5.0" }, "suggest": { "psr/cache-implementation": "To cache access methods." @@ -5707,7 +5710,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -5745,7 +5748,7 @@ "property path", "reflection" ], - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-12-01T10:50:45+00:00" }, { "name": "symfony/property-info", @@ -5985,35 +5988,36 @@ }, { "name": "symfony/security-core", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "a6f763c1f093b833d371f813519a1a8c07b75fb9" + "reference": "312c91f90786fd7add89e8542cfc98543f0e60db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/a6f763c1f093b833d371f813519a1a8c07b75fb9", - "reference": "a6f763c1f093b833d371f813519a1a8c07b75fb9", + "url": "https://api.github.com/repos/symfony/security-core/zipball/312c91f90786fd7add89e8542cfc98543f0e60db", + "reference": "312c91f90786fd7add89e8542cfc98543f0e60db", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/event-dispatcher-contracts": "^1.1", - "symfony/service-contracts": "^1.1" + "symfony/event-dispatcher-contracts": "^1.1|^2", + "symfony/service-contracts": "^1.1.6|^2" }, "conflict": { - "symfony/event-dispatcher": "<4.3", + "symfony/event-dispatcher": "<4.3|>=5", + "symfony/ldap": "<4.4", "symfony/security-guard": "<4.3" }, "require-dev": { "psr/container": "^1.0", "psr/log": "~1.0", "symfony/event-dispatcher": "^4.3", - "symfony/expression-language": "~3.4|~4.0", - "symfony/http-foundation": "~3.4|~4.0", - "symfony/ldap": "~3.4|~4.0", - "symfony/validator": "^3.4.31|^4.3.4" + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/ldap": "^4.4|^5.0", + "symfony/validator": "^3.4.31|^4.3.4|^5.0" }, "suggest": { "psr/container-implementation": "To instantiate the Security class", @@ -6026,7 +6030,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -6053,7 +6057,7 @@ ], "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", - "time": "2019-09-10T11:22:25+00:00" + "time": "2019-11-20T10:44:55+00:00" }, { "name": "symfony/security-csrf", @@ -6170,16 +6174,16 @@ }, { "name": "symfony/security-http", - "version": "v4.3.5", + "version": "v4.3.9", "source": { "type": "git", "url": "https://github.com/symfony/security-http.git", - "reference": "b91b6d4d1bded8365f23f6bd4290d28bc6af0832" + "reference": "75e96df3a1b9b38c67e2fa208894f72dae5e1147" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-http/zipball/b91b6d4d1bded8365f23f6bd4290d28bc6af0832", - "reference": "b91b6d4d1bded8365f23f6bd4290d28bc6af0832", + "url": "https://api.github.com/repos/symfony/security-http/zipball/75e96df3a1b9b38c67e2fa208894f72dae5e1147", + "reference": "75e96df3a1b9b38c67e2fa208894f72dae5e1147", "shasum": "" }, "require": { @@ -6231,7 +6235,7 @@ ], "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", - "time": "2019-10-04T21:11:33+00:00" + "time": "2019-11-30T13:16:45+00:00" }, { "name": "symfony/serializer", @@ -6315,16 +6319,16 @@ }, { "name": "symfony/service-contracts", - "version": "v1.1.7", + "version": "v1.1.8", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0" + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0", - "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf", "shasum": "" }, "require": { @@ -6369,7 +6373,7 @@ "interoperability", "standards" ], - "time": "2019-09-17T11:12:18+00:00" + "time": "2019-10-14T12:27:06+00:00" }, { "name": "symfony/stopwatch", From caa556bef1f0601d6ecefacfec5e38801ba0f97c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2019 04:16:33 +0000 Subject: [PATCH 10/11] Bump symfony/http-foundation from 4.3.5 to 4.4.1 in /api Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.3.5 to 4.4.1. - [Release notes](https://github.com/symfony/http-foundation/releases) - [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/http-foundation/compare/v4.3.5...v4.4.1) Signed-off-by: dependabot[bot] --- api/composer.lock | 73 ++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/api/composer.lock b/api/composer.lock index 09187981..d245453a 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -2231,8 +2231,8 @@ "authors": [ { "name": "Luís Otávio Cobucci Oblonczyk", - "role": "Developer", - "email": "lcobucci@gmail.com" + "email": "lcobucci@gmail.com", + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -4758,31 +4758,31 @@ }, { "name": "symfony/http-foundation", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "76590ced16d4674780863471bae10452b79210a5" + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/76590ced16d4674780863471bae10452b79210a5", - "reference": "76590ced16d4674780863471bae10452b79210a5", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8bccc59e61b41963d14c3dbdb23181e5c932a1d5", + "reference": "8bccc59e61b41963d14c3dbdb23181e5c932a1d5", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/mime": "^4.3", + "symfony/mime": "^4.3|^5.0", "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { "predis/predis": "~1.0", - "symfony/expression-language": "~3.4|~4.0" + "symfony/expression-language": "^3.4|^4.0|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -4809,7 +4809,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-10-04T19:48:13+00:00" + "time": "2019-11-28T13:33:56+00:00" }, { "name": "symfony/http-kernel", @@ -5228,16 +5228,16 @@ }, { "name": "symfony/mime", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "32f71570547b91879fdbd9cf50317d556ae86916" + "reference": "010cc488e56cafe5f7494dea70aea93100c234df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916", - "reference": "32f71570547b91879fdbd9cf50317d556ae86916", + "url": "https://api.github.com/repos/symfony/mime/zipball/010cc488e56cafe5f7494dea70aea93100c234df", + "reference": "010cc488e56cafe5f7494dea70aea93100c234df", "shasum": "" }, "require": { @@ -5245,14 +5245,17 @@ "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, + "conflict": { + "symfony/mailer": "<4.4" + }, "require-dev": { "egulias/email-validator": "^2.1.10", - "symfony/dependency-injection": "~3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -5283,7 +5286,7 @@ "mime", "mime-type" ], - "time": "2019-09-19T17:00:15+00:00" + "time": "2019-11-30T08:27:26+00:00" }, { "name": "symfony/options-resolver", @@ -5399,16 +5402,16 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2" + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", - "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", "shasum": "" }, "require": { @@ -5422,7 +5425,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5457,20 +5460,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -5482,7 +5485,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5516,20 +5519,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T14:18:11+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "04ce3335667451138df4307d6a9b61565560199e" + "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e", - "reference": "04ce3335667451138df4307d6a9b61565560199e", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", + "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", "shasum": "" }, "require": { @@ -5538,7 +5541,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5571,7 +5574,7 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-php73", From d150eeb0d1197e72a84fc5538b21427fcdb4e4bc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2019 04:28:34 +0000 Subject: [PATCH 11/11] Bump symfony/mime from 4.3.5 to 4.4.1 in /api Bumps [symfony/mime](https://github.com/symfony/mime) from 4.3.5 to 4.4.1. - [Release notes](https://github.com/symfony/mime/releases) - [Changelog](https://github.com/symfony/mime/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/mime/compare/v4.3.5...v4.4.1) Signed-off-by: dependabot[bot] --- api/composer.lock | 57 +++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/api/composer.lock b/api/composer.lock index 09187981..70a46881 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -2231,8 +2231,8 @@ "authors": [ { "name": "Luís Otávio Cobucci Oblonczyk", - "role": "Developer", - "email": "lcobucci@gmail.com" + "email": "lcobucci@gmail.com", + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -5228,16 +5228,16 @@ }, { "name": "symfony/mime", - "version": "v4.3.5", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "32f71570547b91879fdbd9cf50317d556ae86916" + "reference": "010cc488e56cafe5f7494dea70aea93100c234df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916", - "reference": "32f71570547b91879fdbd9cf50317d556ae86916", + "url": "https://api.github.com/repos/symfony/mime/zipball/010cc488e56cafe5f7494dea70aea93100c234df", + "reference": "010cc488e56cafe5f7494dea70aea93100c234df", "shasum": "" }, "require": { @@ -5245,14 +5245,17 @@ "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0" }, + "conflict": { + "symfony/mailer": "<4.4" + }, "require-dev": { "egulias/email-validator": "^2.1.10", - "symfony/dependency-injection": "~3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -5283,7 +5286,7 @@ "mime", "mime-type" ], - "time": "2019-09-19T17:00:15+00:00" + "time": "2019-11-30T08:27:26+00:00" }, { "name": "symfony/options-resolver", @@ -5399,16 +5402,16 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2" + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", - "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", "shasum": "" }, "require": { @@ -5422,7 +5425,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5457,20 +5460,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -5482,7 +5485,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5516,20 +5519,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T14:18:11+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "04ce3335667451138df4307d6a9b61565560199e" + "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e", - "reference": "04ce3335667451138df4307d6a9b61565560199e", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", + "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", "shasum": "" }, "require": { @@ -5538,7 +5541,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -5571,7 +5574,7 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-php73",