Skip to content

Commit 07c4c70

Browse files
committed
fix travis code style bug
1 parent d47c508 commit 07c4c70

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

src/Qiniu/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private function getZone($accessKey, $bucket)
129129
$this->zoneCache[$cacheId] = $zone;
130130
} else {
131131
print("from query\n");
132-
$zone = Zone::QueryZone($accessKey, $bucket);
132+
$zone = Zone::queryZone($accessKey, $bucket);
133133
$this->zoneCache[$cacheId] = $zone;
134134
}
135135
return $zone;

src/Qiniu/Zone.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(
3939
}
4040

4141
//华东机房
42-
public static function Zone0()
42+
public static function zone0()
4343
{
4444
$Zone_z0 = new Zone(
4545
array("up.qiniup.com", 'up-nb.qiniup.com', 'up-xs.qiniup.com'),
@@ -53,7 +53,7 @@ public static function Zone0()
5353
}
5454

5555
//华北机房
56-
public static function Zone1()
56+
public static function zone1()
5757
{
5858
$Zone_z1 = new Zone(
5959
array('up-z1.qiniup.com'),
@@ -68,7 +68,7 @@ public static function Zone1()
6868
}
6969

7070
//华南机房
71-
public static function Zone2()
71+
public static function zone2()
7272
{
7373
$Zone_z2 = new Zone(
7474
array('up-z2.qiniup.com', 'up-gz.qiniup.com', 'up-fs.qiniup.com'),
@@ -82,7 +82,7 @@ public static function Zone2()
8282
}
8383

8484
//北美机房
85-
public static function ZoneNa0()
85+
public static function zoneNa0()
8686
{
8787
//北美机房
8888
$Zone_na0 = new Zone(
@@ -99,7 +99,7 @@ public static function ZoneNa0()
9999
/*
100100
* GET /v2/query?ak=<ak>&&bucket=<bucket>
101101
**/
102-
public static function QueryZone($ak, $bucket)
102+
public static function queryZone($ak, $bucket)
103103
{
104104
$zone = new Zone();
105105
$url = Config::UC_HOST . '/v2/query' . "?ak=$ak&bucket=$bucket";

tests/Qiniu/Tests/BucketTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function testBatchCopy()
167167
$ops = BucketManager::buildBatchCopy(
168168
$this->bucketName,
169169
array($this->key => $key),
170-
$this->bucketName
170+
$this->bucketName,true
171171
);
172172
list($ret, $error) = $this->bucketManager->batch($ops);
173173
$this->assertEquals(200, $ret[0]['code']);
@@ -184,7 +184,7 @@ public function testBatchMove()
184184
$ops = BucketManager::buildBatchMove(
185185
$this->bucketName,
186186
array($key => $key2),
187-
$this->bucketName
187+
$this->bucketName,true
188188
);
189189
list($ret, $error) = $this->bucketManager->batch($ops);
190190
$this->assertEquals(200, $ret[0]['code']);
@@ -197,7 +197,7 @@ public function testBatchRename()
197197
$key = 'rename' . rand();
198198
$this->bucketManager->copy($this->bucketName, $this->key, $this->bucketName, $key);
199199
$key2 = $key . 'to';
200-
$ops = BucketManager::buildBatchRename($this->bucketName, array($key => $key2));
200+
$ops = BucketManager::buildBatchRename($this->bucketName, array($key => $key2),true);
201201
list($ret, $error) = $this->bucketManager->batch($ops);
202202
$this->assertEquals(200, $ret[0]['code']);
203203
$error = $this->bucketManager->delete($this->bucketName, $key2);

tests/Qiniu/Tests/ZoneTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@ protected function setUp()
3535

3636
public function testUpHosts()
3737
{
38-
$zone = Zone::QueryZone($this->ak, $this->bucketName);
38+
$zone = Zone::queryZone($this->ak, $this->bucketName);
3939
print_r($zone);
4040
$this->assertContains('upload.qiniup.com', $zone->cdnUpHosts);
4141

42-
$zone = Zone::QueryZone($this->ak, $this->bucketNameBC);
42+
$zone = Zone::queryZone($this->ak, $this->bucketNameBC);
4343
$this->assertContains('upload-z1.qiniup.com', $zone->cdnUpHosts);
4444

45-
$zone = Zone::QueryZone($this->ak, $this->bucketNameNA);
45+
$zone = Zone::queryZone($this->ak, $this->bucketNameNA);
4646
$this->assertContains('upload-na0.qiniup.com', $zone->cdnUpHosts);
4747
}
4848

4949
public function testIoHosts()
5050
{
51-
$zone = Zone::QueryZone($this->ak, $this->bucketName);
51+
$zone = Zone::queryZone($this->ak, $this->bucketName);
5252
$this->assertEquals($zone->iovipHost, 'iovip.qbox.me');
5353

54-
$zone = Zone::QueryZone($this->ak, $this->bucketNameBC);
54+
$zone = Zone::queryZone($this->ak, $this->bucketNameBC);
5555
$this->assertEquals($zone->iovipHost, 'iovip-z1.qbox.me');
5656

57-
$zone = Zone::QueryZone($this->ak, $this->bucketNameNA);
57+
$zone = Zone::queryZone($this->ak, $this->bucketNameNA);
5858
$this->assertEquals($zone->iovipHost, 'iovip-na0.qbox.me');
5959
}
6060
}

0 commit comments

Comments
 (0)