* Composer update

* Fix library name typo in composer.json
nilsteampassnet · Nov 23, 2024 · 260d607 · 260d607
1 parent 4526a36
commit 260d607
Show file tree

Hide file tree

Showing 72 changed files with 847 additions and 703 deletions.
diff --git a/composer.json b/composer.json
@@ -126,6 +126,13 @@
             "options": {
                 "symlink": false
             }
+        },
+        {
+            "type": "path",
+            "url": "includes/libraries/teampassclasses/folderservices",
+            "options": {
+                "symlink": false
+            }
         }
     ],
     "require": {
@@ -149,7 +156,7 @@
         "teampassclasses/oauth2controller": "dev-master",
         "teampassclasses/configmanager": "dev-master",
         "teampassclasses/emailservice": "dev-master",
-        "teampassclasses/FolderServices": "dev-master",
+        "teampassclasses/folderservices": "dev-master",
         "illuminate/contracts": "^10.32",
         "illuminate/collections": "^10.48",
         "nesbot/carbon": "^2.71",

diff --git a/composer.lock b/composer.lock
diff --git a/includes/config/include.php b/includes/config/include.php
@@ -28,7 +28,7 @@
 
 define('TP_VERSION', '3.1.2');
 define("UPGRADE_MIN_DATE", "1732264740");
-define('TP_VERSION_MINOR', '166');
+define('TP_VERSION_MINOR', '167');
 define('TP_TOOL_NAME', 'Teampass');
 define('TP_ONE_DAY_SECONDS', 86400);
 define('TP_ONE_WEEK_SECONDS', 604800);

diff --git a/vendor/bjeavons/zxcvbn-php/.github/workflows/ci.yml b/vendor/bjeavons/zxcvbn-php/.github/workflows/ci.yml
diff --git a/vendor/bjeavons/zxcvbn-php/composer.json b/vendor/bjeavons/zxcvbn-php/composer.json
@@ -19,7 +19,8 @@
     "require-dev": {
         "phpunit/phpunit": "^8.5",
         "php-coveralls/php-coveralls": "*",
-        "squizlabs/php_codesniffer": "3.*"
+        "squizlabs/php_codesniffer": "3.*",
+        "phpstan/phpstan": "^2.0"
     },
     "suggest": {
         "ext-gmp": "Required for optimized binomial calculations (also requires PHP >= 7.3)"

diff --git a/vendor/bjeavons/zxcvbn-php/phpstan.neon b/vendor/bjeavons/zxcvbn-php/phpstan.neon
@@ -0,0 +1,5 @@
+parameters:
+	level: 0
+	paths:
+		- src
+		- test
diff --git a/vendor/bjeavons/zxcvbn-php/src/Matchers/BaseMatch.php b/vendor/bjeavons/zxcvbn-php/src/Matchers/BaseMatch.php
@@ -4,7 +4,6 @@
 
 namespace ZxcvbnPhp\Matchers;
 
-use JetBrains\PhpStorm\ArrayShape;
 use ZxcvbnPhp\Math\Binomial;
 use ZxcvbnPhp\Scorer;
 
@@ -48,10 +47,8 @@ public function __construct(string $password, int $begin, int $end, string $toke
      *
      * @param  bool $isSoleMatch
      *   Whether this is the only match in the password
-     * @return array
-     *   Associative array with warning (string) and suggestions (array of strings)
+     * @return array{'warning': string, "suggestions": string[]}
      */
-    #[ArrayShape(['warning' => 'string', 'suggestions' => 'string[]'])]
     abstract public function getFeedback(bool $isSoleMatch): array;
 
     /**