D3Public/linkmobility4oxid
8
0
Fork 1
Code Pull Requests Projects Releases Activity

improve code

Browse Source
This commit is contained in:
Daniel Seifert 2023-01-15 22:24:49 +01:00
parent 4632fe1df7
commit f61d77e489
Signed by: DanielS
GPG Key ID: 6A513E13AEE66170
21 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpstan.neon
View File

@ -11,3 +11,4 @@ parameters:
ignoreErrors:
- '#Psr\\Container\\ContainerExceptionInterface is not subtype of Throwable#'
- '#Cannot cast mixed to string.#'
- '#Method D3\\Linkmobility4OXID\\Setup\\Actions::getUniqueFieldTypes\(\) should return array\<string\> but returns array\<int, string\|null\>.#'

2
src/Application/Controller/Admin/AdminUser.php
View File

@ -21,6 +21,7 @@ use D3\Linkmobility4OXID\Application\Model\MessageTypes\Sms;
use D3\Linkmobility4OXID\Application\Model\UserRecipients;
use D3\LinkmobilityClient\Response\ResponseInterface;
use D3\LinkmobilityClient\ValueObject\Recipient;
use Exception;
use InvalidArgumentException;
use OxidEsales\Eshop\Application\Controller\Admin\AdminController;
use OxidEsales\Eshop\Application\Model\User;
@ -63,6 +64,7 @@ class AdminUser extends AdminController
/**
* @return string
* @throws noRecipientFoundException
* @throws Exception
*/
protected function sendMessage(): string
{

1
src/Application/Model/Configuration.php
View File

@ -19,7 +19,6 @@ use Assert\Assert;
use OxidEsales\Eshop\Application\Model\Order;
use OxidEsales\Eshop\Application\Model\User;
use OxidEsales\Eshop\Core\Config;
use OxidEsales\Eshop\Core\Registry;
class Configuration
{

1
src/Application/Model/Exceptions/successfullySentException.php
View File

@ -18,7 +18,6 @@ namespace D3\Linkmobility4OXID\Application\Model\Exceptions;
use Exception;
use OxidEsales\Eshop\Core\Exception\StandardException;
use OxidEsales\Eshop\Core\Language;
use OxidEsales\Eshop\Core\Registry;
class successfullySentException extends StandardException
{

7
src/Application/Model/MessageTypes/Sms.php
View File

@ -183,9 +183,8 @@ class Sms extends AbstractMessage
protected function getRequest(Configuration $configuration, Client $client): SmsRequestInterface
{
$requestFactory = $this->getRequestFactory($this->getMessage(), $client);
$sender = $this->getSender($configuration->getSmsSenderNumber(), $configuration->getSmsSenderCountry());
$sender = $this->getSender((string) $configuration->getSmsSenderNumber(), (string) $configuration->getSmsSenderCountry());
/** @var SmsRequestInterface $request */
$request = $requestFactory->getSmsRequest();
$request->setTestMode($configuration->getTestMode())->setMethod(RequestInterface::METHOD_POST)
->setSenderAddress($sender)
@ -221,6 +220,8 @@ class Sms extends AbstractMessage
* @return ResponseInterface
* @throws ApiException
* @throws GuzzleException
* @throws NumberParseException
* @throws RecipientException
*/
protected function submitMessage(RecipientsListInterface $recipientsList): ResponseInterface
{
@ -257,7 +258,7 @@ class Sms extends AbstractMessage
/**
* @return LoggerInterface
*/
public function getLogger()
public function getLogger(): LoggerInterface
{
return Registry::getLogger();
}

2
src/Application/Model/OrderRecipients.php
View File

@ -70,7 +70,7 @@ class OrderRecipients
/** @var string $countryId */
$countryId = $this->order->getFieldData(trim($countryIdFieldName));
$country->load($countryId);
return $this->getRecipient($content, $country->getFieldData('oxisoalpha2'));
return $this->getRecipient($content, (string) $country->getFieldData('oxisoalpha2'));
}
} catch (NumberParseException|RecipientException $e) {
/** @var LoggerHandler $loggerHandler */

2
src/Application/Model/RequestFactory.php
View File

@ -40,7 +40,7 @@ class RequestFactory extends \D3\LinkmobilityClient\SMS\RequestFactory
/** @var SmsRequestInterface $request */
$request = $this->d3CallMockableFunction([\D3\LinkmobilityClient\SMS\RequestFactory::class, 'getSmsRequest']);
$sender = $this->getSender($configuration->getSmsSenderNumber(), $configuration->getSmsSenderCountry());
$sender = $this->getSender((string) $configuration->getSmsSenderNumber(), (string) $configuration->getSmsSenderCountry());
$request->setTestMode($configuration->getTestMode())
->setSenderAddress($sender)
->setSenderAddressType(RequestInterface::SENDERADDRESSTYPE_INTERNATIONAL);

2
src/Application/Model/UserRecipients.php
View File

@ -70,7 +70,7 @@ class UserRecipients
/** @var string $countryId */
$countryId = $this->user->getFieldData('oxcountryid');
$country->load($countryId);
return $this->getRecipient($content, $country->getFieldData('oxisoalpha2'));
return $this->getRecipient($content, (string) $country->getFieldData('oxisoalpha2'));
}
} catch (NumberParseException|RecipientException $e) {
/** @var LoggerHandler $loggerHandler */

2
src/Modules/Application/Model/OrderModel.php
View File

@ -17,6 +17,7 @@ namespace D3\Linkmobility4OXID\Modules\Application\Model;
use D3\Linkmobility4OXID\Modules\Core\EmailCore;
use D3\TestingTools\Production\IsMockable;
use Exception;
use OxidEsales\Eshop\Core\Email;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
@ -29,6 +30,7 @@ class OrderModel extends OrderModel_parent
* @return void
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function cancelOrder(): void
{

2
src/Modules/Core/EmailCore.php
View File

@ -43,6 +43,7 @@ class EmailCore extends EmailCore_parent
* @return bool
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function sendOrderEmailToUser($order, $subject = null)
{
@ -62,6 +63,7 @@ class EmailCore extends EmailCore_parent
* @return bool
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @throws Exception
*/
public function sendSendedNowMail($order, $subject = null)
{

24
src/Setup/Actions.php
View File

@ -194,15 +194,16 @@ class Actions
}
/**
* @param $checkIdent
* @param string $checkIdent
* @return bool
* @throws DoctrineDriverException
* @throws DoctrineException
*/
protected function cmsMissing($checkIdent): bool
protected function cmsMissing(string $checkIdent): bool
{
/** @var QueryBuilder $qb */
$qb = $this->getContainer()->get(QueryBuilderFactoryInterface::class)->create();
/** @var QueryBuilderFactory $queryBuilderFactory */
$queryBuilderFactory = $this->getContainer()->get(QueryBuilderFactoryInterface::class);
$qb = $queryBuilderFactory->create();
$qb->select('count(oxid)')
->from(oxNew(Content::class)->getViewName())
->where(
@ -232,8 +233,9 @@ class Actions
*/
protected function addCms1Item()
{
/** @var QueryBuilder $qb */
$qb = $this->getContainer()->get(QueryBuilderFactoryInterface::class)->create();
/** @var QueryBuilderFactory $queryBuilderFactory */
$queryBuilderFactory = $this->getContainer()->get(QueryBuilderFactoryInterface::class);
$qb = $queryBuilderFactory->create();
$qb->insert('oxcontents')
->values([
'oxid' => 'MD5(CONCAT('.$qb->createNamedParameter(__FUNCTION__).', NOW()))',
@ -261,8 +263,9 @@ class Actions
*/
protected function addCms2Item()
{
/** @var QueryBuilder $qb */
$qb = $this->getContainer()->get(QueryBuilderFactoryInterface::class)->create();
/** @var QueryBuilderFactory $queryBuilderFactory */
$queryBuilderFactory = $this->getContainer()->get(QueryBuilderFactoryInterface::class);
$qb = $queryBuilderFactory->create();
$qb->insert('oxcontents')
->values([
'oxid' => 'MD5(CONCAT('.$qb->createNamedParameter(__FUNCTION__).', NOW()))',
@ -290,8 +293,9 @@ class Actions
*/
protected function addCms3Item()
{
/** @var QueryBuilder $qb */
$qb = $this->getContainer()->get(QueryBuilderFactoryInterface::class)->create();
/** @var QueryBuilderFactory $queryBuilderFactory */
$queryBuilderFactory = $this->getContainer()->get(QueryBuilderFactoryInterface::class);
$qb = $queryBuilderFactory->create();
$qb->insert('oxcontents')
->values([
'oxid' => 'MD5(CONCAT('.$qb->createNamedParameter(__FUNCTION__).', NOW()))',

7
src/Setup/Events.php
View File

@ -17,13 +17,6 @@ declare(strict_types=1);
namespace D3\Linkmobility4OXID\Setup;
use D3\ModCfg\Application\Model\Exception\d3ShopCompatibilityAdapterException;
use D3\ModCfg\Application\Model\Install\d3install;
use Doctrine\DBAL\DBALException;
use OxidEsales\Eshop\Core\Exception\DatabaseConnectionException;
use OxidEsales\Eshop\Core\Exception\DatabaseErrorException;
use OxidEsales\Eshop\Core\Exception\StandardException;
use OxidEsales\Eshop\Core\Exception\SystemComponentException;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;

1
src/tests/additional.inc.php
View File

@ -16,7 +16,6 @@ declare(strict_types=1);
namespace D3\Linkmobility4OXID\tests;
use D3\ModCfg\Tests\additional_abstract;
use OxidEsales\Eshop\Core\Exception\StandardException;
class additional extends additional_abstract
{

2
src/tests/integration/canceledOrderTest.php
View File

@ -16,7 +16,6 @@ declare(strict_types=1);
namespace D3\Linkmobility4OXID\tests\integration;
use D3\Linkmobility4OXID\Application\Model\Configuration;
use D3\Linkmobility4OXID\Modules\Core\EmailCore;
use Doctrine\DBAL\Exception as DoctrineException;
use Doctrine\DBAL\Query\QueryBuilder;
use Exception;
@ -27,7 +26,6 @@ use GuzzleHttp\Psr7\Response;
use OxidEsales\Eshop\Application\Model\Order;
use OxidEsales\Eshop\Application\Model\Remark;
use OxidEsales\Eshop\Application\Model\User;
use OxidEsales\Eshop\Core\Email;
use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
use PHPUnit\Framework\MockObject\MockObject;

1
src/tests/integration/finishedOrderTest.php
View File

@ -35,7 +35,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Psr\Http\Message\RequestInterface;
use Spipu\Html2Pdf\Tag\Html\Em;
class finishedOrderTest extends LMIntegrationTestCase
{

1
src/tests/unit/Application/Controller/Admin/AdminOrderTest.php
View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace D3\Linkmobility4OXID\tests\unit\Application\Controller\Admin;
use D3\DIContainerHandler\d3DicHandler;
use D3\Linkmobility4OXID\Application\Controller\Admin\AdminOrder;
use D3\Linkmobility4OXID\Application\Model\Exceptions\successfullySentException;
use D3\Linkmobility4OXID\Application\Model\MessageTypes\Sms;

2
src/tests/unit/Application/Controller/Admin/AdminSend.php
View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace D3\Linkmobility4OXID\tests\unit\Application\Controller\Admin;
use D3\DIContainerHandler\d3DicHandler;
use D3\Linkmobility4OXID\Application\Controller\Admin\AdminOrder;
use D3\Linkmobility4OXID\Application\Controller\Admin\AdminUser;
use D3\Linkmobility4OXID\Application\Model\Exceptions\noRecipientFoundException;
@ -28,7 +27,6 @@ use D3\LinkmobilityClient\SMS\Response;
use D3\LinkmobilityClient\ValueObject\Recipient;
use D3\TestingTools\Development\CanAccessRestricted;
use InvalidArgumentException;
use OxidEsales\Eshop\Core\Registry;
use OxidEsales\Eshop\Core\Request;
use OxidEsales\Eshop\Core\UtilsView;
use PHPUnit\Framework\MockObject\MockObject;

1
src/tests/unit/Application/Controller/Admin/AdminUserTest.php
View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace D3\Linkmobility4OXID\tests\unit\Application\Controller\Admin;
use D3\DIContainerHandler\d3DicHandler;
use D3\Linkmobility4OXID\Application\Controller\Admin\AdminUser;
use D3\Linkmobility4OXID\Application\Model\Exceptions\successfullySentException;
use D3\Linkmobility4OXID\Application\Model\MessageTypes\Sms;

1
src/tests/unit/Application/Model/ConfigurationTest.php
View File

@ -88,6 +88,7 @@ class ConfigurationTest extends LMUnitTestCase
/**
* @test
* @param $testMode
* @param $expected
* @return void
* @throws ReflectionException
* @dataProvider trueFalseDataProvider

1
src/tests/unit/Application/Model/MessageSenderTest.php
View File

@ -21,7 +21,6 @@ use D3\Linkmobility4OXID\Application\Model\MessageSender;
use D3\Linkmobility4OXID\Application\Model\MessageTypes\Sms;
use D3\Linkmobility4OXID\tests\unit\LMUnitTestCase;
use D3\TestingTools\Development\CanAccessRestricted;
use Hoa\Iterator\Mock;
use OxidEsales\Eshop\Application\Model\Order;
use PHPUnit\Framework\MockObject\MockObject;
use ReflectionException;

2
src/tests/unit/LMUnitTestCase.php
View File

@ -45,7 +45,7 @@ abstract class LMUnitTestCase extends UnitTestCase
*
* @return MockObject
*/
protected function getContainerMock($serviceName, $serviceMock)
protected function getContainerMock($serviceName, $serviceMock): MockObject
{
$container = $this->getMockBuilder(ContainerInterface::class)
->onlyMethods(['get', 'has'])