diff --git a/libraries/Error.class.php b/libraries/Error.class.php
index e4bc760444..129ef87c33 100644
--- a/libraries/Error.class.php
+++ b/libraries/Error.class.php
@@ -248,7 +248,7 @@ class PMA_Error extends PMA_Message
     /**
      * Get HTML backtrace
      *
-     * @return void
+     * @return string
      */
     public function getBacktraceDisplay()
     {
@@ -384,7 +384,7 @@ class PMA_Error extends PMA_Message
 
         $Ahere = explode(
             $path_separator,
-            realpath(dirname(__FILE__) . $path_separator . '..')
+            realpath(__DIR__ . $path_separator . '..')
         );
         $Adest = explode($path_separator, $dest);
 
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 05cd990879..b2f1726a64 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -358,7 +358,7 @@ class PMA_Index
     /**
      * Returns index choice (PRIMARY, UNIQUE, INDEX, SPATIAL, FULLTEXT)
      *
-     * @return index choice
+     * @return string index choice
      */
     public function getChoice()
     {
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index 8a6fc2bc48..bde533f95c 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -247,6 +247,7 @@ class PMA_List_Database extends PMA_List
         $tmp_mydbs = $GLOBALS['dbi']->fetchResult(
             $local_query, null, null, $GLOBALS['controllink']
         );
+        $dblist = array();
         if ($tmp_mydbs) {
             // Will use as associative array of the following 2 code
             // lines:
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 6e59ec8a24..a8d4f6510c 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -253,7 +253,7 @@ function PMA_showColumnTypesInDataEditView($url_params, $showColumnType)
  *
  * @param array $column containing column type, Default and null
  *
- * @return nothing
+ * @return void
  */
 function PMA_getDefaultForDatetime($column)
 {
diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php
index 5d19ad0e72..f4a88e09f8 100644
--- a/test/AllSeleniumTests.php
+++ b/test/AllSeleniumTests.php
@@ -8,12 +8,12 @@
  */
 
 require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once dirname(__FILE__).'/selenium/PmaSeleniumTestCase.php';
-require_once dirname(__FILE__).'/selenium/PmaSeleniumLoginTest.php';
-require_once dirname(__FILE__).'/selenium/PmaSeleniumXssTest.php';
-require_once dirname(__FILE__).'/selenium/PmaSeleniumPrivilegesTest.php';
-require_once dirname(__FILE__).'/selenium/PmaSeleniumCreateDropDatabaseTest.php';
-require_once dirname(__FILE__).'/selenium/PmaSeleniumCreateRemoveUserTest.php';
+require_once __DIR__.'/selenium/PmaSeleniumTestCase.php';
+require_once __DIR__.'/selenium/PmaSeleniumLoginTest.php';
+require_once __DIR__.'/selenium/PmaSeleniumXssTest.php';
+require_once __DIR__.'/selenium/PmaSeleniumPrivilegesTest.php';
+require_once __DIR__.'/selenium/PmaSeleniumCreateDropDatabaseTest.php';
+require_once __DIR__.'/selenium/PmaSeleniumCreateRemoveUserTest.php';
 
 /**
  * AllSeleniumTests class