Fixed a bug where blob/file name '0' can not be created.

Azure · Mar 22, 2019 · f729f60 · f729f60
1 parent 3357c7d
commit f729f60
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/azure-storage-blob/src/Blob/BlobRestProxy.php b/azure-storage-blob/src/Blob/BlobRestProxy.php
@@ -347,7 +347,7 @@ private function getCopyBlobSourceName(
      */
     private function createPath($container, $blob = '')
     {
-        if (empty($blob)) {
+        if (empty($blob) && ($blob != '0')) {
             return empty($container) ? '/' : $container;
         }
         $encodedBlob = urlencode($blob);

diff --git a/azure-storage-common/src/Common/Internal/Validate.php b/azure-storage-common/src/Common/Internal/Validate.php
@@ -101,7 +101,7 @@ public static function isBoolean($var)
      */
     public static function notNullOrEmpty($var, $name)
     {
-        if (is_null($var) || empty($var)) {
+        if (is_null($var) || (empty($var) && $var != '0')) {
             throw new \InvalidArgumentException(
                 sprintf(Resources::NULL_OR_EMPTY_MSG, $name)
             );

diff --git a/azure-storage-file/src/File/FileRestProxy.php b/azure-storage-file/src/File/FileRestProxy.php
@@ -153,7 +153,7 @@ public static function createFileService(
      */
     private function createPath($share, $directory = '')
     {
-        if (empty($directory)) {
+        if (empty($directory) && ($directory != '0')) {
             return empty($share) ? '/' : $share;
         }
         $encodedFile = urlencode($directory);

diff --git a/tests/Functional/File/FileServiceFunctionalTest.php b/tests/Functional/File/FileServiceFunctionalTest.php
@@ -1655,6 +1655,17 @@ public function testPutListClearRanges()
         $this->safeDeleteShare($share);
     }
 
+    public function testCreateFileWithNameIsZero()
+    {
+        $share = FileServiceFunctionalTestData::getInterestingShareName();
+        $this->safeCreateShare($share);
+        $file = '0';
+        $this->restProxy->createFile($share, $file, 2048);
+        $res = $this->restProxy->getFileProperties($share, $file);
+        $this->assertEquals(2048, $res->getContentLength());
+        $this->safeDeleteShare($share);
+    }
+
     private function putListClearRangesWorker(
         $share,
         $file,

diff --git a/tests/Unit/Common/Internal/ValidateTest.php b/tests/Unit/Common/Internal/ValidateTest.php
@@ -117,6 +117,7 @@ public function testIsDateWithNonDate()
     public function testNotNullOrEmptyWithNonEmpty()
     {
         Validate::notNullOrEmpty(1234, 'not null');
+        Validate::notNullOrEmpty('0', 'not null');
 
         $this->assertTrue(true);
     }