Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Roles and privileges #53

Merged
merged 7 commits into from
Aug 5, 2019
Merged

Roles and privileges #53

merged 7 commits into from
Aug 5, 2019

Conversation

BastekBielawski
Copy link
Contributor

No description provided.

# Conflicts:
#	config/packages/security.yaml
#	module/account/src/Application/Controller/Api/AccountController.php
#	module/account/src/Application/Controller/Api/LogController.php
#	module/account/src/Domain/Entity/User.php
#	module/fixture/src/Resources/fixtures/develop/user.yaml
#	module/fixture/src/Resources/fixtures/fixture.yaml
@BastekBielawski BastekBielawski added the users Functionality label Aug 1, 2019
@BastekBielawski BastekBielawski self-assigned this Aug 1, 2019
@BastekBielawski BastekBielawski marked this pull request as ready for review August 2, 2019 11:14
@BastekBielawski BastekBielawski removed the request for review from MagdalenaL August 2, 2019 11:24
module/core/src/Domain/Event/AbstractStringBasedEvent.php Outdated Show resolved Hide resolved
@@ -17,6 +17,9 @@
"behat/transliterator": {
"version": "v1.2.0"
},
"composer/xdebug-handler": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this file has changed, if there were no changes in the composer files ?

@@ -33,14 +34,14 @@ class RoleFormModel
public $description;

/**
* @var array
* @var array|Privilege[]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Write only Privilege[], it already means it's an array

@BastekBielawski BastekBielawski merged commit a295b72 into ergonode:develop Aug 5, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
users Functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants