diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/package-lock.json | 57 | ||||
-rw-r--r-- | build/package.json | 2 | ||||
-rw-r--r-- | build/psalm-baseline.xml | 15 |
3 files changed, 29 insertions, 45 deletions
diff --git a/build/package-lock.json b/build/package-lock.json index b11fc596287..5e9ba07ae73 100644 --- a/build/package-lock.json +++ b/build/package-lock.json @@ -198,19 +198,12 @@ "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", "dev": true }, - "@types/bluebird": { - "version": "3.5.30", - "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.30.tgz", - "integrity": "sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==", - "dev": true - }, "@types/karma": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@types/karma/-/karma-4.4.0.tgz", - "integrity": "sha512-+b5BsyqXBHRqw7UxzTjQNgj5hjJPAIfWQyLebTOsDrWQVJCghc5j5+U9hbRayc2qfrG07FqDi9m5s3aJ4XNRcA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@types/karma/-/karma-5.0.0.tgz", + "integrity": "sha512-5quuLnxdJWkzJCEwFatOClM6O7EkeDWfXltGySb01LQnBVjtbLzIky9JLW0IKt+JfzurUjwj7b7Sb/Omsx4QYA==", "dev": true, "requires": { - "@types/bluebird": "*", "@types/node": "*", "log4js": "^4.0.0" }, @@ -302,9 +295,9 @@ } }, "@types/node": { - "version": "13.9.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.5.tgz", - "integrity": "sha512-hkzMMD3xu6BrJpGVLeQ3htQQNAcOrJjX7WFmtK8zWQpz2UJf13LCFF2ALA7c9OVdvc2vQJeDdjfR35M0sBCxvw==", + "version": "14.6.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.4.tgz", + "integrity": "sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==", "dev": true }, "abbrev": { @@ -1402,12 +1395,6 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, - "eventemitter3": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", - "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==", - "dev": true - }, "expand-braces": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz", @@ -2564,14 +2551,22 @@ } }, "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "^3.0.0", + "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" + }, + "dependencies": { + "eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + } } }, "http-signature": { @@ -3144,9 +3139,9 @@ } }, "jsonschema": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.5.tgz", - "integrity": "sha512-kVTF+08x25PQ0CjuVc0gRM9EUPb0Fe9Ln/utFOgcdxEIOHuU7ooBk/UPTd7t1M91pP35m0MU1T8M5P7vP1bRRw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.6.tgz", + "integrity": "sha512-SqhURKZG07JyKKeo/ir24QnS4/BV7a6gQy93bUSe4lUdNp0QNpIz2c9elWJQ9dpc5cQYY6cvCzgRwy0MQCLyqA==", "dev": true }, "jsprim": { @@ -3262,13 +3257,13 @@ } }, "karma-viewport": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/karma-viewport/-/karma-viewport-1.0.6.tgz", - "integrity": "sha512-pDKvcpBxOH5sYbg9018U554cvmxBH+BxQJ7zqDpvDre6xzpSauEOVldBJ8fgDwsRIYZoFYa8qZ1mGjYRtRVKvA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/karma-viewport/-/karma-viewport-1.0.7.tgz", + "integrity": "sha512-4JDYvu9IGSs+JhaHNLorhI8cv7LDytHzVWxnXCm0WLku+/xAgqmWtqf+osCjKaI9wyBuF3dJiOKx9dKpa6boEw==", "dev": true, "requires": { - "@types/karma": "^4.4.0", - "jsonschema": "^1.2.5" + "@types/karma": "^5.0.0", + "jsonschema": "^1.2.6" } }, "kew": { diff --git a/build/package.json b/build/package.json index 03b5baf3448..76f1035752e 100644 --- a/build/package.json +++ b/build/package.json @@ -21,7 +21,7 @@ "karma-jasmine-sinon": "^1.0.4", "karma-junit-reporter": "^1.2.0", "karma-phantomjs-launcher": "^1.0.4", - "karma-viewport": "^1.0.6", + "karma-viewport": "^1.0.7", "node-sass": "~4.14.1", "phantomjs-prebuilt": "*", "sinon": "<= 5.0.7" diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 61363d5db91..b71de1117db 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<files psalm-version="3.14.2@3538fe1955d47f6ee926c0769d71af6db08aa488"> +<files psalm-version="3.15@de6e7f324f44dde540ebe7ebd4eb481b97c86f30"> <file src="3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Connection.php"> <ImplementedReturnTypeMismatch occurrences="1"> <code>string|null</code> @@ -2196,9 +2196,6 @@ </InvalidArgument> </file> <file src="apps/settings/lib/Controller/UsersController.php"> - <InvalidArgument occurrences="1"> - <code>'OC\Settings\Users::loadAdditionalScripts'</code> - </InvalidArgument> <UndefinedInterfaceMethod occurrences="3"> <code>countUsersOfGroups</code> <code>countDisabledUsersOfGroups</code> @@ -2701,7 +2698,7 @@ <code>null</code> <code>null</code> </InvalidReturnType> - <InvalidScalarArgument occurrences="17"> + <InvalidScalarArgument occurrences="15"> <code>$this->connection->ldapQuotaAttribute</code> <code>$this->connection->ldapUserDisplayName</code> <code>$this->connection->ldapUserDisplayName2</code> @@ -2714,8 +2711,6 @@ <code>$this->access->connection->homeFolderNamingRule</code> <code>true</code> <code>1</code> - <code>time()</code> - <code>86400</code> <code>$emailAttribute</code> <code>$quotaAttribute</code> <code>$this->connection->ldapExtStorageHomeAttribute</code> @@ -2793,7 +2788,6 @@ </file> <file src="apps/user_status/lib/Db/UserStatusMapper.php"> <ImplicitToStringCast occurrences="2"> - <code>$qb->createNamedParameter(['online', 'away'], IQueryBuilder::PARAM_STR_ARRAY)</code> <code>$qb->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)</code> </ImplicitToStringCast> <MoreSpecificImplementedParamType occurrences="1"/> @@ -3971,11 +3965,6 @@ <code>dispatch</code> </TooManyArguments> </file> - <file src="lib/private/Federation/CloudIdManager.php"> - <RedundantCondition occurrences="1"> - <code>$pos !== false</code> - </RedundantCondition> - </file> <file src="lib/private/Files/Cache/Cache.php"> <ImplicitToStringCast occurrences="3"> <code>$builder->createNamedParameter($value)</code> |