Merge branch 'master' into webcrypto

This commit is contained in:
El RIDO 2018-11-19 13:14:54 +01:00
commit 2303c81ce0
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92
7 changed files with 9 additions and 10 deletions

View File

@ -12,7 +12,6 @@
namespace PrivateBin\Data;
use PrivateBin\Model\Paste;
use PrivateBin\Persistence\DataStore;
/**
@ -72,7 +71,7 @@ class Filesystem extends AbstractData
*
* @access public
* @param string $pasteid
* @return stdClass|false
* @return \stdClass|false
*/
public function read($pasteid)
{

View File

@ -32,7 +32,7 @@ class Model
/**
* Data storage.
*
* @var AbstractData
* @var Data\AbstractData
*/
private $_store = null;
@ -75,7 +75,7 @@ class Model
/**
* Gets, and creates if neccessary, a store object
*
* @return AbstractData
* @return Data\AbstractData
*/
private function _getStore()
{

View File

@ -38,7 +38,7 @@ class Comment extends AbstractModel
*
* @access public
* @throws Exception
* @return stdClass
* @return \stdClass
*/
public function get()
{

View File

@ -28,8 +28,8 @@ class Paste extends AbstractModel
* Get paste data.
*
* @access public
* @throws Exception
* @return stdClass
* @throws \Exception
* @return \stdClass
*/
public function get()
{

View File

@ -58,7 +58,7 @@ class DataStore extends AbstractPersistence
* @access public
* @static
* @param string $filename
* @return stdClass|false $data
* @return \stdClass|false $data
*/
public static function get($filename)
{

View File

@ -60,7 +60,7 @@ class PurgeLimiter extends AbstractPersistence
*
* @access public
* @static
* @throws Exception
* @throws \Exception
* @return bool
*/
public static function canPurge()

View File

@ -90,7 +90,7 @@ class TrafficLimiter extends AbstractPersistence
*
* @access public
* @static
* @throws Exception
* @throws \Exception
* @return bool
*/
public static function canPass()