Merge branch 'master' into webcrypto

2024-10-01 01:26:10 -04:00 · 2018-11-19 13:14:54 +01:00 · 2018-11-19 13:14:54 +01:00 · 2303c81ce0
commit 2303c81ce0
parent b36b3d1a82 9ce41022cf
7 changed files with 9 additions and 10 deletions
--- a/lib/Data/Filesystem.php
+++ b/lib/Data/Filesystem.php
@ -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)
    {
--- a/lib/Model.php
+++ b/lib/Model.php
@ -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()
    {
--- a/lib/Model/Comment.php
+++ b/lib/Model/Comment.php
@ -38,7 +38,7 @@ class Comment extends AbstractModel
     *
     * @access public
     * @throws Exception
-     * @return stdClass
+     * @return \stdClass
     */
    public function get()
    {
--- a/lib/Model/Paste.php
+++ b/lib/Model/Paste.php
@ -28,8 +28,8 @@ class Paste extends AbstractModel
     * Get paste data.
     *
     * @access public
-     * @throws Exception
-     * @return stdClass
+     * @throws \Exception
+     * @return \stdClass
     */
    public function get()
    {
--- a/lib/Persistence/DataStore.php
+++ b/lib/Persistence/DataStore.php
@ -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)
    {
--- a/lib/Persistence/PurgeLimiter.php
+++ b/lib/Persistence/PurgeLimiter.php
@ -60,7 +60,7 @@ class PurgeLimiter extends AbstractPersistence
     *
     * @access public
     * @static
-     * @throws Exception
+     * @throws \Exception
     * @return bool
     */
    public static function canPurge()
--- a/lib/Persistence/TrafficLimiter.php
+++ b/lib/Persistence/TrafficLimiter.php
@ -90,7 +90,7 @@ class TrafficLimiter extends AbstractPersistence
     *
     * @access public
     * @static
-     * @throws Exception
+     * @throws \Exception
     * @return bool
     */
    public static function canPass()