handle scrutinizer issues (mostly changes in API documentation)

lib/Controller.php

@@ -199,12 +199,13 @@ class Controller
         // Ensure last paste from visitors IP address was more than configured amount of seconds ago.
         TrafficLimiter::setConfiguration($this->_conf);
         if (!TrafficLimiter::canPass()) {
-            return $this->_return_message(
+            $this->_return_message(
                 1, I18n::_(
                     'Please wait %d seconds between each post.',
                     $this->_conf->getKey('limit', 'traffic')
                 )
             );
+            return;
         }
 
         $data      = $this->_request->getData();
@@ -213,18 +214,20 @@ class Controller
             array_key_exists('parentid', $data) &&
             !empty($data['parentid']);
         if (!FormatV2::isValid($data, $isComment)) {
-            return $this->_return_message(1, I18n::_('Invalid data.'));
+            $this->_return_message(1, I18n::_('Invalid data.'));
+            return;
         }
         $sizelimit = $this->_conf->getKey('sizelimit');
         // Ensure content is not too big.
         if (strlen($data['ct']) > $sizelimit) {
-            return $this->_return_message(
+            $this->_return_message(
                 1,
                 I18n::_(
                     'Paste is limited to %s of encrypted data.',
                     Filter::formatHumanReadableSize($sizelimit)
                 )
             );
+            return;
         }
 
         // The user posts a comment.
@@ -236,7 +239,8 @@ class Controller
                     $comment->setData($data);
                     $comment->store();
                 } catch (Exception $e) {
-                    return $this->_return_message(1, $e->getMessage());
+                    $this->_return_message(1, $e->getMessage());
+                    return;
                 }
                 $this->_return_message(0, $comment->getId());
             } else {

lib/Data/AbstractData.php

@@ -79,7 +79,7 @@ abstract class AbstractData
      *
      * @access public
      * @param  string $pasteid
-     * @return stdClass|false
+     * @return array|false
      */
     abstract public function read($pasteid);
 

lib/Data/Database.php

@@ -75,7 +75,6 @@ class Database extends AbstractData
             self::$_instance = new self;
         }
 
-        if (is_array($options)) {
         // set table prefix if given
         if (array_key_exists('tbl', $options)) {
             self::$_prefix = $options['tbl'];
@@ -142,7 +141,6 @@ class Database extends AbstractData
                 'Missing configuration for key dsn, usr, pwd or opt in the section model_options, please check your configuration file', 6
             );
         }
-        }
 
         return self::$_instance;
     }
@@ -250,8 +248,9 @@ class Database extends AbstractData
             list($createdKey)       = self::_getVersionedKeys(1);
         }
 
+        try {
             $paste['meta'] = Json::decode($paste['meta']);
-        if (!is_array($paste['meta'])) {
+        } catch (Exception $e) {
             $paste['meta'] = array();
         }
         $paste                                       = self::upgradePreV1Format($paste);
@@ -474,7 +473,7 @@ class Database extends AbstractData
      * @param  array $params
      * @param  bool $firstOnly if only the first row should be returned
      * @throws PDOException
-     * @return array
+     * @return array|false
      */
     private static function _select($sql, array $params, $firstOnly = false)
     {

lib/Persistence/DataStore.php

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

lib/Request.php

@@ -184,7 +184,7 @@ class Request
      *
      * @access public
      * @param  string $param
-     * @param  string $default
+     * @param  string|array $default
      * @return string
      */
     public function getParam($param, $default = '')