Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## Next Version
* 对象存储,修复无法对 key 为空字符串的对象进行操作

## 7.8.0 (2022-10-25)
* 移除不推荐域名,并增加区域亚太-首尔和华东-浙江2
* 对象存储,修复断点上传的文件内容不正确
Expand Down
6 changes: 3 additions & 3 deletions src/Qiniu/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ function json_decode($json, $assoc = false, $depth = 512)
* @param string $key 待操作的文件名
*
* @return string 符合七牛API规格的数据格式
* @link http://developer.qiniu.com/docs/v6/api/reference/data-formats.html
* @link https://developer.qiniu.com/kodo/api/data-format
*/
function entry($bucket, $key)
function entry($bucket, $key = null)
{
$en = $bucket;
if (!empty($key)) {
if ($key !== null) {
$en = $bucket . ':' . $key;
}
return base64_urlSafeEncode($en);
Expand Down
47 changes: 47 additions & 0 deletions tests/Qiniu/Tests/EntryTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php
namespace Qiniu\Tests;

use Qiniu;

class EntryTest extends \PHPUnit_Framework_TestCase
{
public function testNormal()
{
$bucket = 'qiniuphotos';
$key = 'gogopher.jpg';
$encodeEntryURI = Qiniu\entry($bucket, $key);
$this->assertEquals('cWluaXVwaG90b3M6Z29nb3BoZXIuanBn', $encodeEntryURI);
}

public function testKeyEmpty()
{
$bucket = 'qiniuphotos';
$key = '';
$encodeEntryURI = Qiniu\entry($bucket, $key);
$this->assertEquals('cWluaXVwaG90b3M6', $encodeEntryURI);
}

public function testKeyNull()
{
$bucket = 'qiniuphotos';
$key = null;
$encodeEntryURI = Qiniu\entry($bucket, $key);
$this->assertEquals('cWluaXVwaG90b3M=', $encodeEntryURI);
}

public function testKeyNeedReplacePlusSymbol()
{
$bucket = 'qiniuphotos';
$key = '012ts>a';
$encodeEntryURI = Qiniu\entry($bucket, $key);
$this->assertEquals('cWluaXVwaG90b3M6MDEydHM-YQ==', $encodeEntryURI);
}

public function testKeyNeedReplaceSlashSymbol()
{
$bucket = 'qiniuphotos';
$key = '012ts?a';
$encodeEntryURI = Qiniu\entry($bucket, $key);
$this->assertEquals('cWluaXVwaG90b3M6MDEydHM_YQ==', $encodeEntryURI);
}
}