fix test

Author: s00d

.idea/onlinesim-php-api.iml

@@ -35,7 +35,7 @@ public function __construct($apiKey, $locale = null, $dev_id = null) {
      */
     public function getProxyList() {
         $response = $this->request->send('proxies', [], 'GET');
-        return new GetProxyList($response['proxies']);
+        return new GetProxyList($response);
     }
 
     /**
@@ -88,7 +88,7 @@ public function createOrUpdateProxyComment($id, $comment) {
      */
     public function getAvailableProxiesForOrder() {
         $response = $this->request->send('filters', [], 'GET');
-        return new AvailableProxies($response['proxies']);
+        return new AvailableProxies($response);
     }
 
     /**

.idea/php.xml

@@ -43,7 +43,7 @@ public function send($request, $data, $method = 'GET') {
         ];
 
         if ($method === 'GET') {
-            $url .= ".php?{$serializedData}";
+            $url .= "?{$serializedData}";
             $context = stream_context_create([
                 'http' => [
                     'header' => implode("\r\n", $headers),

.idea/workspace.xml

@@ -4,29 +4,45 @@
 
 class AvailableProxies extends Base
 {
-    public $proxies = [];
+    public $countries = [];
+    public $regions = [];
+    public $cities = [];
+    public $operators = [];
 
-    public function __construct($properties = []) {
-        foreach ($properties as $proxy) {
-            $this->proxies[] = new ProxyOne($proxy);
+    public function __construct(array $properties = []) {
+        if (isset($properties['geo_country'])) {
+            $this->countries = $properties['geo_country'];
+        }
+        if (isset($properties['geo_region'])) {
+            $this->regions = $properties['geo_region'];
+        }
+        if (isset($properties['geo_city'])) {
+            $this->cities = array_map(function ($city) {
+                return new GeoCity($city);
+            }, $properties['geo_city']);
+        }
+        if (isset($properties['geo_operator'])) {
+            $this->operators = array_map(function ($operator) {
+                return new GeoOperator($operator);
+            }, $properties['geo_operator']);
         }
     }
 
     /**
-     * Get the first available proxy.
-     * @return ProxyOne|null
-     */
-    public function first() {
-        return $this->proxies[0] ?? null;
-    }
-
-    /**
-     * Convert available proxies to an array.
+     * Преобразует данные в массив.
+     *
      * @return array
      */
     public function toArray() {
-        return array_map(function ($proxy) {
-            return $proxy->toArray();
-        }, $this->proxies);
+        return [
+            'geo_country' => $this->countries,
+            'geo_region' => $this->regions,
+            'geo_city' => array_map(function ($city) {
+                return $city->toArray();
+            }, $this->cities),
+            'geo_operator' => array_map(function ($operator) {
+                return $operator->toArray();
+            }, $this->operators),
+        ];
     }
 }

src/OnlineProxyApi.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace onOrg\OnlineProxyApi\Responses;
+
+class GeoCity extends Base
+{
+    public $geo_city;
+    public $geo_country;
+}

src/Request.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace onOrg\OnlineProxyApi\Responses;
+
+class GeoOperator extends Base
+{
+    public $geo_operator;
+    public $geo_country;
+}

src/Responses/AvailableProxies.php

@@ -24,7 +24,7 @@ public function testGetProxyList()
     {
         $proxies = $this->apiClient->getProxyList();
         $this->assertIsObject($proxies);
-        $this->assertObjectHasAttribute('proxies', $proxies);
+        $this->assertIsArray($proxies->proxies, "'proxies' should be an array.");
     }
 
     public function testGetProxy()
@@ -36,62 +36,39 @@ public function testGetProxy()
 
         $proxy = $this->apiClient->getProxy($proxyId);
         $this->assertIsObject($proxy);
-        $this->assertObjectHasAttribute('id', $proxy);
+        $this->assertTrue(property_exists($proxy, 'id'), "'id' does not exist in the object.");
         $this->assertSame($proxy->id, $proxyId, 'Proxy ID should match.');
     }
 
     public function testGetUserBalance()
     {
         $balance = $this->apiClient->getUserBalance();
         $this->assertIsObject($balance);
-        $this->assertObjectHasAttribute('balance', $balance);
+        $this->assertTrue(property_exists($balance, 'balance'), "'balance' does not exist in the object.");
     }
 
-    public function testRotateProxy()
+    public function testGetAvailableProxiesForOrder()
     {
-        $rotationResult = $this->apiClient->rotateProxy();
-        $this->assertIsObject($rotationResult);
-        $this->assertObjectHasAttribute('success', $rotationResult);
-        $this->assertTrue($rotationResult->success, 'Rotation should be successful.');
-    }
+        $availableProxies = $this->apiClient->getAvailableProxiesForOrder();
 
-    public function testCreateOrUpdateProxyComment()
-    {
-        $proxyList = $this->apiClient->getProxyList();
-        $proxyId = $proxyList->proxies[0]->id ?? null;
-        $this->assertNotNull($proxyId, 'Proxy ID should not be null.');
 
-        $comment = 'Test comment';
-        $commentResult = $this->apiClient->createOrUpdateProxyComment($proxyId, $comment);
-        $this->assertIsObject($commentResult);
-        $this->assertObjectHasAttribute('success', $commentResult);
-        $this->assertTrue($commentResult->success, 'Comment update should be successful.');
-    }
+        // Check that the response is an object
+        $this->assertIsObject($availableProxies, 'The response is not an object.');
 
-    public function testGetAvailableProxiesForOrder()
-    {
-        $availableProxies = $this->apiClient->getAvailableProxiesForOrder();
-        $this->assertIsObject($availableProxies);
-        $this->assertObjectHasAttribute('proxies', $availableProxies);
-    }
+        // Check that the 'operators' property is not empty
+        $this->assertNotEmpty($availableProxies->operators, "'operators' should not be empty.");
 
-    public function testOrderProxy()
-    {
-        $orderData = [
-            'proxyType' => 'HTTP',
-            'quantity' => 1,
-            'location' => 'USA',
-        ];
-        $orderResult = $this->apiClient->orderProxy($orderData);
-        $this->assertIsObject($orderResult);
-        $this->assertObjectHasAttribute('success', $orderResult);
-        $this->assertTrue($orderResult->success, 'Proxy order should be successful.');
+        // Check that the 'cities' property is not empty
+        $this->assertNotEmpty($availableProxies->cities, "'cities' should not be empty.");
+
+        // Check that the 'countries' property is not empty
+        $this->assertNotEmpty($availableProxies->countries, "'countries' should not be empty.");
     }
 
     public function testGetProxyTariffs()
     {
         $tariffs = $this->apiClient->getProxyTariffs();
         $this->assertIsObject($tariffs);
-        $this->assertObjectHasAttribute('tariffs', $tariffs);
+        $this->assertIsArray($tariffs, "'proxies' should be an array.");
     }
 }