Merge branch 'master' into magento2.3.x

# Conflicts: # composer.json
opengento · Feb 26, 2019 · 62234a9 · 62234a9
2 parents d5bd492 + 22fc6ff
commit 62234a9
Show file tree

Hide file tree

Showing 94 changed files with 322 additions and 291 deletions.
diff --git a/Api/Data/EraseCustomerInterface.php b/Api/Data/EraseCustomerInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 
@@ -17,29 +17,29 @@ interface EraseCustomerInterface extends ExtensibleDataInterface
     /**#@+
      * Constants for fields keys
      */
-    const ID = 'entity_id';
-    const CUSTOMER_ID = 'customer_id';
-    const SCHEDULED_AT = 'scheduled_at';
-    const STATE = 'state';
-    const STATUS = 'status';
-    const ERASED_AT = 'erased_at';
+    public const ID = 'entity_id';
+    public const CUSTOMER_ID = 'customer_id';
+    public const SCHEDULED_AT = 'scheduled_at';
+    public const STATE = 'state';
+    public const STATUS = 'status';
+    public const ERASED_AT = 'erased_at';
     /**#@-*/
 
     /**#@+
      * Constants for State values
      */
-    const STATE_PENDING = 'pending';
-    const STATE_PROCESSING = 'processing';
-    const STATE_COMPLETE = 'complete';
+    public const STATE_PENDING = 'pending';
+    public const STATE_PROCESSING = 'processing';
+    public const STATE_COMPLETE = 'complete';
     /**#@-*/
 
     /**#@+
      * Constants for Status values
      */
-    const STATUS_READY = 'ready';
-    const STATUS_RUNNING = 'running';
-    const STATUS_FAILED = 'failed';
-    const STATUS_SUCCEED = 'succeed';
+    public const STATUS_READY = 'ready';
+    public const STATUS_RUNNING = 'running';
+    public const STATUS_FAILED = 'failed';
+    public const STATUS_SUCCEED = 'succeed';
     /**#@-*/
 
     /**
@@ -122,7 +122,7 @@ public function setStatus(string $status): EraseCustomerInterface;
      *
      * @return string|null
      */
-    public function getErasedAt();
+    public function getErasedAt(): ?string;
 
     /**
      * Set the erased at

diff --git a/Api/Data/EraseCustomerSearchResultsInterface.php b/Api/Data/EraseCustomerSearchResultsInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 

diff --git a/Api/EraseCustomerManagementInterface.php b/Api/EraseCustomerManagementInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 

diff --git a/Api/EraseCustomerRepositoryInterface.php b/Api/EraseCustomerRepositoryInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 

diff --git a/Block/Messages/PrivacyMessagePopup.php b/Block/Messages/PrivacyMessagePopup.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -9,6 +9,7 @@
 
 use Magento\Cms\Block\Block;
 use Magento\Cms\Helper\Page as HelperPage;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
@@ -19,7 +20,7 @@
  */
 class PrivacyMessagePopup extends Template
 {
-    const COOKIE_NAME = 'cookies-policy';
+    public const COOKIE_NAME = 'cookies-policy';
 
     /**
      * @var \Opengento\Gdpr\Model\Config
@@ -36,11 +37,6 @@ class PrivacyMessagePopup extends Template
      */
     private $jsonSerializer;
 
-    /**
-     * @var string
-     */
-    protected $_template = 'Opengento_Gdpr::messages/popup.phtml';
-
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Opengento\Gdpr\Model\Config $config
@@ -53,7 +49,9 @@ public function __construct(
         Config $config,
         HelperPage $helperPage,
         Json $jsonSerializer,
-        array $data = []
+        array $data = [
+            'template' => 'Opengento_Gdpr::messages/popup.phtml',
+        ]
     ) {
         $this->config = $config;
         $this->helperPage = $helperPage;
@@ -64,7 +62,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    public function getJsLayout()
+    public function getJsLayout(): string
     {
         $this->jsLayout['components']['enhanced-privacy-cookie-policy']['config'] = [
             'cookieName' => self::COOKIE_NAME,
@@ -78,7 +76,7 @@ public function getJsLayout()
     /**
      * {@inheritdoc}
      */
-    protected function _toHtml()
+    protected function _toHtml(): string
     {
         return $this->config->isCookieDisclosureEnabled() ? parent::_toHtml() : '';
     }
@@ -87,17 +85,20 @@ protected function _toHtml()
      * Retrieve the cookie disclosure information html
      *
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getCookieDisclosureInformation(): string
     {
         if (!$this->hasData('cookie_disclosure_information')) {
-            $block = $this->getLayout()->createBlock(
-                Block::class,
-                'opengento.gdpr.cookie.disclosure.information',
-                ['data' => ['block_id' => $this->config->getCookieDisclosureInformationBlockId()]]
-            );
-            $this->setData('cookie_disclosure_information', $block->toHtml());
+            try {
+                $block = $this->getLayout()->createBlock(
+                    Block::class,
+                    'opengento.gdpr.cookie.disclosure.information',
+                    ['data' => ['block_id' => $this->config->getCookieDisclosureInformationBlockId()]]
+                );
+                $this->setData('cookie_disclosure_information', $block->toHtml());
+            } catch (LocalizedException $e) {
+                $this->setData('cookie_disclosure_information', '');
+            }
         }
 
         return (string) $this->_getData('cookie_disclosure_information');

diff --git a/Console/Command/EraseCommand.php b/Console/Command/EraseCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -25,7 +25,7 @@ final class EraseCommand extends Command
     /**#@+
      * Input Variables Names
      */
-    const INPUT_ARGUMENT_CUSTOMER = 'customer';
+    private const INPUT_ARGUMENT_CUSTOMER = 'customer';
     /**#@-*/
 
     /**
@@ -64,7 +64,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -81,7 +81,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->appState->setAreaCode(Area::AREA_GLOBAL);
         $oldValue = $this->registry->registry('isSecureArea');

diff --git a/Console/Command/ExportCommand.php b/Console/Command/ExportCommand.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -27,8 +27,8 @@ final class ExportCommand extends Command
     /**#@+
      * Input Variables Names
      */
-    const INPUT_ARGUMENT_CUSTOMER = 'customer';
-    const INPUT_OPTION_FILENAME = 'filename';
+    private const INPUT_ARGUMENT_CUSTOMER = 'customer';
+    private const INPUT_OPTION_FILENAME = 'filename';
     /**#@-*/
 
     /**
@@ -67,7 +67,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -91,7 +91,7 @@ protected function configure()
     /**
      * {@inheritdoc}
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->appState->setAreaCode(Area::AREA_GLOBAL);
 

diff --git a/Controller/AbstractPrivacy.php b/Controller/AbstractPrivacy.php
@@ -1,21 +1,20 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
 
 namespace Opengento\Gdpr\Controller;
 
 use Magento\Customer\Controller\AbstractAccount;
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 
 /**
  * Controller AbstractPrivacy
  */
-abstract class AbstractPrivacy extends AbstractAccount implements ActionInterface
+abstract class AbstractPrivacy extends AbstractAccount
 {
     /**
      * Create a result forward to 404
@@ -26,6 +25,7 @@ public function forwardNoRoute(): ResultInterface
     {
         /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
         $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
+
         return $resultForward->forward('no_route');
     }
 }
diff --git a/Controller/Privacy/Delete.php b/Controller/Privacy/Delete.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2018 OpenGento, All rights reserved.
+ * Copyright © OpenGento, All rights reserved.
  * See LICENSE bundled with this library for license details.
  */
 declare(strict_types=1);
@@ -9,7 +9,6 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Phrase;
 use Opengento\Gdpr\Api\EraseCustomerManagementInterface;
@@ -18,7 +17,7 @@
 /**
  * Action Index Delete
  */
-class Delete extends AbstractPrivacy implements ActionInterface
+class Delete extends AbstractPrivacy
 {
     /**
      * @var \Magento\Customer\Model\Session
@@ -54,7 +53,9 @@ public function execute()
             $this->messageManager->addErrorMessage(new Phrase('Your account is already being removed.'));
             /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-            return $resultRedirect->setPath('customer/privacy/settings');
+            $resultRedirect->setRefererOrBaseUrl();
+
+            return $resultRedirect;
         }
 
         return $this->resultFactory->create(ResultFactory::TYPE_PAGE);