diff --git a/include/class.i18n.php b/include/class.i18n.php
index fdb0061bb760da7e3cc8bd7364df70deff1cc0e1..d63f3c2a47b75fe72d26da4a1224a77766360e61 100644
--- a/include/class.i18n.php
+++ b/include/class.i18n.php
@@ -189,6 +189,7 @@ class Internationalization {
         //   language-range  = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
         // Samples: "hu, en-us;q=0.66, en;q=0.33", "hu,en-us;q=0.5"
         $browser_langcodes = array();
+        $matches = array();
         if (preg_match_all('@(?<=[, ]|^)([a-zA-Z-]+|\*)(?:;q=([0-9.]+))?(?:$|\s*,\s*)@',
             trim($_SERVER['HTTP_ACCEPT_LANGUAGE']), $matches, PREG_SET_ORDER)) {
           foreach ($matches as $match) {
diff --git a/include/pear/Net/DNS2/Packet.php b/include/pear/Net/DNS2/Packet.php
index ccd633eb7d2dbbbde819a02c40ae369f95b0f33a..12c67063c3f741d0283d30c776b43c4027e54935 100644
--- a/include/pear/Net/DNS2/Packet.php
+++ b/include/pear/Net/DNS2/Packet.php
@@ -190,7 +190,7 @@ class Net_DNS2_Packet
     /**
      * applies a standard DNS name compression on the given name/offset
      *
-     * This logic was based on the Net::DNS::Packet::dn_comp() function 
+     * This logic was based on the Net::DNS::Packet::dn_comp() function (nolint)
      * by Michanel Fuhr
      *
      * @param string  $name    the name to be compressed
@@ -250,7 +250,7 @@ class Net_DNS2_Packet
     /**
      * applies a standard DNS name compression on the given name/offset
      *
-     * This logic was based on the Net::DNS::Packet::dn_comp() function 
+     * This logic was based on the Net::DNS::Packet::dn_comp() function (nolint)
      * by Michanel Fuhr
      *
      * @param string $name the name to be compressed
@@ -283,7 +283,7 @@ class Net_DNS2_Packet
     /**
      * expands the domain name stored at a given offset in a DNS Packet
      *
-     * This logic was based on the Net::DNS::Packet::dn_expand() function
+     * This logic was based on the Net::DNS::Packet::dn_expand() function (nolint)
      * by Michanel Fuhr
      *
      * @param Net_DNS2_Packet &$packet the DNS packet to look in for the domain name
diff --git a/setup/test/tests/stubs.php b/setup/test/tests/stubs.php
index 591700ec50f0ef88f208b141c0347e170ae662c9..a26014a11ad13e4ddad120d22d263c32d092ea91 100644
--- a/setup/test/tests/stubs.php
+++ b/setup/test/tests/stubs.php
@@ -45,6 +45,7 @@ class DomElement {
 
 class DomDocument {
     function loadHTML() {}
+    function loadXML() {}
 }
 
 class Exception {
@@ -83,4 +84,12 @@ class DateTimeZone {
     static function listIdentifiers() {}
 }
 
+class Phar {
+    static function isValidPharFilename() {}
+}
+
+class ZipArchive {
+    function statIndex() {}
+    function getFromIndex() {}
+}
 ?>