Merge pull request #3 from Rican7/feature/getSize-improvements

New "getSize()" method for more compatibility with other file types

Author: Rican7

src/OneMightyRoar/PhpFileManager/FileObject.php

@@ -85,6 +85,19 @@ class FileObject extends SplFileObject
         'stream',
     );
 
+    /**
+     * The protocol wrappers that support "stat" operations
+     *
+     * @static
+     * @var array
+     * @access protected
+     */
+    protected static $stat_able_protocols = array(
+        'file',
+        'phar',
+        'rar',
+    );
+
     /**
      * The actual "name" of the file object
      *
@@ -743,6 +756,30 @@ public function getObfuscatedName($with_extension = true)
         return $this->getHash();
     }
 
+    /**
+     * Get the size of the file object
+     *
+     * This overrides the default "getSize()" method in SplFileInfo
+     * that is inherited by this class, so that getting the file size
+     * will work on non-"fstat"-able file types and stream wrappers
+     *
+     * @access public
+     * @return int
+     */
+    public function getSize()
+    {
+        if ($this->isWrapped() || $this->isTemp()) {
+            $wrapper_info = $this->getWrapperInfo();
+
+            if (!in_array($wrapper_info['protocol'], static::$stat_able_protocols)) {
+                return strlen($this->getRaw());
+            }
+        }
+
+        // Just call our parent, otherwise
+        return parent::getSize();
+    }
+
 
     /**
      * Sub-class converters

tests/OneMightyRoar/PhpFileManager/Tests/FileObjectTest.php

@@ -122,7 +122,17 @@ public function testCreateFromDetectedType()
         $this->assertSame($file_object->getRaw(), $file_object_protocol_wrapped_buffer->getRaw());
         $this->assertSame($file_object->getRaw(), $file_object_protocol_wrapped_base64_buffer->getRaw());
 
-        return $file_object;
+        return array(
+            'name' => $test_name,
+            'objects' => array(
+                'file_object' => $file_object,
+                'file_object_resource' => $file_object_resource,
+                'file_object_buffer' => $file_object_buffer,
+                'file_object_base64_buffer' => $file_object_base64_buffer,
+                'file_object_protocol_wrapped_buffer' => $file_object_protocol_wrapped_buffer,
+                'file_object_protocol_wrapped_base64_buffer' => $file_object_protocol_wrapped_base64_buffer,
+            ),
+        );
     }
 
     public function testIsBase64String()
@@ -419,6 +429,26 @@ public function testGetObfuscatedName()
         $this->assertContains('php', $raw_binary_php->getObfuscatedName(true));
     }
 
+    /**
+     * @depends testCreateFromDetectedType
+     */
+    public function testGetSize($data)
+    {
+        $last_size = null;
+
+        foreach ($data['objects'] as $data) {
+            $this_size = $data->getSize();
+
+            $this->assertGreaterThan(0, $this_size);
+
+            if (null !== $last_size) {
+                $this->assertEquals($last_size, $this_size);
+            }
+
+            $last_size = $this_size;
+        }
+    }
+
     /**
      * @expectedException UnexpectedValueException
      */