Skip to content

Commit

Permalink
Merge branch 'master' into magento2.3.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	Controller/Privacy/Erase.php
#	Controller/Privacy/ErasePost.php
#	Controller/Privacy/UndoErase.php
#	etc/adminhtml/system/erasure.xml
#	etc/adminhtml/system/export.xml
  • Loading branch information
thomas-kl1 committed Jul 18, 2019
2 parents bfa60aa + 7e8777e commit 9648589
Show file tree
Hide file tree
Showing 245 changed files with 11,871 additions and 3,643 deletions.
76 changes: 76 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
labels: bug
assignees: thomas-kl1

---

## Description
A clear and concise description of what the bug is.

## Prerequisites

**PHP Version:**
- [e.g. 7.2.19]

**Magento Version:**
- [e.g. 2.3.2]

**Module Version:**
- [e.g. 1.0.0]

**Desktop (if applicable):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (if applicable):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

## Issue Details

**Steps to reproduce the behavior**
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[ENHANCEMENT]"
labels: enhancement
assignees: thomas-kl1

---

## Description

- [ ] It's related to an existing issue: #[issueId]

- [ ] It requires major modifications.

Priority of the change:
- [ ] High
- [ ] Medium
- [ ] Low

**Which problem the feature would fix?**
A clear and concise description of what the problem is.

**Describe the solution as simple as possible**
A clear and concise description of how it should works.

**List the alternative solutions**
Curated list of the alternative solutions.

**Additional context**
Add any other context or screenshots about the feature request here.

## Contributing

- [ ] Would you want to contribute and to be assigned to this enhancement?
31 changes: 0 additions & 31 deletions Api/Data/EraseCustomerSearchResultsInterface.php

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,28 @@
* Copyright © OpenGento, All rights reserved.
* See LICENSE bundled with this library for license details.
*/
declare(strict_types=1);

namespace Opengento\Gdpr\Api\Data;

use Magento\Framework\Api\ExtensibleDataInterface;

/**
* Interface EraseCustomerInterface
* Interface EraseEntityInterface
* @api
*/
interface EraseCustomerInterface extends ExtensibleDataInterface
interface EraseEntityInterface extends ExtensibleDataInterface
{
/**#@+
* Constants for fields keys
*/
public const ID = 'entity_id';
public const CUSTOMER_ID = 'customer_id';
public const ID = 'erase_id';
public const ENTITY_ID = 'entity_id';
public const ENTITY_TYPE = 'entity_type';
public const SCHEDULED_AT = 'scheduled_at';
public const STATE = 'state';
public const STATUS = 'status';
public const MESSAGE = 'message';
public const ERASED_AT = 'erased_at';
/**#@-*/

Expand All @@ -42,6 +45,21 @@ interface EraseCustomerInterface extends ExtensibleDataInterface
public const STATUS_SUCCEED = 'succeed';
/**#@-*/

/**
* Retrieve the erase ID
*
* @return int
*/
public function getEraseId(): int;

/**
* Set the erase ID
*
* @param int $eraseId
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface
*/
public function setEraseId(int $eraseId): EraseEntityInterface;

/**
* Retrieve the entity ID
*
Expand All @@ -53,24 +71,25 @@ public function getEntityId(): int;
* Set the entity ID
*
* @param int $entityId
* @return \Opengento\Gdpr\Api\Data\EraseCustomerInterface
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface
* @todo force type in php7.4
*/
public function setEntityId($entityId): EraseCustomerInterface;
public function setEntityId($entityId): EraseEntityInterface;

/**
* Retrieve the customer ID
* Retrieve the entity type
*
* @return int
* @return string
*/
public function getCustomerId(): int;
public function getEntityType(): string;

/**
* Set the customer ID
* Set the entity type
*
* @param int $customerId
* @return \Opengento\Gdpr\Api\Data\EraseCustomerInterface
* @param string $entityType
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface
*/
public function setCustomerId(int $customerId): EraseCustomerInterface;
public function setEntityType(string $entityType): EraseEntityInterface;

/**
* Retrieve the scheduled at
Expand All @@ -83,9 +102,9 @@ public function getScheduledAt(): string;
* Set the schedule at
*
* @param string $scheduledAt
* @return \Opengento\Gdpr\Api\Data\EraseCustomerInterface
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface
*/
public function setScheduledAt(string $scheduledAt): EraseCustomerInterface;
public function setScheduledAt(string $scheduledAt): EraseEntityInterface;

/**
* Retrieve the state
Expand All @@ -98,9 +117,9 @@ public function getState(): string;
* Set the state
*
* @param string $state
* @return \Opengento\Gdpr\Api\Data\EraseCustomerInterface
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface
*/
public function setState(string $state): EraseCustomerInterface;
public function setState(string $state): EraseEntityInterface;

/**
* Retrieve the status
Expand All @@ -113,9 +132,24 @@ public function getStatus(): string;
* Set the status
*
* @param string $status
* @return \Opengento\Gdpr\Api\Data\EraseCustomerInterface
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface
*/
public function setStatus(string $status): EraseEntityInterface;

/**
* Retrieve the error message
*
* @return string|null
*/
public function getMessage(): ?string;

/**
* Set the error message
*
* @param string|null $message
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface
*/
public function setStatus(string $status): EraseCustomerInterface;
public function setMessage(?string $message): EraseEntityInterface;

/**
* Retrieve the erased at if it exists
Expand All @@ -128,7 +162,7 @@ public function getErasedAt(): ?string;
* Set the erased at
*
* @param string $erasedAt
* @return \Opengento\Gdpr\Api\Data\EraseCustomerInterface
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface
*/
public function setErasedAt(string $erasedAt): EraseCustomerInterface;
public function setErasedAt(string $erasedAt): EraseEntityInterface;
}
32 changes: 32 additions & 0 deletions Api/Data/EraseEntitySearchResultsInterface.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php
/**
* Copyright © OpenGento, All rights reserved.
* See LICENSE bundled with this library for license details.
*/
declare(strict_types=1);

namespace Opengento\Gdpr\Api\Data;

use Magento\Framework\Api\SearchResultsInterface;

/**
* Interface EraseEntitySearchResultsInterface
* @api
*/
interface EraseEntitySearchResultsInterface extends SearchResultsInterface
{
/**
* Retrieve the erase entity schedulers list
*
* @return \Opengento\Gdpr\Api\Data\EraseEntityInterface[]
*/
public function getItems(): array;

/**
* Set the erase entity schedulers list
*
* @param \Opengento\Gdpr\Api\Data\EraseEntityInterface[] $items
* @return \Opengento\Gdpr\Api\Data\EraseEntitySearchResultsInterface
*/
public function setItems(array $items): EraseEntitySearchResultsInterface;
}
Loading

0 comments on commit 9648589

Please sign in to comment.