diff options
author | Rubén Calvo <rubencm@gmail.com> | 2017-08-28 15:11:12 +0200 |
---|---|---|
committer | Rubén Calvo <rubencm@gmail.com> | 2017-08-28 17:55:19 +0200 |
commit | da3c9b3de7539af27e179eb2cb0e3fee0a5658ae (patch) | |
tree | 806c9f6c6079f2bbd42591895f950373a0fb0618 /phpBB/phpbb | |
parent | [ticket/15276] Use stream_copy_to_stream (diff) | |
download | phpbb-da3c9b3de7539af27e179eb2cb0e3fee0a5658ae.tar.gz phpbb-da3c9b3de7539af27e179eb2cb0e3fee0a5658ae.tar.bz2 phpbb-da3c9b3de7539af27e179eb2cb0e3fee0a5658ae.zip |
[ticket/15276] Fix code and add phpdoc
PHPBB3-15276
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r-- | phpBB/phpbb/files/types/remote_storage.php | 2 | ||||
-rw-r--r-- | phpBB/phpbb/storage/file_info.php | 20 |
2 files changed, 18 insertions, 4 deletions
diff --git a/phpBB/phpbb/files/types/remote_storage.php b/phpBB/phpbb/files/types/remote_storage.php index 92dbfd1d8e..16c061655c 100644 --- a/phpBB/phpbb/files/types/remote_storage.php +++ b/phpBB/phpbb/files/types/remote_storage.php @@ -141,7 +141,7 @@ class remote_storage extends base return $this->factory->get('filespec')->set_error($this->language->lang($this->upload->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit'])); } - if ($content_length == 0) + if ($content_length === 0) { return $this->factory->get('filespec')->set_error($this->upload->error_prefix . 'EMPTY_REMOTE_DATA'); } diff --git a/phpBB/phpbb/storage/file_info.php b/phpBB/phpbb/storage/file_info.php index 3e0a1b1b5b..ae2bd5169d 100644 --- a/phpBB/phpbb/storage/file_info.php +++ b/phpBB/phpbb/storage/file_info.php @@ -13,7 +13,8 @@ namespace phpbb\storage; -use phpbb\storage\exception\not_implemented; +use phpbb\storage\exception\exception; +use phpbb\storage\adapter\adapter_interface; class file_info { @@ -23,16 +24,29 @@ class file_info protected $adapter; /** + * Path of the file + * * @var string */ protected $path; /** + * Stores the properties of $path file, so dont have to be consulted multiple times. + * For example, when you need the width of an image, using getimagesize() you get + * both dimensions, so you store both here, and when you get the height, you dont have + * to call getimagesize() again. + * * @var array */ protected $properties; - public function __construct($adapter, $path) + /** + * Constructor + * + * @param \Symfony\Component\DependencyInjection\ContainerInterface $adapter + * @param string $path + */ + public function __construct(adapter_interface $adapter, $path) { $this->adapter = $adapter; $this->path = $path; @@ -52,7 +66,7 @@ class file_info { if (!method_exists($this->adapter, 'file_' . $name)) { - throw new not_implemented(); + throw new exception('STORAGE_METHOD_NOT_IMPLEMENTED'); } $this->properties = array_merge($this->properties, call_user_func([$this->adapter, 'file_' . $name], $this->path)); |