Skip to content

Commit fa6d446

Browse files
authored
Remove Orphaned Code (#480)
* Big cleanup of unused internals * clean some unused imports * Fix baseline, mark some deprecations coming
1 parent 242350c commit fa6d446

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+83
-712
lines changed

phpstan-baseline.neon

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ parameters:
55
count: 1
66
path: src/Account/Price.php
77

8-
-
9-
message: "#^Result of method Vonage\\\\Account\\\\Price\\:\\:getResponse\\(\\) \\(void\\) is used\\.$#"
10-
count: 1
11-
path: src/Account/Price.php
12-
138
-
149
message: "#^Access to an undefined property Vonage\\\\Application\\\\Application\\:\\:\\$data\\.$#"
1510
count: 1
@@ -55,21 +50,11 @@ parameters:
5550
count: 1
5651
path: src/Client/Exception/Server.php
5752

58-
-
59-
message: "#^Result of method Vonage\\\\Network\\:\\:getResponse\\(\\) \\(void\\) is used\\.$#"
60-
count: 1
61-
path: src/Network.php
62-
6353
-
6454
message: "#^Unsafe usage of new static\\(\\)\\.$#"
6555
count: 1
6656
path: src/Network/Number/Response.php
6757

68-
-
69-
message: "#^Result of method Vonage\\\\Numbers\\\\Number\\:\\:getResponse\\(\\) \\(void\\) is used\\.$#"
70-
count: 1
71-
path: src/Numbers/Number.php
72-
7358
-
7459
message: "#^Access to an undefined property Vonage\\\\Verify\\\\Verification\\:\\:\\$data\\.$#"
7560
count: 1

src/Account/ClientFactory.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
use Psr\Container\ContainerInterface;
88
use Vonage\Client\APIResource;
9-
use Vonage\Client\Credentials\Handler\BasicHandler;
109
use Vonage\Client\Credentials\Handler\BasicQueryHandler;
11-
1210
class ClientFactory
1311
{
1412
public function __invoke(ContainerInterface $container): Client

src/Network.php renamed to src/Account/Network.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<?php
2+
23
declare(strict_types=1);
34

4-
namespace Vonage;
5+
namespace Vonage\Account;
56

67
use Vonage\Entity\EntityInterface;
78
use Vonage\Entity\Hydrator\ArrayHydrateInterface;
89
use Vonage\Entity\JsonResponseTrait;
910
use Vonage\Entity\JsonSerializableTrait;
1011
use Vonage\Entity\NoRequestResponseTrait;
1112

12-
use function get_class;
1313
use function ltrim;
1414
use function preg_replace;
1515
use function strtolower;
16-
use function trigger_error;
1716

1817
class Network implements
1918
EntityInterface,

src/Account/Price.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@
44

55
namespace Vonage\Account;
66

7-
use JsonSerializable;
87
use RuntimeException;
98
use Vonage\Entity\EntityInterface;
109
use Vonage\Entity\Hydrator\ArrayHydrateInterface;
1110
use Vonage\Entity\JsonResponseTrait;
12-
use Vonage\Entity\JsonSerializableInterface;
1311
use Vonage\Entity\JsonSerializableTrait;
14-
use Vonage\Entity\JsonUnserializableInterface;
1512
use Vonage\Entity\NoRequestResponseTrait;
16-
use Vonage\Network;
17-
1813
use function array_key_exists;
1914
use function ltrim;
2015
use function preg_replace;

src/Account/SmsPrice.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
declare(strict_types=1);
44

55
namespace Vonage\Account;
6-
76
class SmsPrice extends Price
87
{
98
/**

src/Account/VoicePrice.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
declare(strict_types=1);
44

55
namespace Vonage\Account;
6-
76
class VoicePrice extends Price
87
{
98
/**

src/ApiErrorHandler.php

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/Application/Application.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Vonage\Entity\Hydrator\ArrayHydrateInterface;
1212
use Vonage\Entity\JsonResponseTrait;
1313
use Vonage\Entity\JsonSerializableTrait;
14-
use Vonage\Entity\JsonUnserializableInterface;
1514
use Vonage\Entity\Psr7Trait;
1615

1716
use function count;

src/Client.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ public static function authRequest(RequestInterface $request, Basic $credentials
356356

357357
/**
358358
* @throws ClientException
359+
* @deprecated Use the Vonage/JWT library if you need to generate a token
359360
*/
360361
public function generateJwt($claims = []): Token
361362
{

src/Client/Credentials/Keypair.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,13 @@
44

55
namespace Vonage\Client\Credentials;
66

7-
use Lcobucci\JWT\Configuration;
87
use Lcobucci\JWT\Encoding\JoseEncoder;
98
use Lcobucci\JWT\Signer\Key;
109
use Lcobucci\JWT\Signer\Key\InMemory;
11-
use Lcobucci\JWT\Signer\Rsa\Sha256;
1210
use Lcobucci\JWT\Token;
1311
use Vonage\Application\Application;
14-
use Vonage\Client\Exception\Validation;
1512
use Vonage\JWT\TokenGenerator;
1613

17-
use function base64_encode;
18-
use function mt_rand;
19-
use function time;
20-
2114
/**
2215
* @property mixed application
2316
*/

0 commit comments

Comments
 (0)