Fix tests

Author: Илья

src/Auth/ReadFromFileCredentials.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace YdbPlatform\Ydb\Auth;
+
+class ReadFromJsonCredentials extends Auth
+{
+
+    protected $fileName;
+    protected $readInterval;
+
+    /**
+     * @param string $fileName
+     * @param int $readInterval
+     */
+    public function __construct(string $fileName = "token.json", int $readInterval = 600)
+    {
+        if(!file_exists($fileName)){
+            throw new \Exception("File $fileName is not exists");
+        }
+        $this->fileName = $fileName;
+        $this->readInterval = $readInterval;
+    }
+
+    public function getTokenInfo(): TokenInfo
+    {
+        if(!file_exists($this->fileName)){
+            throw new \Exception("File $this->fileName is not exists");
+        }
+        $data = json_decode(file_get_contents($this->fileName), true);
+        if(!isset($data["token"])){
+            throw new \Exception("File $this->fileName does not contain a token");
+        }
+        return new TokenInfo($data["token"], $this->readInterval, 1);
+    }
+
+    public function getName(): string
+    {
+        return "from file";
+    }
+}

src/Auth/ReadFromJsonCredentials.php

@@ -481,7 +481,7 @@ public function retrySession(Closure $userFunc, bool $idempotent = false, RetryP
 
     }
 
-    public function retryTransaction(Closure $userFunc, bool $idempotent = null, RetryParams $params = null, array $options){
+    public function retryTransaction(Closure $userFunc, bool $idempotent = null, RetryParams $params = null, array $options = null){
         if ($options == null) {
             $options = [];
         }

src/Table.php

@@ -2,12 +2,12 @@
 namespace YdbPlatform\Ydb\Test;
 
 use PHPUnit\Framework\TestCase;
-use YdbPlatform\Ydb\Auth\ReadFromFileCredentials;
+use YdbPlatform\Ydb\Auth\ReadFromJsonCredentials;
 use YdbPlatform\Ydb\Ydb;
 use YdbPlatform\Ydb\YdbTable;
 
-class CheckReadTokenFile extends TestCase{
-    public function testRead(){
+class CheckReadTokenFileTest extends TestCase{
+    public function testReadTokenFile(){
         $config = [
 
             // Database path
@@ -19,7 +19,7 @@ public function testRead(){
             // Auto discovery (dedicated server only)
             'discovery'   => false,
 
-            'credentials'  => new ReadFromFileCredentials("./token.txt")
+            'credentials'  => new ReadFromJsonCredentials("./tests/token.json")
         ];
 
         $ydb = new Ydb($config);

tests/CheckReadTokenFile.php renamed to tests/CheckReadTokenFileTest.php

@@ -30,7 +30,7 @@
 use YdbPlatform\Ydb\Retry\Retry;
 
 class RetrySubclass extends Retry{
-    public function canRetry(Exception $e, bool $idempotent)
+    public function canRetry(\Exception $e, bool $idempotent)
     {
         return parent::canRetry($e, $idempotent);
     }

tests/RetryParamsTest.php

@@ -6,15 +6,15 @@
 use YdbPlatform\Ydb\Ydb;
 use YdbPlatform\Ydb\YdbTable;
 
-class TestEnvTypes extends TestCase{
+class TestEnvTypesTest extends TestCase{
 
     public function testEnvTypes(){
 
         $dataset = [
             [
                 "env"   => [
                     "name"  => "YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS",
-                    "value" => "./some.json"
+                    "value" => "./tests/some.json"
                 ],
                 "wait"  => "SA JSON key"
             ],

tests/TestEnvTypes.php renamed to tests/TestEnvTypesTest.php

@@ -0,0 +1,3 @@
+{
+    "token": "test-example-token"
+}