Merge branch 'Ciki-patch-1'

Author: h4kuna

src/Account/AccountCollectionFactory.php

@@ -8,7 +8,7 @@ class AccountCollectionFactory
 {
 
 	/**
-	 * @param array<string, array{token: string, account: string}> $accounts
+	 * @param array<string|int, array{token: string, account: string}> $accounts
 	 */
 	public static function create(array $accounts): AccountCollection
 	{
@@ -19,7 +19,7 @@ public static function create(array $accounts): AccountCollection
 			} elseif (!isset($info['account']) || $info['account'] === '') { /* @phpstan-ignore-line */
 				throw new Exceptions\InvalidArgument(sprintf('Key "account" is required for alias "%s".', $alias));
 			}
-			$accountCollection->addAccount($alias, new FioAccount($info['account'], $info['token']));
+			$accountCollection->addAccount((string) $alias, new FioAccount($info['account'], $info['token']));
 		}
 
 		return $accountCollection;

tests/src/Unit/Account/AccountCollectionTest.php

@@ -37,7 +37,7 @@ public function testAddAccount(): void
 	public function testInvalidAlias(): void
 	{
 		$account1 = new FioAccount('323536', 'foo');
-		$accounts = new AccountCollection;
+		$accounts = new AccountCollection();
 		$accounts->addAccount('foo', $account1);
 		$accounts->account('bar');
 	}
@@ -47,7 +47,7 @@ public function testCount(): void
 	{
 		$account1 = new FioAccount('323536', 'foo');
 		$account2 = new FioAccount('978654', 'bar');
-		$accounts = new AccountCollection;
+		$accounts = new AccountCollection();
 		Assert::equal(0, $accounts->count());
 
 		$accounts->addAccount('foo', $account1);
@@ -60,7 +60,7 @@ public function testIteration(): void
 	{
 		$account1 = new FioAccount('323536', 'foo');
 		$account2 = new FioAccount('978654', 'bar');
-		$accounts = new AccountCollection;
+		$accounts = new AccountCollection();
 		$accounts->addAccount('foo', $account1);
 		$accounts->addAccount('bar', $account2);
 
@@ -76,7 +76,7 @@ public function testIteration(): void
 	 */
 	public function testEmpty(): void
 	{
-		(new AccountCollection)->account();
+		(new AccountCollection())->account();
 	}
 
 
@@ -87,7 +87,7 @@ public function testDuplicity(): void
 	{
 		$account1 = new FioAccount('323536', 'foo');
 		$account2 = new FioAccount('978654', 'bar');
-		$accounts = new AccountCollection;
+		$accounts = new AccountCollection();
 		$accounts->addAccount('foo', $account1);
 		$accounts->addAccount('foo', $account2);
 	}
@@ -118,6 +118,23 @@ public function testAccountCollectionFactoryThrowToken(): void
 		}, InvalidArgument::class, 'Key "token" is required for alias "foo".');
 	}
 
+	public function testKeysLikeNumber(): void
+	{
+		$collections = AccountCollectionFactory::create([
+			'1' => [
+				'account' => '123456/0800',
+				'token' => 'bar',
+			],
+			2 => [
+				'account' => '987564/0800',
+				'token' => 'foo',
+			],
+		]);
+
+		Assert::same('bar', $collections->account('1')->getToken());
+		Assert::same('foo', $collections->account('2')->getToken());
+	}
+
 }
 
 (new AccountCollectionTest())->run();