Skip to content

Commit

Permalink
Update company url to https
Browse files Browse the repository at this point in the history
  • Loading branch information
srenon committed Sep 19, 2024
1 parent 0ec1d12 commit fffd90d
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 56 deletions.
2 changes: 1 addition & 1 deletion Block/Adminhtml/System/Config/Form/Composer/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config\Form\Composer;
Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/System/Config/Form/Module/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config\Form\Module;
Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/System/Config/ValidateConfigButton.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Block\Adminhtml\System\Config;
Expand Down
2 changes: 1 addition & 1 deletion Block/Adminhtml/ValidateConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Block\Adminhtml;
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Validateconfig/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Controller\Adminhtml\Validateconfig;
Expand Down
51 changes: 19 additions & 32 deletions Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Helper;
Expand All @@ -24,7 +24,7 @@ class Data extends AbstractHelper
protected $testConfig = [];

/**
* @param null $key
* @param $key null|string
* @return array|mixed|string
*/
public function getTestConfig($key = null)
Expand All @@ -39,7 +39,7 @@ public function getTestConfig($key = null)
}

/**
* @param null $fields
* @param $fields
* @return $this
*/
public function setTestConfig($fields)
Expand All @@ -49,7 +49,7 @@ public function setTestConfig($fields)
}

/**
* @param null $store_id
* @param $store_id int|null
* @return bool
*/
public function isActive($store_id = null)
Expand All @@ -67,8 +67,7 @@ public function isActive($store_id = null)

/**
* Get local client name
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigName($store_id = null)
Expand All @@ -78,8 +77,7 @@ public function getConfigName($store_id = null)

/**
* Get system config password
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigPassword($store_id = null)
Expand All @@ -89,8 +87,7 @@ public function getConfigPassword($store_id = null)

/**
* Get system config username
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigUsername($store_id = null)
Expand All @@ -100,8 +97,7 @@ public function getConfigUsername($store_id = null)

/**
* Get system config auth
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigAuth($store_id = null)
Expand All @@ -111,8 +107,7 @@ public function getConfigAuth($store_id = null)

/**
* Get system config ssl
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigSsl($store_id = null)
Expand All @@ -122,8 +117,7 @@ public function getConfigSsl($store_id = null)

/**
* Get system config host
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigSmtpHost($store_id = null)
Expand All @@ -133,8 +127,7 @@ public function getConfigSmtpHost($store_id = null)

/**
* Get system config port
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigSmtpPort($store_id = null)
Expand All @@ -144,8 +137,7 @@ public function getConfigSmtpPort($store_id = null)

/**
* Get system config reply to
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return bool
*/
public function getConfigSetReplyTo($store_id = null)
Expand All @@ -159,8 +151,7 @@ public function getConfigSetReplyTo($store_id = null)

/**
* Get system config set return path
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return int
*/
public function getConfigSetReturnPath($store_id = null)
Expand All @@ -170,8 +161,7 @@ public function getConfigSetReturnPath($store_id = null)

/**
* Get system config return path email
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigReturnPathEmail($store_id = null)
Expand All @@ -181,8 +171,7 @@ public function getConfigReturnPathEmail($store_id = null)

/**
* Get system config from
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigSetFrom($store_id = null)
Expand All @@ -192,8 +181,7 @@ public function getConfigSetFrom($store_id = null)

/**
* Get system config from
*
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigCustomFromEmail($store_id = null)
Expand All @@ -203,9 +191,8 @@ public function getConfigCustomFromEmail($store_id = null)

/**
* Get system config
*
* @param String path
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return string
*/
public function getConfigValue($path, $store_id = null)
Expand All @@ -224,7 +211,7 @@ public function getConfigValue($path, $store_id = null)

/**
* @param String path
* @param ScopeInterface::SCOPE_STORE $store
* @param $store_id int|null
* @return mixed
*/
public function getScopeConfigValue($path, $store_id = null)
Expand All @@ -251,7 +238,7 @@ public function getStoreId()
}

/**
* @param int/null $storeId
* @param $store_id int|null
*/
public function setStoreId($storeId = null)
{
Expand Down
2 changes: 1 addition & 1 deletion Mail/Smtp.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Mail;
Expand Down
2 changes: 1 addition & 1 deletion Model/Config/Source/Authtype.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/
namespace MagePal\CustomSmtp\Model\Config\Source;

Expand Down
2 changes: 1 addition & 1 deletion Model/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Model;
Expand Down
2 changes: 1 addition & 1 deletion Model/Store.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Model;
Expand Down
8 changes: 4 additions & 4 deletions Plugin/Mail/Template/TransportBuilderByStorePlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/
namespace MagePal\CustomSmtp\Plugin\Mail\Template;

Expand All @@ -20,7 +20,6 @@ class TransportBuilderByStorePlugin

/**
* Sender resolver.
*
* @var SenderResolverInterface
*/
private $senderResolver;
Expand All @@ -38,9 +37,10 @@ public function __construct(
}

/**
* Set the sender email address based on the store context
* @param TransportBuilderByStore $subject
* @param $from
* @param $store
* @param $from string
* @param $store int|null
* @return array
* @throws MailException
*/
Expand Down
4 changes: 2 additions & 2 deletions Plugin/Mail/Template/TransportBuilderPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Plugin\Mail\Template;
Expand All @@ -12,7 +12,6 @@

class TransportBuilderPlugin
{

/** @var Store */
protected $storeModel;

Expand All @@ -26,6 +25,7 @@ public function __construct(
}

/**
* Plugin to set the store ID in template options.
* @param TransportBuilder $subject
* @param $templateOptions
* @return array
Expand Down
5 changes: 3 additions & 2 deletions Plugin/Mail/TransportPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/

namespace MagePal\CustomSmtp\Plugin\Mail;
Expand Down Expand Up @@ -31,11 +31,12 @@ class TransportPlugin
/**
* @var Smtp
*/
private SmtpFactory $smtpFactory;
private $smtpFactory;

/**
* @param Data $dataHelper
* @param Store $storeModel
* @param SmtpFactory $smtpFactory
*/
public function __construct(
Data $dataHelper,
Expand Down
4 changes: 2 additions & 2 deletions etc/acl.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" ?>
<?xml version="1.0"?>
<!--
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
Expand Down
2 changes: 1 addition & 1 deletion etc/adminhtml/routes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
Expand Down
2 changes: 1 addition & 1 deletion etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
Expand Down
2 changes: 1 addition & 1 deletion etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Copyright © MagePal LLC. All rights reserved.
* See COPYING.txt for license details.
* http://www.magepal.com | [email protected]
* https://www.magepal.com | [email protected]
*/
?>

Expand Down
Loading

0 comments on commit fffd90d

Please sign in to comment.