AdFabConnect / magento2gdpr

Helper/Data.php

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function getThirdPartyActive()
     {
-        if ( ! isset( $this->thirdPartyActive) ) {
+        if ( ! isset($this->thirdPartyActive)) {
             $this->thirdPartyActive = $this->scopeConfig->getValue(self::XML_PATH_CUSTOMER_PERSONNALIZED_SUGGESTIONS) ? true : false;
         }
         return $this->thirdPartyActive;
@@ -61,7 +61,7 @@ 
      */
     public function getPersonnalizedSuggestionsActive()
     {
-        if ( ! isset( $this->personnalizedSuggestionsActive) ) {
+        if ( ! isset($this->personnalizedSuggestionsActive)) {
             $this->personnalizedSuggestionsActive = $this->scopeConfig->getValue(self::XML_PATH_CUSTOMER_THIRD_PARTY) ? true : false;
         }
         return $this->personnalizedSuggestionsActive;
@@ -73,7 +73,7 @@ 
      */
     public function getAccountDeletionActive()
     {
-        if ( ! isset( $this->accountDeletionActive) ) {
+        if ( ! isset($this->accountDeletionActive)) {
             $this->accountDeletionActive = $this->scopeConfig->getValue(self::XML_PATH_CUSTOMER_ACCOUNT_DELETION) ? true : false;
         }
         return $this->accountDeletionActive;
@@ -85,7 +85,7 @@ 
      */
     public function getExportActive()
     {
-        if ( ! isset( $this->exportActive) ) {
+        if ( ! isset($this->exportActive)) {
             $this->exportActive = $this->scopeConfig->getValue(self::XML_PATH_CUSTOMER_EXPORT) ? true : false;
         }
         return $this->exportActive;

Helper/Cipher.php

Spacing +13 added lines, -13 removed lines

@@ -59,7 +59,7 @@ 
         DirectoryList $directoryList
     ) {
         parent::__construct($context);
-        $this->directoryList= $directoryList;
+        $this->directoryList = $directoryList;
     }
 
     /**
@@ -67,7 +67,7 @@ 
      * @return boolean
      */
     public function isActive() {
-        if ( ! isset( $this->cipherActive ) ) {
+        if ( ! isset($this->cipherActive)) {
             $this->cipherActive = $this->scopeConfig->getValue(self::XML_PATH_CUSTOMER_CIPHER_ACTIVE) ? true : false;
         }
         return $this->cipherActive;
@@ -77,7 +77,7 @@ 
      * @return array
      */
     private function getKeyAndIv() {
-        if ( isset( $this->keyAndIv) ) {
+        if (isset($this->keyAndIv)) {
             return $this->keyAndIv;
         }
         $file = $this->directoryList->getPath('var')
@@ -85,10 +85,10 @@ 
             $this->scopeConfig->getValue(self::XML_PATH_CUSTOMER_CIPHER_FILENAME).
             '.php'
         ;
-        if ( ! is_file($file) ) {
+        if ( ! is_file($file)) {
             return null;
         }
-        $this->keyAndIv= include( $file );
+        $this->keyAndIv = include($file);
         return $this->keyAndIv;
     }
 
@@ -97,7 +97,7 @@ 
      * @param string $key
      * @param string $iv
      */
-    public function setKeyAndIv($key,$iv) {
+    public function setKeyAndIv($key, $iv) {
         $this->keyAndIv = [
             'key' => (string) $key,
             'iv' => (string) $iv,
@@ -110,8 +110,8 @@ 
      * @param string $string
      * @return string
      */
-    public function cipher( $string ) {
-        if ( ( $string === null ) || ! is_string( $string ) || ! $this->isActive() ) {
+    public function cipher($string) {
+        if (($string === null) || ! is_string($string) || ! $this->isActive()) {
             return $string;
         }
         $keyAndIv = $this->getKeyAndIv();
@@ -124,14 +124,14 @@ 
      * @param string $string
      * @return string
      */
-    public function decipher( $string ) {
-        if ( ( $string === null ) || ! is_string($string) || ! preg_match( $this->base64Pattern, $string ) ) {
+    public function decipher($string) {
+        if (($string === null) || ! is_string($string) || ! preg_match($this->base64Pattern, $string)) {
             return $string;
         }
         $keyAndIv = $this->getKeyAndIv();
-        for ( $i = 0 ; $i < 3 ; $i++ ) {
-            $clear = openssl_decrypt( $string, self::METHOD, $keyAndIv['key'], 0, $keyAndIv['iv'] );
-            if  ( $clear !== false ) {
+        for ($i = 0; $i < 3; $i++) {
+            $clear = openssl_decrypt($string, self::METHOD, $keyAndIv['key'], 0, $keyAndIv['iv']);
+            if ($clear !== false) {
                 $string = $clear;
             }
             else {

Braces +1 added lines, -2 removed lines

@@ -133,8 +133,7 @@
             $clear = openssl_decrypt( $string, self::METHOD, $keyAndIv['key'], 0, $keyAndIv['iv'] );
             if  ( $clear !== false ) {
                 $string = $clear;
-            }
-            else {
+            } else {
                 break;
             }
         }

Controller/Settings/Save.php

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
     ) {
         $this->formKeyValidator = $formKeyValidator;
         $this->customerRepository = $customerRepository;
-        $this->storeManager= $storeManager;
+        $this->storeManager = $storeManager;
         parent::__construct($context, $customerSession);
     }
 
@@ -51,7 +51,7 @@ 
     public function execute()
     {
         $request = $this->getRequest();
-        if (!$this->formKeyValidator->validate($request)) {
+        if ( ! $this->formKeyValidator->validate($request)) {
             return $this->_redirect('privacy/settings/');
         }
         $customerId = $this->_customerSession->getCustomerId();
@@ -63,8 +63,8 @@ 
                 /* @var $customer \Magento\Customer\Model\Data\Customer */
                 $storeId = $this->storeManager->getStore()->getId();
                 $customer->setStoreId($storeId);
-                $customer->setCustomAttribute('personnalized_suggestions', $request->getParam('personnalized_suggestions', 0 ) ? 1 : 0 );
-                $customer->setCustomAttribute('third_party', $request->getParam('third_party', 0 ) ? 1 : 0 );
+                $customer->setCustomAttribute('personnalized_suggestions', $request->getParam('personnalized_suggestions', 0) ? 1 : 0);
+                $customer->setCustomAttribute('third_party', $request->getParam('third_party', 0) ? 1 : 0);
                 $this->customerRepository->save($customer);
             } catch (\Exception $e) {
                 $this->messageManager->addError(__('Something went wrong while saving your privacy settings.'));

Controller/Privacy.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function dispatch(RequestInterface $request)
     {
-        if (!$this->_customerSession->authenticate()) {
+        if ( ! $this->_customerSession->authenticate()) {
             $this->_actionFlag->set('', 'no-dispatch', true);
         }
         return parent::dispatch($request);

Test/Unit/CipherTest.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->cipherHelper = $objectManager->getObject('Adfab\Gdpr\Helper\Cipher');
-        $this->cipherHelper->setKeyAndIv($this->key, base64_decode( $this->initialisationVector ) );
+        $this->cipherHelper->setKeyAndIv($this->key, base64_decode($this->initialisationVector));
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     public function testCrypt()
     {
-        $this->assertEquals($this->cryptedMessage, $this->cipherHelper->cipher( $this->clearMessage ));
+        $this->assertEquals($this->cryptedMessage, $this->cipherHelper->cipher($this->clearMessage));
     }
 
     /**
@@ -52,6 +52,6 @@ 
      */
     public function testDerypt()
     {
-        $this->assertEquals($this->clearMessage, $this->cipherHelper->decipher( $this->cryptedMessage));
+        $this->assertEquals($this->clearMessage, $this->cipherHelper->decipher($this->cryptedMessage));
     }
 }
\ No newline at end of file

Block/Settings.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
         $customerId = $this->customerSession->getCustomerId();
         $customer = $this->customerRepository->getById($customerId);
         /* @var $customer \Magento\Customer\Model\Data\Customer */
-        $block->setThirdParty( $customer->getCustomAttribute('third_party')->getValue() );
-        $block->setPersonnalizedSuggestions( $customer->getCustomAttribute('personnalized_suggestions')->getValue() );
+        $block->setThirdParty($customer->getCustomAttribute('third_party')->getValue());
+        $block->setPersonnalizedSuggestions($customer->getCustomAttribute('personnalized_suggestions')->getValue());
         return parent::_prepareLayout();
     }
 

Setup/InstallData.php

Spacing +16 added lines, -16 removed lines

@@ -77,9 +77,9 @@ 
         Config $eavConfig
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->configWriter= $configWriter;
+        $this->configWriter = $configWriter;
         $this->cacheTypeList = $cacheTypeList;
-        $this->directoryList= $directoryList;
+        $this->directoryList = $directoryList;
         $this->eavSetupFactory = $eavSetupFactory;
         $this->eavConfig = $eavConfig;
     }
@@ -94,9 +94,9 @@ 
     {
         $setup->startSetup();
         $dir = $this->directoryList->getPath('var').'/keys';
-        if ( ! is_dir( $dir ) ) {
-            mkdir( $dir, 0700, true );
-            file_put_contents($dir.'/.htaccess','<IfModule !mod_authz_core.c>
+        if ( ! is_dir($dir)) {
+            mkdir($dir, 0700, true);
+            file_put_contents($dir.'/.htaccess', '<IfModule !mod_authz_core.c>
     Order deny,allow
     Deny from all
 </IfModule>
@@ -104,28 +104,28 @@ 
     Require all denied
 </IfModule>');
         }
-        $fileName = $this->scopeConfig->getValue( Cipher::XML_PATH_CUSTOMER_CIPHER_FILENAME );
-        if ( strlen( $fileName ) == 0 ) {
-            $fileName = md5(microtime(true).rand(0,10000));
-            $this->configWriter->save( Cipher::XML_PATH_CUSTOMER_CIPHER_FILENAME, $fileName);
+        $fileName = $this->scopeConfig->getValue(Cipher::XML_PATH_CUSTOMER_CIPHER_FILENAME);
+        if (strlen($fileName) == 0) {
+            $fileName = md5(microtime(true).rand(0, 10000));
+            $this->configWriter->save(Cipher::XML_PATH_CUSTOMER_CIPHER_FILENAME, $fileName);
             $this->cacheTypeList->cleanType('config');
         }
         $file = $dir.'/'.$fileName.'.php';
-        if ( ! is_file( $file ) ) {
+        if ( ! is_file($file)) {
             $isCryptoStrong = false;
-            $password = openssl_random_pseudo_bytes( 64, $isCryptoStrong );
-            $ivlen = openssl_cipher_iv_length( Cipher::METHOD );
+            $password = openssl_random_pseudo_bytes(64, $isCryptoStrong);
+            $ivlen = openssl_cipher_iv_length(Cipher::METHOD);
             $isCryptoStrong = false;
-            $iv = openssl_random_pseudo_bytes( $ivlen, $isCryptoStrong );
-            if( ! $isCryptoStrong ) {
+            $iv = openssl_random_pseudo_bytes($ivlen, $isCryptoStrong);
+            if ( ! $isCryptoStrong) {
                 throw new Exception('Non-cryptographically strong algorithm used for iv generation. This IV is not safe to use.');
             }
-            file_put_contents( $file, '<?php return [\'key\'=>\''.md5($password).'\', \'iv\'=>\''.strtr($iv,['\''=>'\\\'']).'\'];' );
+            file_put_contents($file, '<?php return [\'key\'=>\''.md5($password).'\', \'iv\'=>\''.strtr($iv, ['\''=>'\\\'']).'\'];');
             chmod($file, 0700);
         }
         $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
         /* @var $eavSetup \Magento\Eav\Setup\EavSetup */
-        foreach( $this->customerFields as $field => $label ) {
+        foreach ($this->customerFields as $field => $label) {
             $eavSetup->addAttribute(
                 \Magento\Customer\Model\Customer::ENTITY,
                 $field,

Setup/InstallSchema.php

Spacing +2 added lines, -2 removed lines

@@ -40,9 +40,9 @@
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
         $setup->startSetup();
-        foreach( $this->tables as $table => $columns ) {
+        foreach ($this->tables as $table => $columns) {
             $tableName = $setup->getTable($table);
-            foreach( $columns as $column ) {
+            foreach ($columns as $column) {
                 $setup->getConnection()->changeColumn(
                     $tableName,
                     $column,

Model/ModelPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      * @param callable $proceed
      * @return unknown
      */
-    public function aroundReindex( AbstractModel $object, callable $proceed ) {
+    public function aroundReindex(AbstractModel $object, callable $proceed) {
         $this->cipher($object);
         $this->cipher->setIsIndexing(true);
         $return = $proceed();