Kolab Groupware OBS

roundcubemail-1.5.tar.gz/CHANGELOG.md Changed

roundcubemail-1.5.tar.gz/composer.lock Changed

@@ -2055,22 +2055,25 @@
         },
         {
             "name": "pear/net_ldap2",
-            "version": "v2.2.1",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_LDAP2.git",
-                "reference": "0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1"
+                "reference": "6eae6d20533469ffe1c01684923cd09f0fae3b77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1",
-                "reference": "0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1",
+                "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/6eae6d20533469ffe1c01684923cd09f0fae3b77",
+                "reference": "6eae6d20533469ffe1c01684923cd09f0fae3b77",
                 "shasum": ""
             },
             "require": {
                 "ext-ldap": "*",
                 "pear/pear-core-minimal": "^1.10.1"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^9 || ^10.3"
+            },
             "type": "library",
             "autoload": {
                 "classmap": 
@@ -2094,7 +2097,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=Net_LDAP2",
                 "source": "https://github.com/pear/Net_LDAP2"
             },
-            "time": "2023-02-08T07:25:31+00:00"
+            "time": "2023-10-12T20:00:01+00:00"
         },
         {
             "name": "pear/net_sieve",
@@ -4787,16 +4790,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.36",
+            "version": "1.10.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ffa3089511121a672e62969404e4fddc753f9b15"
+                "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ffa3089511121a672e62969404e4fddc753f9b15",
-                "reference": "ffa3089511121a672e62969404e4fddc753f9b15",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/93c84b5bf7669920d823631e39904d69b9c7dc5d",
+                "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d",
                 "shasum": ""
             },
             "require": {
@@ -4845,7 +4848,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-09-29T14:07:45+00:00"
+            "time": "2023-10-30T14:48:31+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube.php Changed

@@ -1314,6 +1314,17 @@
             $line = '<' . substr($sess, 0, $session_key) . '> ' . $line;
         }
 
+        // per-user logging is activated
+        if (self::$instance && self::$instance->config->get('per_user_logging')
+            && self::$instance->get_user_id()
+            && !in_array($name, 'userlogins', 'sendmail')
+        ) {
+            $log_dir = self::$instance->get_user_log_dir();
+            if (empty($log_dir) && $name !== 'errors') {
+                return false;
+            }
+        }
+
         if ($log_driver == 'syslog') {
             $prio = $name == 'errors' ? LOG_ERR : LOG_INFO;
             return syslog($prio, $line);
@@ -1330,17 +1341,6 @@
 
         $line = sprintf("%s: %s\n", $date, $line);
 
-        // per-user logging is activated
-        if (self::$instance && self::$instance->config->get('per_user_logging')
-            && self::$instance->get_user_id()
-            && !in_array($name, 'userlogins', 'sendmail')
-        ) {
-            $log_dir = self::$instance->get_user_log_dir();
-            if (empty($log_dir) && $name !== 'errors') {
-                return false;
-            }
-        }
-
         if (empty($log_dir)) {
             if (!empty($log'dir')) {
                 $log_dir = $log'dir';
@@ -1497,7 +1497,10 @@
      */
     public static function debug($engine, $data, $result = null)
     {
-        static $debug_counter = 0;
+        static $debug_counter = ;
+        if (empty($debug_counter$engine)) {
+            $debug_count$engine = 0;
+        }
 
         $line = '' . (++$debug_counter$engine) . ' ' . $data;

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube_washtml.php Changed

@@ -424,17 +424,18 @@
                 return $this->config'blocked_src';
             }
         }
-        else if ($is_image && preg_match('/^data:image\/(^,+),(.+)$/i', $uri, $matches)) { // RFC2397
+        else if ($is_image && preg_match('/^data:image\/(^,+),(.+)$/is', $uri, $matches)) { // RFC2397
+            $type = preg_replace('/\s/', '', $matches1);
+
             // svg images can be insecure, we'll sanitize them
-            if (stripos($matches1, 'svg') !== false) {
+            if (stripos($type, 'svg') !== false) {
                 $svg = $matches2;
 
-                if (stripos($matches1, ';base64') !== false) {
-                    $svg  = base64_decode($svg);
-                    $type = $matches1;
+                if (stripos($type, ';base64') !== false) {
+                    $svg = base64_decode($svg);
                 }
                 else {
-                    $type = $matches1 . ';base64';
+                    $type .= ';base64';
                 }
 
                 $washer = new self($this->config);

roundcubemail-1.5.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip Changed

roundcubemail-1.5.tar.gz/tests/Framework/Washtml.php Changed

@@ -435,6 +435,24 @@
                 '<svg><script href="data:text/javascript,alert(1)" /><text x="20" y="20">XSS</text></svg>',
                 '<svg><text x="20" y="20">XSS</text></svg>'
             ,
+            
+                '<html><svg><use href="data:image/s vg+xml;base64,' // space
+                    . 'PHN2ZyBpZD0ieCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4gPGltYWdlIGhy'
+                    . 'ZWY9IngiIG9uZXJyb3I9ImFsZXJ0KCcxJykiLz48L3N2Zz4=#x"></svg></html>',
+                '<svg xmlns="http://www.w3.org/1999/xhtml"><use x-washed="href"></use></svg>'
+            ,
+            
+                '<html><svg><use href="data:image/s' . "\n" . 'vg+xml;base64,' // new-line
+                    . 'PHN2ZyBpZD0ieCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4gPGltYWdlIGhy'
+                    . 'ZWY9IngiIG9uZXJyb3I9ImFsZXJ0KCcxJykiLz48L3N2Zz4=#x"></svg></html>',
+                '<svg xmlns="http://www.w3.org/1999/xhtml"><use x-washed="href"></use></svg>'
+            ,
+            
+                '<html><svg><use href="data:image/s	vg+xml;base64,' // tab
+                    . 'PHN2ZyBpZD0ieCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4gPGltYWdlIGhy'
+                    . 'ZWY9IngiIG9uZXJyb3I9ImFsZXJ0KCcxJykiLz48L3N2Zz4=#x"></svg></html>',
+                '<svg xmlns="http://www.w3.org/1999/xhtml"><use x-washed="href"></use></svg>'
+            ,
         ;
     }

roundcubemail-1.5.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit7cee83eab9be0d556f643c9530dc4d9f
+class ComposerAutoloaderInit3bdaf762787612e1c050db87f9061724
 {
     private static $loader;
 
@@ -24,20 +24,20 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit7cee83eab9be0d556f643c9530dc4d9f', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit3bdaf762787612e1c050db87f9061724', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit7cee83eab9be0d556f643c9530dc4d9f', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit3bdaf762787612e1c050db87f9061724', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit7cee83eab9be0d556f643c9530dc4d9f::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit3bdaf762787612e1c050db87f9061724::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit7cee83eab9be0d556f643c9530dc4d9f::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit3bdaf762787612e1c050db87f9061724::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
                 $GLOBALS'__composer_autoload_files'$fileIdentifier = true;

roundcubemail-1.5.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit7cee83eab9be0d556f643c9530dc4d9f
+class ComposerStaticInit3bdaf762787612e1c050db87f9061724
 {
     public static $files = array (
         '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
@@ -1145,11 +1145,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit7cee83eab9be0d556f643c9530dc4d9f::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit7cee83eab9be0d556f643c9530dc4d9f::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit7cee83eab9be0d556f643c9530dc4d9f::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit7cee83eab9be0d556f643c9530dc4d9f::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit7cee83eab9be0d556f643c9530dc4d9f::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit3bdaf762787612e1c050db87f9061724::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit3bdaf762787612e1c050db87f9061724::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit3bdaf762787612e1c050db87f9061724::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit3bdaf762787612e1c050db87f9061724::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit3bdaf762787612e1c050db87f9061724::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.tar.gz/vendor/composer/installed.json Changed

@@ -2307,24 +2307,27 @@
         },
         {
             "name": "pear/net_ldap2",
-            "version": "v2.2.1",
-            "version_normalized": "2.2.1.0",
+            "version": "v2.3.0",
+            "version_normalized": "2.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_LDAP2.git",
-                "reference": "0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1"
+                "reference": "6eae6d20533469ffe1c01684923cd09f0fae3b77"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1",
-                "reference": "0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1",
+                "url": "https://api.github.com/repos/pear/Net_LDAP2/zipball/6eae6d20533469ffe1c01684923cd09f0fae3b77",
+                "reference": "6eae6d20533469ffe1c01684923cd09f0fae3b77",
                 "shasum": ""
             },
             "require": {
                 "ext-ldap": "*",
                 "pear/pear-core-minimal": "^1.10.1"
             },
-            "time": "2023-02-08T07:25:31+00:00",
+            "require-dev": {
+                "phpunit/phpunit": "^9 || ^10.3"
+            },
+            "time": "2023-10-12T20:00:01+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3044,17 +3047,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.36",
-            "version_normalized": "1.10.36.0",
+            "version": "1.10.40",
+            "version_normalized": "1.10.40.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ffa3089511121a672e62969404e4fddc753f9b15"
+                "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ffa3089511121a672e62969404e4fddc753f9b15",
-                "reference": "ffa3089511121a672e62969404e4fddc753f9b15",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/93c84b5bf7669920d823631e39904d69b9c7dc5d",
+                "reference": "93c84b5bf7669920d823631e39904d69b9c7dc5d",
                 "shasum": ""
             },
             "require": {
@@ -3063,7 +3066,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2023-09-29T14:07:45+00:00",
+            "time": "2023-10-30T14:48:31+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"

roundcubemail-1.5.tar.gz/vendor/composer/installed.php Changed

@@ -3,7 +3,7 @@
         'name' => 'roundcube/roundcubemail',
         'pretty_version' => 'dev-dev/kolab-1.5',
         'version' => 'dev-dev/kolab-1.5',
-        'reference' => 'e738d5400d458b376b6c97779dc50f2e8571c6d6',
+        'reference' => '159a74af5d090273bd851564a84fdb5d672c5939',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -402,9 +402,9 @@
             'dev_requirement' => false,
         ),
         'pear/net_ldap2' => array(
-            'pretty_version' => 'v2.2.1',
-            'version' => '2.2.1.0',
-            'reference' => '0cbfdadca4b55cb7543ad0a6b994fe0e4ed5c3c1',
+            'pretty_version' => 'v2.3.0',
+            'version' => '2.3.0.0',
+            'reference' => '6eae6d20533469ffe1c01684923cd09f0fae3b77',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/net_ldap2',
             'aliases' => array(),
@@ -510,9 +510,9 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.36',
-            'version' => '1.10.36.0',
-            'reference' => 'ffa3089511121a672e62969404e4fddc753f9b15',
+            'pretty_version' => '1.10.40',
+            'version' => '1.10.40.0',
+            'reference' => '93c84b5bf7669920d823631e39904d69b9c7dc5d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -641,7 +641,7 @@
         'roundcube/roundcubemail' => array(
             'pretty_version' => 'dev-dev/kolab-1.5',
             'version' => 'dev-dev/kolab-1.5',
-            'reference' => 'e738d5400d458b376b6c97779dc50f2e8571c6d6',
+            'reference' => '159a74af5d090273bd851564a84fdb5d672c5939',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@843654059acb.(none)> 1696238858 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@843654059acb.(none)> 1696238858 +0000	checkout: moving from master to master
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@843654059acb.(none)> 1696238858 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01
+0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@7025c5aefd5c.(none)> 1699024617 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@7025c5aefd5c.(none)> 1699024617 +0000	checkout: moving from master to master
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@7025c5aefd5c.(none)> 1699024617 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-5071ce79d8f518d56d4d77de8369f7db5a79f91d.idx Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-5071ce79d8f518d56d4d77de8369f7db5a79f91d.pack Deleted

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-63ac381987bf4319475685c9d064dec7bd27f419.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-63ac381987bf4319475685c9d064dec7bd27f419.pack Added

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/.gitignore Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/.travis.yml Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/Net/LDAP2.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/Net/LDAP2/Entry.php Changed

@@ -151,7 +151,7 @@
         parent::__construct('Net_LDAP2_Error');
 
         // set up entry resource or DN
-        if (is_resource($entry)) {
+        if (is_resource($entry) || $entry instanceof \LDAP\ResultEntry) {
             $this->_entry = $entry;
         } else {
             $this->_dn = $entry;
@@ -161,7 +161,7 @@
         if ($ldap instanceof Net_LDAP2) {
             $this->_ldap = $ldap;
             $this->_link = $ldap->getLink();
-        } elseif (is_resource($ldap)) {
+        } elseif (is_resource($ldap) || $ldap instanceof \LDAP\Connection) {
             $this->_link = $ldap;
         } elseif (is_array($ldap)) {
             // Special case: here $ldap is an array of attributes,
@@ -173,7 +173,9 @@
 
         // if this is an entry existing in the directory,
         // then set up as old and fetch attrs
-        if (is_resource($this->_entry) && is_resource($this->_link)) {
+        if ((is_resource($this->_entry) || $this->_entry instanceof \LDAP\ResultEntry)
+            && (is_resource($this->_link) || $this->_link instanceof \LDAP\Connection)
+        ) {
             $this->_new = false;
             $this->_dn  = @ldap_get_dn($this->_link, $this->_entry);
             $this->setAttributes();  // fetch attributes from server
@@ -235,7 +237,7 @@
         if (!$ldap instanceof Net_LDAP2) {
             return PEAR::raiseError("Unable to create connected entry: Parameter \$ldap needs to be a Net_LDAP2 object!");
         }
-        if (!is_resource($entry)) {
+        if (!is_resource($entry) && !$entry instanceof \LDAP\ResultEntry) {
             return PEAR::raiseError("Unable to create connected entry: Parameter \$entry needs to be a ldap entry resource!");
         }
 
@@ -354,7 +356,10 @@
         /*
         * fetch attributes from the server
         */
-        if (is_null($attributes) && is_resource($this->_entry) && is_resource($this->_link)) {
+        if (is_null($attributes)
+            && (is_resource($this->_entry) || $this->_entry instanceof \LDAP\ResultEntry)
+            && (is_resource($this->_link) || $this->_link instanceof \LDAP\Connection)
+        ) {
             // fetch schema
             if ($this->_ldap instanceof Net_LDAP2) {
                 $schema = $this->_ldap->schema();
@@ -768,7 +773,7 @@
 
         // Get and check link
         $link = $ldap->getLink();
-        if (!is_resource($link)) {
+        if (!is_resource($link) && !$link instanceof \LDAP\Connection) {
             return PEAR::raiseError("Could not update entry: internal LDAP link is invalid");
         }

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/Net/LDAP2/Search.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/package.xml Changed

@@ -26,9 +26,9 @@
     </lead>
 
     
-    <date>2023-02-23</date>
+    <date>2023-10-12</date>
     <version>
-        <release>2.2.1</release>
+        <release>2.3.0</release>
         <api>2.2.0</api>
     </version>
     <stability>
@@ -37,7 +37,9 @@
     </stability>
     <license>LGPLv3 License</license>
     <notes>
-     * Fix: remove unused $ber property
+     * Support PHP 8.1
+     * Fix unit tests on PHP 8.0.29
+     * Make tests compatible with PHPUnit 9
     </notes>
     <contents>
         <dir name="/">
@@ -527,7 +529,7 @@
 * New constructor factory for Entry objects: createExisting()
 * Several small improvements
 * New method Entry-&gt;isNew()
-* Net_LDAP2-&gt;search() and Net_LDAP2-&gt;dnExists() can handle entry objects now 
+* Net_LDAP2-&gt;search() and Net_LDAP2-&gt;dnExists() can handle entry objects now
 * Added &quot;present&quot; matching rule as stated by RFC 2254 (is an alias of the former &quot;any&quot;)
 * Bugfix in filter class for approx matching and not combination
 * Bugfix for Schema-&gt;isBinary() bug if unknown attribute type is requested
@@ -873,5 +875,22 @@
      * Improve unit tests
     </notes>
   </release>
+
+  <release>
+    <date>2023-02-23</date>
+    <version>
+        <release>2.2.1</release>
+        <api>2.2.0</api>
+    </version>
+    <stability>
+        <release>stable</release>
+        <api>stable</api>
+    </stability>
+    <license>LGPLv3 License</license>
+    <notes>
+     * Fix: remove unused $ber property
+    </notes>
+  </release>
+
  </changelog>
 </package>

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2Test.php Changed

@@ -18,20 +18,11 @@
      *
      * @access protected
      */
-    protected function setUp() {
+    protected function setUp(): void {
         $this->ldapcfg = $this->getTestConfig();
     }
 
     /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
      * This checks if a valid LDAP testconfig is present and loads it.
      *
      * If so, it is loaded and returned as array. If not, false is returned.
@@ -325,6 +316,10 @@
                     'postalAddress'   => 'someAddress',
                     'facsimileTelephoneNumber' => array('123','456')
                 ));
+
+            //remove data from previously failed test
+            $ldap->delete($local_entry->dn());
+
             $this->assertTrue($ldap->add($local_entry));
             $this->assertTrue($ldap->dnExists($local_entry->dn()));
 
@@ -415,6 +410,12 @@
                     'objectClass' => array('top','organizationalUnit'),
                     'ou' => 'Net_LDAP2_Test_search2'
                 ));
+
+            //remove data from previously failed test
+            $ldap->delete($ou1_1->dn());
+            $ldap->delete($ou1->dn());
+            $ldap->delete($ou2->dn());
+
             $this->assertTrue($ldap->add($ou1));
             $this->assertTrue($ldap->dnExists($ou1->dn()));
             $this->assertTrue($ldap->add($ou1_1));
@@ -647,6 +648,14 @@
                     'objectClass' => array('top','organizationalUnit'),
                     'ou' => 'target_otherdir'
                 ));
+
+            //remove data from previously failed test
+            $ldap->delete($ou_1_l1->dn());
+            $ldap->delete($ou_1->dn());
+            $ldap->delete($ou_2->dn());
+            $ldap->delete($ou_3->dn());
+            $ldap->delete($ou->dn());
+
             $this->assertTrue($ldap->add($ou));
             $this->assertTrue($ldap->add($ou_1));
             $this->assertTrue($ldap->add($ou_1_l1));
@@ -855,7 +864,12 @@
             $this->markTestSkipped('No ldapconfig.ini found. Skipping test!');
         } else {
             $ldap = $this->connect();
-            $this->assertTrue(is_resource($ldap->getLink()));
+
+            if (version_compare(PHP_VERSION, '8.1.0', '<')) {
+                $this->assertTrue(is_resource($ldap->getLink()));
+            } else {
+                $this->assertInstanceOf(\LDAP\Connection::class, $ldap->getLink());
+            }
         }
     }
 
@@ -878,6 +892,9 @@
                 'cn'          => $cn
             );
 
+            //remove data from previously failed test
+            $ldap->delete($dn);
+
             // Test case
             $entry = Net_LDAP2_Entry::createFresh($dn, $data);
             $this->assertInstanceOf('Net_LDAP2_Entry', $entry);
@@ -885,7 +902,7 @@
             $this->assertTrue( $ldap->add($entry) );
             $this->assertTrue( $entry->replace(array('uid' => 'Foo Bar')) );
             $this->assertTrue( $result = $entry->update() );
-    
+
             // cleanup
             $this->assertTrue($ldap->delete($entry),
                     'Cleanup of test entry failed. Please remove manually: '.$entry->dn());

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_EntryTest.php Changed

@@ -34,20 +34,11 @@
      *
      * @access protected
      */
-    protected function setUp() {
+    protected function setUp(): void {
         $this->ldapcfg = $this->getTestConfig();
     }
 
     /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
      * This checks if a valid LDAP testconfig is present and loads it.
      *
      * If so, it is loaded and returned as array. If not, false is returned.
@@ -112,7 +103,7 @@
         $this->assertTrue(Net_LDAP2::isError($t), 'Creating fresh entry succeeded but was supposed to fail!');
 
         // test failing creation
-        $t = Net_LDAP2_Entry::createFresh("cn=test", 
+        $t = Net_LDAP2_Entry::createFresh("cn=test",
             array(
                 'attr1' => 'single',
                 'attr2' => array('mv1', 'mv2')
@@ -190,7 +181,7 @@
                 'attr2' => array('mv1', 'mv2')
                 )
         );
-    
+
         // test default behavior
         $this->assertEquals('single', $entry->getValue('attr1'));
         $this->assertEquals(array('mv1', 'mv2'), $entry->getValue('attr2'));

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_FilterTest.php Changed

@@ -26,24 +26,6 @@
     }
 
     /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     */
-    protected function setUp() {
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
      * This tests the perl compatible creation of filters through parsing of an filter string
      */
     public function testCreatePerlCompatible() {
@@ -144,7 +126,7 @@
             $filter = Net_LDAP2_Filter::create($testattr, $match, $testval, false);
 
             $this->assertInstanceOf('Net_LDAP2_Filter', $filter);
-            $this->assertRegExp($regex, $filter->asString(), "Filter generation failed for MatchType: $match");
+            $this->assertMatchesRegularExpression($regex, $filter->asString(), "Filter generation failed for MatchType: $match");
         }
 
         // test creating failure
@@ -392,10 +374,10 @@
                 'height'         => '120',
                 'mail'           => 'bart@iHateSchool.com',
                 'objectClass'    => array('top', 'person', 'inetOrgPerson', 'myFancyTestClass'),
-                )   
+                )
         );
         $entry3 = Net_LDAP2_Entry::createFresh('cn=Brockman Kent,l=springfield,c=usa',
-            array(      
+            array(
                 'cn'             => 'Brockman Kent',
                 'sn'             => 'Brockman',
                 'givenName'      => 'Kent',
@@ -404,7 +386,7 @@
                 'height'         => '185',
                 'mail'           => 'kent.brockman@channel6.com',
                 'objectClass'    => array('top', 'person', 'inetOrgPerson', 'myFancyTestClass'),
-                )   
+                )
         );
 
         $allEntries = array($entry1, $entry2, $entry3);
@@ -455,7 +437,7 @@
 	$filterresult = array();
 	$this->assertEquals(1, $filter->matches($allEntries, $filterresult));
 	$this->assertEquals($entry1->dn(), array_shift($filterresult)->dn(), "Filtered entry does not equal expected entry! filter='".$filter->asString()."'");
-	
+
 	$filter = Net_LDAP2_Filter::combine('not', $filter); // all but homer consume donuts
         $this->assertEquals(count($allEntries)-1, $filter->matches($allEntries, $filterresult), "Filtered entry does not equal expected entry! filter='".$filter->asString()."'");
 
@@ -465,7 +447,7 @@
         $this->assertEquals(2, $filter->matches($allEntries, $filterresult));
         $this->assertEquals($entry2->dn(), array_shift($filterresult)->dn(), "Filtered entry does not equal expected entry! filter='".$filter->asString()."'");
         $this->assertEquals($entry3->dn(), array_shift($filterresult)->dn(), "Filtered entry does not equal expected entry! filter='".$filter->asString()."'");
-        
+
         // OR combination test
         $filter1 = Net_LDAP2_Filter::create('sn', 'equals', 'Simpson');
         $filter2 = Net_LDAP2_Filter::create('givenName', 'equals', 'Kent');
@@ -493,7 +475,7 @@
         $filterresult = array();
         $this->assertEquals(1, $filter_final->matches($allEntries, $filterresult)); // should leave only kent
         $this->assertEquals($entry3->dn(), array_shift($filterresult)->dn(), "Filtered entry does not equal expected entry! filter='".$filter_final->asString()."'");
-        
+
         // TODO: Further tests for >, <, >=, <= and ~=, when they are implemented.
         // ...until then: negative testing for those cases
         foreach (array('>', '<', '>=', '<=', '~=') as $to) {

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_LDIFTest.php Changed

@@ -100,7 +100,7 @@
      *
      * @access protected
      */
-    protected function setUp() {
+    protected function setUp(): void {
         // initialize test entries
         $this->testentries = array();
         foreach ($this->testentries_data as $dn => $attrs) {
@@ -120,7 +120,7 @@
      *
      * @access protected
      */
-    protected function tearDown() {
+    protected function tearDown(): void {
 	// uncomment this if you debug the test cases so you will have output available
 	if (file_exists($this->outfile)) @unlink($this->outfile);
     }
@@ -174,12 +174,15 @@
 
         // writing to existing file but without permission
         // note: chmod should succeed since we do that in setUp()
-        if (chmod($this->outfile, 0444)) {
+        if (!chmod($this->outfile, 0444)) {
+            $this->markTestSkipped("Could not chmod ".$this->outfile.", write test without permission skipped");
+        } else if (stat($this->outfile)'uid' === 0) {
+            $this->markTestSkipped("Running as root breaks this test");
+
+        } else {
             $ldif = new Net_LDAP2_LDIF($this->outfile, 'w', $this->defaultConfig);
             $this->assertNull($ldif->handle());
             $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
-        } else {
-            $this->markTestSkipped("Could not chmod ".$this->outfile.", write test without permission skipped");
         }
     }
 
@@ -420,7 +423,7 @@
         $this->assertFalse((boolean)$ldif->error(), 'Failed writing entry to '.$this->outfile.': '.$ldif->error(true));
         $ldif->done();
         $this->assertEquals(0, filesize($this->outfile));
-   
+
     }
 
     /**
@@ -551,8 +554,8 @@
         $ldif = new Net_LDAP2_LDIF(dirname(__FILE__).'/some_not_existing/path/for/net_ldap_ldif', 'r', $this->defaultConfig);
         $this->assertTrue((boolean)$ldif->error());
         $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
-        $this->assertInternalType('string', $ldif->error(true));
-        $this->assertInternalType('int', $ldif->error_lines());
+        $this->assertIsString($ldif->error(true));
+        $this->assertIsInt($ldif->error_lines());
         $this->assertThat(strlen($ldif->error(true)), $this->greaterThan(0));
 
         // Test for line number reporting

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_RootDSETest.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_SearchTest.php Changed

@@ -19,20 +19,11 @@
      *
      * @access protected
      */
-    protected function setUp() {
+    protected function setUp(): void {
         $this->ldapcfg = $this->getTestConfig();
     }
 
     /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
      * This checks if a valid LDAP testconfig is present and loads it.
      *
      * If so, it is loaded and returned as array. If not, false is returned.
@@ -257,6 +248,11 @@
                     'objectClass' => array('top','organizationalUnit'),
                     'ou' => 'Net_LDAP2_Test_search2'
                 ));
+
+            //remove data from previously failed test
+            $ldap->delete($ou1->dn());
+            $ldap->delete($ou2->dn());
+
             $this->assertTrue($ldap->add($ou1));
             $this->assertTrue($ldap->dnExists($ou1->dn()));
             $this->assertTrue($ldap->add($ou2));

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_TestBase.php Changed

roundcubemail-1.5.tar.gz/vendor/pear/net_ldap2/tests/Net_LDAP2_UtilTest.php Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar.asc Changed

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmUW2hQACgkQUcZzBf/C
-5cAX+g/8DLEpwgjbRjXNPaPoL9y2lbhYuOAkFuTLElmFTNRvmUgOrqI3pGdfWves
-tFCRVdzefPnbi8PX7Y0u14bKY/YieSgeXEwqaZfllPdan7TJ7gdu8ZvOxZeiOvT5
-Ns7Bnn7F+TyK7Z9gFn9pSt4bopLXgoGM3Xw4yg//HWQIb2gYzP/OEUwzF6vj1N88
-x7GyXKhuNClh8DOYLPdw/Mp5C+Z4wEqUpxFFZ6nMZN239gOC4kxz2IfbMj1Lb1jR
-5diFq+lAB9IfmqlRqJnlkRDmM3jt6G6+i4YNIdk8iRN3ppMJWT0Ck9cSiRSPhImB
-n/fo4AA+fhomI6aXBECmYRud78ul0nm411KVM+a/cCnVD9nYrab6eC3K6KBeuWOw
-2SNTdKSY+Al5y6mwjwzLCwrOLR7WxCTMkdO8pcbCj62IuKKyxWtS4xI/oxZE+z1S
-2o4arkHhv103JQiF9NkbRWnUQakt2IhjWDjZmz051jMjijHfSW3j4WpZ8sjwk5mY
-GKO/jQMgJ0M/4h46q+pFawMljBgK+7ECHF1nEAuoF2e+5v8VJ+XRJ+VC6rdvjQWC
-StcsiFDznyRJgosaOePn39mLt6E0wOBc6Ko8OIoBrSDP7l5Wh+H6yIzpCiPLCm9C
-8sx9U+LB0Jt+BHpWYReQcHrdbek5H7Iu4h8s/F8YYZFEeI0O9tc=
-=Y8DE
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmU/wiIACgkQUcZzBf/C
+5cDbeBAAiwQEFnINJduTQistDV26nLEL75Ms7w0iuE8hfN6H/siKz1TbGWv9BK1l
+rZNIS/Mq7W54uLw2O6OSPegr0mq8pb9ad4hNgm/y6zNj1/xbgGU/t6LHfkIAmal9
+AILBGDXcq7Y7i7tWNUV73Vq/PkYAT7TnVe/25NnKFrX52o/YeXPybSn5cUZfBT6Q
+nXnbI5ZbNMgNBifMdOwW5NodWJzV+OMKnBdZ1h9aUCXplv62YipPX5ymvINpIDON
+K7z0YIWyGAvooooFCe0fgH/p64dLtYQubzosAmhmR9s/3PINtewYbokIOpXX9dY5
+7qBCC6hwW3J2AgqUEZI177YOoTNYZSXb67B8lDwJHI3kXkTndwHGBMkaKhurXdDx
+LsJIJ2skxlv++zLgWUDo2l9mQlkbkIWJolYk/icTssFzlDDzledIRE7YIipV8tzj
+0nifLKBSpOEVNP4nAvpJUoFwz2/yHWP7k7ZhEWMNE5f5ZOfWtrbMeV6hVCYdjG1/
+OBa25P6fTzAwDw/b5f/3an663Qrs6rAlx4yc6MYEwhjwrDfMGUFToWTvc/86Xc0A
+u1flNlRL+PNjUFybNQG+gRAlZ8u+8I5tfhKdQiIas1P+lnZNyPLaMvupdEHMvtrh
+Vtbg3YueGQkl6MKdPTriTqYJLXpEQK6GuyXYG9q0WNCbqNYY/R0=
+=wm65
 -----END PGP SIGNATURE-----

Changes of Revision 22