adjust README

add support note
2022-09-28 15:57:38 +02:00 · 2022-09-08 15:46:46 +02:00
32 changed files with 183 additions and 334 deletions
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@ -6,7 +6,7 @@ $finder = PhpCsFixer\Finder::create()

 $config = new PhpCsFixer\Config();
 return $config->setRules([
-        '@PHP73Migration' => true,
+        '@PHP70Migration' => true,
        '@PSR12' => true
    ])
    ->setFinder($finder)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,22 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-## [Unreleased](https://git.d3data.de/D3Private/linkmobility-php-client/compare/2.0.1...rel_2.x)
-
-## [2.0.1](https://git.d3data.de/D3Private/linkmobility-php-client/compare/2.0.0...2.0.1) - 2022-07-28
-### Added
- phpstan code checks
+## [Unreleased](https://git.d3data.de/D3Private/linkmobility-php-client/compare/1.3.2...rel_1.x)

+## [1.3.2](https://git.d3data.de/D3Private/linkmobility-php-client/compare/1.3.1...1.3.2) - 2022-07-28
 ### Changed
- improve changelog
- improve code quality
-
-### Fixed
- wrong return type of LoggerHandler::getInstance
-
-## [2.0.0](https://git.d3data.de/D3Private/linkmobility-php-client/compare/1.3.0...2.0.0) - 2022-07-19
-### Changed
- adjust to PHP >= 7.3 and current dependency packages
+- add support note
+- adjust readme

 ## [1.3.1](https://git.d3data.de/D3Private/linkmobility-php-client/compare/1.3.0...1.3.1) - 2022-07-28
 ### Changed
--- a/README.en.md
+++ b/README.en.md
@ -1,7 +1,7 @@
 [![deutsche Version](https://logos.oxidmodule.com/de2_xs.svg)](README.md)
 [![english version](https://logos.oxidmodule.com/en2_xs.svg)](README.en.md)

-# LINK Mobility Austria PHP API Client
+# LINK Mobility PHP API Client

 [LINK Mobility](https://www.linkmobility.de/) provides a service for sending mobile messages (SMS, Whatsapp, RCS, Chatbot, ...).

--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 [![deutsche Version](https://logos.oxidmodule.com/de2_xs.svg)](README.md)
 [![english version](https://logos.oxidmodule.com/en2_xs.svg)](README.en.md)

-# LINK Mobility Austria PHP API Client
+# LINK Mobility PHP API Client

 [LINK Mobility](https://www.linkmobility.de/) stellt einen Service zum Versenden von mobilen Nachrichten (SMS, Whatsapp, RCS, Chatbot, ...) zur Verfügung.

--- a/Tests/ClientTest.php
+++ b/Tests/ClientTest.php
@ -96,7 +96,7 @@ class ClientTest extends ApiTestCase
        return [
            'api key only'  => ['apiKey', null, null],
            'all without client'  => ['apiKey', new Url(), null],
-            'all arguments'  => ['apiKey', new Url(), new GuzzleClient()],
+            'all arguments'  => ['apiKey', new Url(), new GuzzleClient()]
        ];
    }

@ -167,7 +167,7 @@ class ClientTest extends ApiTestCase
    {
        return [
            'request is valid'      => [true],
-            'request is not valid'  => [false],
+            'request is not valid'  => [false]
        ];
    }

@ -203,7 +203,7 @@ class ClientTest extends ApiTestCase
                'withHeader',
                'withAddedHeader',
                'withoutHeader',
-                'withBody',
+                'withBody'
            ])
            ->disableOriginalConstructor()
            ->getMock();
@ -232,7 +232,7 @@ class ClientTest extends ApiTestCase
        $clientMock = $this->getMockBuilder(Client::class)
            ->disableOriginalConstructor()
            ->onlyMethods([
-                'getLoggerHandler',
+                'getLoggerHandler'
            ])
            ->getMock();
        $clientMock->expects($this->atLeastOnce())
--- a/Tests/RecipientsList/RecipientsListTest.php
+++ b/Tests/RecipientsList/RecipientsListTest.php
@ -167,7 +167,7 @@ class RecipientsListTest extends ApiTestCase
        $this->assertSame(
            [
                $this->phoneNumberFixture,
-                $this->phoneNumberFixture,
+                $this->phoneNumberFixture
            ],
            $this->callMethod(
                $this->recipientsList,
@ -280,7 +280,7 @@ class RecipientsListTest extends ApiTestCase
            $this->recipientsList,
            'recipients',
            [
-                'fixture' => new stdClass(),
+                'fixture' => new stdClass()
            ]
        );

@ -333,11 +333,11 @@ class RecipientsListTest extends ApiTestCase
        $recipientMock = $this->getMockBuilder(Recipient::class)
            ->onlyMethods([
                'get',
-                'getCountryCode',
+                'getCountryCode'
            ])
            ->setConstructorArgs([
                $this->phoneNumberFixture,
-                $this->phoneCountryFixture,
+                $this->phoneCountryFixture
            ])
            ->getMock();
        $recipientMock->method('get')->willReturn($this->phoneNumberFixture);
@ -347,11 +347,11 @@ class RecipientsListTest extends ApiTestCase
        $recipientMock2 = $this->getMockBuilder(Recipient::class)
            ->onlyMethods([
                'get',
-                'getCountryCode',
+                'getCountryCode'
            ])
            ->setConstructorArgs([
                $this->phoneNumberFixture,
-                $this->phoneCountryFixture,
+                $this->phoneCountryFixture
            ])
            ->getMock();
        $recipientMock2->method('get')->willReturn($this->phoneNumberFixture);
@ -359,7 +359,7 @@ class RecipientsListTest extends ApiTestCase

        $list = [
            'fixture' => $recipientMock,
-            'fixture2' => $recipientMock2,
+            'fixture2' => $recipientMock2
        ];

        $this->setValue(
--- a/Tests/Request/AbstractRequest.php
+++ b/Tests/Request/AbstractRequest.php
@ -17,7 +17,6 @@ namespace D3\LinkmobilityClient\Tests\Request;

 use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
-use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\RecipientsList\RecipientsListInterface;
 use D3\LinkmobilityClient\Request\Request;
 use D3\LinkmobilityClient\Request\RequestInterface;
@ -25,7 +24,6 @@ use D3\LinkmobilityClient\SMS\Response;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Recipient;
 use D3\LinkmobilityClient\ValueObject\Sender;
-use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
@ -89,10 +87,13 @@ abstract class AbstractRequest extends ApiTestCase
        $requestMock->expects($this->atLeastOnce())->method('setMessage')->with($this->equalTo($messageMock))->willReturnSelf();
        $requestMock->expects($this->atLeastOnce())->method('setClient')->with($this->equalTo($clientMock))->willReturnSelf();

-        $this->callMethod(
-            $requestMock,
-            '__construct',
-            [$messageMock, $clientMock]
+        $this->assertInstanceOf(
+            Request::class,
+            $this->callMethod(
+                $requestMock,
+                '__construct',
+                [$messageMock, $clientMock]
+            )
        );
    }

@ -114,13 +115,10 @@ abstract class AbstractRequest extends ApiTestCase

    /**
     * @test
+     * @throws ReflectionException
     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::validate
     * @covers \D3\LinkmobilityClient\SMS\TextRequest::validate
     * @covers \D3\LinkmobilityClient\Request\Request::validate
-     * @return void
-     * @throws ReflectionException
-     * @throws RecipientException
-     * @throws NumberParseException
     */
    public function validatePassedTest()
    {
@ -151,12 +149,9 @@ abstract class AbstractRequest extends ApiTestCase

    /**
     * @test
+     * @throws ReflectionException
     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::validate
     * @covers \D3\LinkmobilityClient\SMS\TextRequest::validate
-     * @return void
-     * @throws NumberParseException
-     * @throws RecipientException
-     * @throws ReflectionException
     */
    public function validateFailedTest()
    {
@ -258,17 +253,17 @@ abstract class AbstractRequest extends ApiTestCase
                ['json' => [
                    'contentCategory' => 'informational',
                    'messageContent' => 'messageContent',
-                    'priority' => 0,
-                    ]],
+                    'priority' => 0
+                    ]]
            ],
            'other' => [
                'other',
                [
                    'contentCategory' => 'informational',
                    'messageContent' => 'messageContent',
-                    'priority' => 0,
-                ],
-            ],
+                    'priority' => 0
+                ]
+            ]
        ];
    }

@ -289,20 +284,20 @@ abstract class AbstractRequest extends ApiTestCase
            ['json' => [
                'contentCategory' => 'informational',
                'messageContent' => 'messageContent',
-                'priority' => 0,
+                'priority' => 0
            ]]
        );

        $this->assertSame(
            ['headers' => [
                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
+                'Content-Type' => 'application/json'
            ],
            'json' => [
                'contentCategory' => 'informational',
                'messageContent' => 'messageContent',
-                'priority' => 0,
-            ], ],
+                'priority' => 0
+            ]],
            $this->callMethod(
                $requestMock,
                'getOptions'
@ -676,7 +671,7 @@ abstract class AbstractRequest extends ApiTestCase
        /** @var StreamInterface|MockObject $streamMock */
        $streamMock = $this->getMockBuilder(StreamInterface::class)
            ->onlyMethods(['getContents', '__toString', 'close', 'detach', 'getSize', 'tell', 'eof', 'isSeekable',
-                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata', ])
+                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata'])
            ->getMock();
        $streamMock->method('getContents')->willReturn('{}');

@ -685,12 +680,12 @@ abstract class AbstractRequest extends ApiTestCase
            ->onlyMethods([
                'getBody', 'getStatusCode', 'withStatus', 'getReasonphrase', 'getProtocolVersion',
                'withProtocolVersion', 'getHeaders', 'hasHeader', 'getHeader', 'getHeaderLine',
-                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody', ])
+                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody'])
            ->getMock();
        $rawResponseMock->method('getBody')->willReturn($streamMock);

        return [
-            'SMS Response'  => [$rawResponseMock],
+            'SMS Response'  => [$rawResponseMock]
        ];
    }

--- a/Tests/Response/AbstractResponse.php
+++ b/Tests/Response/AbstractResponse.php
@ -38,7 +38,7 @@ abstract class AbstractResponse extends ApiTestCase
        /** @var StreamInterface|MockObject $streamMock */
        $streamMock = $this->getMockBuilder(StreamInterface::class)
            ->onlyMethods(['getContents', '__toString', 'close', 'detach', 'getSize', 'tell', 'eof', 'isSeekable',
-                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata', ])
+                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata'])
            ->getMock();
        $streamMock->expects($this->atLeastOnce())->method('getContents')->willReturn(
            '{
@ -53,7 +53,7 @@ abstract class AbstractResponse extends ApiTestCase
            ->onlyMethods([
                'getBody', 'getStatusCode', 'withStatus', 'getReasonphrase', 'getProtocolVersion',
                'withProtocolVersion', 'getHeaders', 'hasHeader', 'getHeader', 'getHeaderLine',
-                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody', ])
+                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody'])
            ->getMock();
        $rawResponseMock->method('getBody')->willReturn($streamMock);

@ -86,7 +86,7 @@ abstract class AbstractResponse extends ApiTestCase
     */
    protected function checkProperties($expected, $propertyName, $methodName)
    {
-        /** @var Response|MockObject $responseMock */
+        /** @var Response $response */
        $responseMock = $this->getMockBuilder($this->testClassName)
            ->disableOriginalConstructor()
            ->onlyMethods(['getContent'])
@ -226,7 +226,7 @@ abstract class AbstractResponse extends ApiTestCase
    {
        return [
            'successful'    => [true, ''],
-            'not successful'=> [false, 'fixtureMessage'],
+            'not successful'=> [false, 'fixtureMessage']
        ];
    }
 }
--- a/Tests/SMS/RequestFactoryTest.php
+++ b/Tests/SMS/RequestFactoryTest.php
@ -100,8 +100,8 @@ class RequestFactoryTest extends ApiTestCase
    public function getTextSmsRequestDataProvider(): array
    {
        return [
-            'binary'    => [SmsLength::ENCODING_UCS2, BinaryRequest::class],
-            'ascii'     => [SmsLength::ENCODING_7BIT, TextRequest::class],
+            'binary'    => [RequestFactory::GSM_UCS2, BinaryRequest::class],
+            'ascii'     => [RequestFactory::GSM_7BIT, TextRequest::class]
        ];
    }

--- a/Tests/ValueObject/RecipientTest.php
+++ b/Tests/ValueObject/RecipientTest.php
@ -149,7 +149,7 @@ class RecipientTest extends ApiTestCase
    }

    /**
-     * @return array[]
+     * @return string[][]
     */
    public function constructInvalidDataProvider(): array
    {
@ -162,7 +162,7 @@ class RecipientTest extends ApiTestCase
            'invalid country code'  => [$phoneNumberFixture, 'DEX', true, PhoneNumberType::MOBILE, InvalidArgumentException::class],
            'unparsable'            => ['abc', 'DE', true, PhoneNumberType::MOBILE, NumberParseException::class],
            'invalid number'        => ['abcd', 'DE', false, PhoneNumberType::MOBILE, RecipientException::class],
-            'not mobile number'     => ['abcd', 'DE', true, PhoneNumberType::FIXED_LINE, RecipientException::class],
+            'not mobile number'     => ['abcd', 'DE', true, PhoneNumberType::FIXED_LINE, RecipientException::class]
        ];
    }

--- a/Tests/ValueObject/SenderTest.php
+++ b/Tests/ValueObject/SenderTest.php
@ -16,6 +16,7 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\Tests\ValueObject;

 use Assert\InvalidArgumentException;
+use D3\LinkmobilityClient\Exceptions\NoSenderDefinedException;
 use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Sender;
@ -29,7 +30,7 @@ use ReflectionException;

 class SenderTest extends ApiTestCase
 {
-    /** @var Sender|MockObject */
+    /** @var Sender */
    public $sender;

    private $phoneNumberFixture;
@ -48,6 +49,7 @@ class SenderTest extends ApiTestCase
        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);

+        /** @var Sender|MockObject sender */
        $this->sender = new Sender($this->phoneNumberFixture, $this->phoneCountryFixture);
    }

@ -110,7 +112,7 @@ class SenderTest extends ApiTestCase
        return [
            'null number'           => [null, $this->phoneCountryFixture, false],
            'null country'          => [$this->phoneNumberFixture, null, false],
-            'all values'            => [$this->phoneNumberFixture, $this->phoneCountryFixture, true],
+            'all values'            => [$this->phoneNumberFixture, $this->phoneCountryFixture, true]
        ];
    }

@ -120,9 +122,11 @@ class SenderTest extends ApiTestCase
     * @param $country
     * @param $validNumber
     * @param $expectedException
-     * @throws ReflectionException
+     *
+     * @throws NumberParseException
+     * @throws RecipientException
     * @dataProvider constructInvalidDataProvider
-     * @covers       \D3\LinkmobilityClient\ValueObject\Sender::__construct
+     * @covers \D3\LinkmobilityClient\ValueObject\Sender::__construct
     */
    public function testConstructInvalid($number, $country, $validNumber, $expectedException)
    {
@ -158,7 +162,7 @@ class SenderTest extends ApiTestCase
    }

    /**
-     * @return array[]
+     * @return string[][]
     */
    public function constructInvalidDataProvider(): array
    {
@ -170,7 +174,7 @@ class SenderTest extends ApiTestCase
            'empty number'          => ['', 'DE', true, InvalidArgumentException::class],
            'invalid country code'  => [$phoneNumberFixture, 'DEX', true, InvalidArgumentException::class],
            'unparsable'            => ['abc', 'DE', true, NumberParseException::class],
-            'invalid number'        => ['abcd', 'DE', false, RecipientException::class],
+            'invalid number'        => ['abcd', 'DE', false, RecipientException::class]
        ];
    }

--- a/Tests/ValueObject/SmsBinaryMessageTest.php
+++ b/Tests/ValueObject/SmsBinaryMessageTest.php
@ -22,7 +22,7 @@ use Phlib\SmsLength\SmsLength;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;

-class SmsBinaryMessageTest extends SmsMessageAbstractTest
+class SmsBinaryMessageTest extends ApiTestCase
 {
    /** @var SmsBinaryMessage */
    public $message;
@ -39,12 +39,21 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
        $this->message = new SmsBinaryMessage($this->messageFixture);
    }

+    /**
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        parent::tearDown();
+
+        unset($this->message);
+    }
+
    /**
     * @test
     * @return void
     * @throws ReflectionException
     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
     */
    public function testConstructValid()
    {
@ -82,7 +91,6 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
     * @throws ReflectionException
     * @dataProvider constructInvalidDataProvider
     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
     */
    public function testConstructInvalid($binaryMessage, $valid, $expectedException)
    {
@ -116,11 +124,37 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
        );
    }

+    /**
+     * @return string[][]
+     */
+    public function constructInvalidDataProvider(): array
+    {
+        return [
+            'empty message'          => ['', true, InvalidArgumentException::class],
+            'invalid sms message'    => ['abc', false, \Phlib\SmsLength\Exception\InvalidArgumentException::class]
+        ];
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
+     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::getSmsLength
+     */
+    public function testGetSmsLengthInstance()
+    {
+        $this->assertInstanceOf(
+            SmsLength::class,
+            $this->callMethod(
+                $this->message,
+                'getSmsLength'
+            )
+        );
+    }
+
    /**
     * @test
     * @throws ReflectionException
     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::chunkCount
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::chunkCount
     */
    public function testGetChunkCount()
    {
@ -136,9 +170,9 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest

        /** @var SmsBinaryMessage|MockObject $message */
        $message = $this->getMockBuilder(SmsBinaryMessage::class)
-            ->onlyMethods(['getSmsLength'])
-            ->disableOriginalConstructor()
-            ->getMock();
+                        ->onlyMethods(['getSmsLength'])
+                        ->disableOriginalConstructor()
+                        ->getMock();
        $message->method('getSmsLength')->willReturn($smsLengthMock);

        $this->assertSame(
@ -154,7 +188,6 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
     * @test
     * @throws ReflectionException
     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::length
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::length
     */
    public function testGetSize()
    {
--- a/Tests/ValueObject/SmsMessageAbstractTest.php
+++ b/Tests/ValueObject/SmsMessageAbstractTest.php
@ -1,66 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\LinkmobilityClient\Tests\ValueObject;
-
-use Assert\InvalidArgumentException;
-use D3\LinkmobilityClient\Tests\ApiTestCase;
-use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
-use Phlib\SmsLength\SmsLength;
-use PHPUnit\Framework\MockObject\MockObject;
-use ReflectionException;
-
-abstract class SmsMessageAbstractTest extends ApiTestCase
-{
-    public $message;
-
-    /**
-     * @return void
-     */
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        unset($this->message);
-    }
-
-    /**
-     * @return array[]
-     */
-    public function constructInvalidDataProvider(): array
-    {
-        return [
-            'empty message'          => ['', true, InvalidArgumentException::class],
-            'invalid sms message'    => ['abc', false, \Phlib\SmsLength\Exception\InvalidArgumentException::class],
-        ];
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::getSmsLength
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::getSmsLength
-     */
-    public function testGetSmsLengthInstance()
-    {
-        $this->assertInstanceOf(
-            SmsLength::class,
-            $this->callMethod(
-                $this->message,
-                'getSmsLength'
-            )
-        );
-    }
-}
--- a/Tests/ValueObject/SmsTextMessageTest.php
+++ b/Tests/ValueObject/SmsTextMessageTest.php
@ -21,7 +21,7 @@ use Phlib\SmsLength\SmsLength;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;

-class SmsTextMessageTest extends SmsMessageAbstractTest
+class SmsTextMessageTest extends SmsBinaryMessageTest
 {
    /** @var SmsTextMessage */
    public $message;
@ -43,7 +43,6 @@ class SmsTextMessageTest extends SmsMessageAbstractTest
     * @return void
     * @throws ReflectionException
     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
     */
    public function testConstructValid()
    {
@ -81,7 +80,6 @@ class SmsTextMessageTest extends SmsMessageAbstractTest
     * @throws ReflectionException
     * @dataProvider constructInvalidDataProvider
     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
     */
    public function testConstructInvalid($binaryMessage, $valid, $expectedException)
    {
@ -114,104 +112,4 @@ class SmsTextMessageTest extends SmsMessageAbstractTest
            )
        );
    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::chunkCount
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::chunkCount
-     */
-    public function testGetChunkCount()
-    {
-        $expected = 2;
-
-        /** @var SmsLength|MockObject $smsLengthMock */
-        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
-            ->onlyMethods(['getMessageCount', 'validate'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $smsLengthMock->expects($this->once())->method('getMessageCount')->willReturn($expected);
-        $smsLengthMock->method('validate')->willReturn(true);
-
-        /** @var SmsTextMessage|MockObject $message */
-        $message = $this->getMockBuilder(SmsTextMessage::class)
-            ->onlyMethods(['getSmsLength'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $message->method('getSmsLength')->willReturn($smsLengthMock);
-
-        $this->assertSame(
-            $expected,
-            $this->callMethod(
-                $message,
-                'chunkCount'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::length
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::length
-     */
-    public function testGetSize()
-    {
-        $expected = 55;
-
-        /** @var SmsLength|MockObject $smsLengthMock */
-        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
-            ->onlyMethods(['getSize', 'validate'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $smsLengthMock->expects($this->once())->method('getSize')->willReturn($expected);
-        $smsLengthMock->method('validate')->willReturn(true);
-
-        /** @var SmsTextMessage|MockObject $message */
-        $message = $this->getMockBuilder(SmsTextMessage::class)
-            ->onlyMethods(['getSmsLength'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $message->method('getSmsLength')->willReturn($smsLengthMock);
-
-        $this->assertSame(
-            $expected,
-            $this->callMethod(
-                $message,
-                'length'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::getMessageContent
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::getMessageContent
-     */
-    public function testGetMessageContent()
-    {
-        /** @var SmsLength|MockObject $smsLengthMock */
-        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
-            ->onlyMethods(['validate'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $smsLengthMock->method('validate')->willReturn(true);
-
-        /** @var SmsTextMessage|MockObject $message */
-        $message = $this->getMockBuilder(SmsTextMessage::class)
-            ->onlyMethods(['getSmsLength'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $message->method('getSmsLength')->willReturn($smsLengthMock);
-        $message->__construct($this->messageFixture);
-
-        $this->assertSame(
-            'testMessage',
-            $this->callMethod(
-                $message,
-                'getMessageContent'
-            )
-        );
-    }
 }
--- a/Tests/ValueObject/ValueObjectTest.php
+++ b/Tests/ValueObject/ValueObjectTest.php
@ -16,8 +16,13 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\Tests\ValueObject;

 use Assert\InvalidArgumentException;
+use D3\LinkmobilityClient\Exceptions\NoSenderDefinedException;
+use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
+use D3\LinkmobilityClient\ValueObject\Sender;
 use D3\LinkmobilityClient\ValueObject\ValueObject;
+use libphonenumber\NumberParseException;
+use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
@ -26,13 +31,11 @@ use ReflectionException;

 class ValueObjectTest extends ApiTestCase
 {
-    /** @var ValueObject|MockObject */
-    public $value;
-
    public function setUp(): void
    {
        parent::setUp();

+        /** @var ValueObject|MockObject value */
        $this->value = $this->getMockBuilder(ValueObject::class)
            ->disableOriginalConstructor()
            ->getMock();
--- a/composer.json
+++ b/composer.json
@ -1,7 +1,7 @@
 {
    "name": "d3/linkmobility-php-client",
    "type": "library",
-    "description": "PHP client for LINK Mobility Austria API",
+    "description": "PHP client for LINK Mobility API",
    "keywords": [
        "LINK Mobility",
        "php",
@ -21,19 +21,18 @@
      "GPL-3.0-or-later"
    ],
    "require": {
-        "php": "^7.3 || ~8.0.3",
-        "beberlei/assert": "^3.3",
-        "guzzlehttp/guzzle": "^7.4",
+        "php": "^7.0 || ^8.0",
+        "beberlei/assert": "^2.9.9",
+        "guzzlehttp/guzzle": "~6.2 || ^7.4",
        "psr/http-message": "~1.0",
-        "phlib/sms-length": "^2.0",
+        "phlib/sms-length": "^1.1.0 || ^2.0.0",
        "giggsey/libphonenumber-for-php": "^8.12.50",
        "ext-json": "*"
    },
    "require-dev": {
-        "php": "^7.4 || ~8.0.3",
-        "phpunit/phpunit" : "^9.5",
-        "friendsofphp/php-cs-fixer": "^3.9",
-        "phpstan/phpstan": "^1.8"
+        "php": "^7.2",
+        "phpunit/phpunit" : "^8.0",
+        "friendsofphp/php-cs-fixer": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -42,9 +41,8 @@
        }
    },
    "scripts": {
-        "test": "./vendor/bin/phpunit",
+        "test": "phpunit",
        "check-style": "./vendor/bin/php-cs-fixer fix --verbose --dry-run",
-        "fix-style": "./vendor/bin/php-cs-fixer fix --verbose",
-        "check-code": "./vendor/bin/phpstan analyse -c phpstan.neon --no-progress --ansi"
+        "fix-style": "./vendor/bin/php-cs-fixer fix --verbose"
    }
 }
--- a/phpstan.neon
+++ b/phpstan.neon
@ -1,6 +0,0 @@
-parameters:
-    paths:
-        - src
-        - Tests
-    level: 5
-    phpVersion: 70300
--- a/phpunit.xml
+++ b/phpunit.xml
@ -1,20 +1,22 @@
-<?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="vendor/autoload.php"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <report>
-      <clover outputFile="build/logs/clover.xml"/>
-    </report>
-  </coverage>
-  <testsuite name="linkmobility">
-    <directory>./Tests</directory>
-  </testsuite>
-  <logging/>
+
+<phpunit
+    bootstrap="vendor/autoload.php"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true">
+
+    <testsuite name="linkmobility">
+        <directory>./Tests</directory>
+    </testsuite>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+
 </phpunit>
--- a/src/LoggerHandler.php
+++ b/src/LoggerHandler.php
@ -42,7 +42,7 @@ class LoggerHandler
    }

    /**
-     * @param LoggerInterface $logger
+     * @param mixed $logger
     */
    public function setLogger(LoggerInterface $logger)
    {
--- a/src/Request/Request.php
+++ b/src/Request/Request.php
@ -107,7 +107,7 @@ abstract class Request implements RequestInterface
    private $test = false;

    /**
-     * @var int
+     * @var bool
     */
    private $maxSmsPerMessage = 0;

@ -119,6 +119,8 @@ abstract class Request implements RequestInterface
        $this->recipientsList = new RecipientsList($client);
        $this->setMessage($message);
        $this->setClient($client);
+
+        return $this;
    }

    /**
@ -167,7 +169,7 @@ abstract class Request implements RequestInterface
            'senderAddress'     => $this->getSenderAddress() ? $this->getSenderAddress()->getFormatted() : null,
            'senderAddressType' => $this->getSenderAddressType(),
            'test'              => $this->getTestMode(),
-            'validityPeriode'   => $this->getValidityPeriode(),
+            'validityPeriode'   => $this->getValidityPeriode()
        ];
    }

@ -198,18 +200,18 @@ abstract class Request implements RequestInterface
                'headers' => [
                    'Accept'            => $this->contentType,
                    'Content-Type'      => $this->contentType,
-                ],
+                ]
            ],
            $this->getBody()
        );
    }

    /**
-     * @param SmsMessageInterface $message
+     * @param StringValueObject $message
     *
     * @return $this
     */
-    public function setMessage(SmsMessageInterface $message): Request
+    public function setMessage(StringValueObject $message): Request
    {
        $this->message = $message;

@ -278,7 +280,7 @@ abstract class Request implements RequestInterface
        return $this;
    }

-    public function getClientMessageId(): ?string
+    public function getClientMessageId()
    {
        return $this->clientMessageId;
    }
@ -304,7 +306,7 @@ abstract class Request implements RequestInterface
    {
        return [
            RequestInterface::CONTENTCATEGORY_ADVERTISEMENT    => RequestInterface::CONTENTCATEGORY_ADVERTISEMENT,
-            RequestInterface::CONTENTCATEGORY_INFORMATIONAL    => RequestInterface::CONTENTCATEGORY_INFORMATIONAL,
+            RequestInterface::CONTENTCATEGORY_INFORMATIONAL    => RequestInterface::CONTENTCATEGORY_INFORMATIONAL
        ];
    }

@ -374,7 +376,7 @@ abstract class Request implements RequestInterface
    /**
     * @return string|null
     */
-    public function getNotificationCallbackUrl(): ?string
+    public function getNotificationCallbackUrl()
    {
        return $this->notificationCallbackUrl;
    }
@ -394,7 +396,7 @@ abstract class Request implements RequestInterface
    /**
     * @return int|null
     */
-    public function getPriority(): ?int
+    public function getPriority()
    {
        return $this->priority;
    }
@ -420,7 +422,7 @@ abstract class Request implements RequestInterface
    }

    /**
-     * @return bool
+     * @return bool|null
     */
    public function doSendAsFlashSms(): bool
    {
@ -442,7 +444,7 @@ abstract class Request implements RequestInterface
    /**
     * @return Sender|null
     */
-    public function getSenderAddress(): ?Sender
+    public function getSenderAddress()
    {
        return $this->senderAddress;
    }
@ -462,7 +464,7 @@ abstract class Request implements RequestInterface
    /**
     * @return string|null
     */
-    public function getSenderAddressType(): ?string
+    public function getSenderAddressType()
    {
        return $this->getSenderAddress() && $this->getSenderAddress()->get() ? $this->senderAddressType : null;
    }
@ -476,7 +478,7 @@ abstract class Request implements RequestInterface
            RequestInterface::SENDERADDRESSTYPE_ALPHANUMERIC    => RequestInterface::SENDERADDRESSTYPE_ALPHANUMERIC,
            RequestInterface::SENDERADDRESSTYPE_INTERNATIONAL   => RequestInterface::SENDERADDRESSTYPE_INTERNATIONAL,
            RequestInterface::SENDERADDRESSTYPE_NATIONAL        => RequestInterface::SENDERADDRESSTYPE_NATIONAL,
-            RequestInterface::SENDERADDRESSTYPE_SHORTCODE       => RequestInterface::SENDERADDRESSTYPE_SHORTCODE,
+            RequestInterface::SENDERADDRESSTYPE_SHORTCODE       => RequestInterface::SENDERADDRESSTYPE_SHORTCODE
        ];
    }

@ -495,7 +497,7 @@ abstract class Request implements RequestInterface
    /**
     * @return int|null
     */
-    public function getValidityPeriode(): ?int
+    public function getValidityPeriode()
    {
        return $this->validityPeriode;
    }
@ -521,7 +523,6 @@ abstract class Request implements RequestInterface

    /**
     * @param Client $client
-     * @return Request
     */
    public function setClient(Client $client): Request
    {
--- a/src/Response/Response.php
+++ b/src/Response/Response.php
@ -72,7 +72,7 @@ abstract class Response implements ResponseInterface
    /**
     * @return string|null
     */
-    public function getClientMessageId(): ?string
+    public function getClientMessageId()
    {
        return $this->getContent()[self::CLIENTMESSAGEID];
    }
@ -80,13 +80,13 @@ abstract class Response implements ResponseInterface
    /**
     * @return string|null
     */
-    public function getTransferId(): ?string
+    public function getTransferId()
    {
        return $this->getContent()[self::TRANSFERID];
    }

    /**
-     * @return int
+     * @return string|null
     */
    public function getSmsCount(): int
    {
--- a/src/SMS/BinaryRequest.php
+++ b/src/SMS/BinaryRequest.php
@ -36,7 +36,7 @@ class BinaryRequest extends Request implements SmsRequestInterface
        return array_merge(
            parent::getRawBody(),
            [
-                'userDataHeaderPresent' => true,
+                'userDataHeaderPresent' => true
            ]
        );
    }
--- a/src/SMS/RequestFactory.php
+++ b/src/SMS/RequestFactory.php
@ -20,15 +20,21 @@ use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
 use D3\LinkmobilityClient\ValueObject\SmsTextMessage;
 use Phlib\SmsLength\SmsLength;

-class RequestFactory implements RequestFactoryInterface
+class RequestFactory
 {
+    /**
+     * @deprecated is SmsLength constant from version 2.1
+     */
+    public const GSM_7BIT = '7-bit';
+
+    /**
+     * @deprecated is SmsLength constant from version 2.1
+     */
+    public const GSM_UCS2 = 'ucs-2';
+
    protected $message;
    protected $client;

-    /**
-     * @param $message
-     * @param Client $client
-     */
    public function __construct($message, Client $client)
    {
        $this->message = $message;
@ -40,7 +46,7 @@ class RequestFactory implements RequestFactoryInterface
     */
    public function getSmsRequest(): SmsRequestInterface
    {
-        if ($this->getSmsLength()->getEncoding() === SmsLength::ENCODING_7BIT) {
+        if ($this->getSmsLength()->getEncoding() === self::GSM_7BIT) {
            $message = new SmsTextMessage($this->message);
            return new TextRequest($message, $this->client);
        }
--- a/src/SMS/RequestFactoryInterface.php
+++ b/src/SMS/RequestFactoryInterface.php
@ -15,11 +15,9 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\SMS;

-use D3\LinkmobilityClient\Client;
-
 interface RequestFactoryInterface
 {
-    public function __construct($message, Client $client);
+    public function __construct($message);

-    public function getSmsRequest(): SmsRequestInterface;
+    public function getRequest(): SmsRequestInterface;
 }
--- a/src/SMS/Response.php
+++ b/src/SMS/Response.php
@ -15,8 +15,6 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\SMS;

-use D3\LinkmobilityClient\Response\Response as BaseResponse;
-
-class Response extends BaseResponse
+class Response extends \D3\LinkmobilityClient\Response\Response
 {
 }
--- a/src/Url/Url.php
+++ b/src/Url/Url.php
@ -30,7 +30,7 @@ class Url implements UrlInterface
    /**
     * @return string
     */
-    public function getTextSmsUri(): string
+    public function getTextSmsUri()
    {
        return '/rest/smsmessaging/text';
    }
@ -38,7 +38,7 @@ class Url implements UrlInterface
    /**
     * @return string
     */
-    public function getBinarySmsUri(): string
+    public function getBinarySmsUri()
    {
        return '/rest/smsmessaging/binary';
    }
--- a/src/Url/UrlInterface.php
+++ b/src/Url/UrlInterface.php
@ -18,8 +18,4 @@ namespace D3\LinkmobilityClient\Url;
 interface UrlInterface
 {
    public function getBaseUri(): string;
-
-    public function getTextSmsUri(): string;
-
-    public function getBinarySmsUri(): string;
 }
--- a/src/ValueObject/Recipient.php
+++ b/src/ValueObject/Recipient.php
@ -30,7 +30,7 @@ class Recipient extends StringValueObject
     */
    protected $allowedNumberTypes = [
        PhoneNumberType::MOBILE,
-        PhoneNumberType::FIXED_LINE_OR_MOBILE,
+        PhoneNumberType::FIXED_LINE_OR_MOBILE
    ];

    /**
@ -86,7 +86,7 @@ class Recipient extends StringValueObject
        return $this->countryCode;
    }

-    public function getFormatted(): string
+    public function getFormatted()
    {
        return ltrim(parent::getFormatted(), '+');
    }
--- a/src/ValueObject/Sender.php
+++ b/src/ValueObject/Sender.php
@ -27,11 +27,11 @@ use libphonenumber\PhoneNumberUtil;
 class Sender extends ValueObject
 {
    /**
-     * @param string|null $number
-     * @param string|null $iso2CountryCode
+     * @param string $number
+     * @param string $iso2CountryCode
     *
-     * @throws NumberParseException
     * @throws RecipientException
+     * @throws NumberParseException
     */
    public function __construct(string $number = null, string $iso2CountryCode = null)
    {
@ -67,7 +67,7 @@ class Sender extends ValueObject
        return PhoneNumberUtil::getInstance();
    }

-    public function getFormatted(): string
+    public function getFormatted()
    {
        return ltrim(parent::getFormatted(), '+');
    }
--- a/src/ValueObject/SmsMessageAbstract.php
+++ b/src/ValueObject/SmsMessageAbstract.php
@ -43,9 +43,6 @@ abstract class SmsMessageAbstract extends StringValueObject implements SmsMessag
        return $this->getSmsLength()->getSize();
    }

-    /**
-     * @return mixed
-     */
    public function getMessageContent()
    {
        return $this->get();
--- a/src/ValueObject/StringValueObject.php
+++ b/src/ValueObject/StringValueObject.php
@ -15,6 +15,8 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\ValueObject;

+use Assert\Assert;
+
 abstract class StringValueObject extends ValueObject
 {
    public function __toString()
--- a/src/ValueObject/ValueObject.php
+++ b/src/ValueObject/ValueObject.php
@ -33,7 +33,7 @@ abstract class ValueObject
        return $this->value;
    }

-    public function getFormatted(): string
+    public function getFormatted()
    {
        return $this->get();
    }
Author	SHA1	Message	Date
Daniel Seifert	1d5ccb6d73	adjust README	2022-09-28 15:57:38 +02:00
Daniel Seifert	4f3b1029f4	add support note	2022-09-08 15:46:46 +02:00