Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-10 10:26:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Minor fixes.

Browse Source 
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2022-06-25 10:47:04 +02:00
parent ffae1d9426
commit 8a75c0e36e
5 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/modules/web/Controllers/Helpers/Account/AccountHelper.php
View File

@@ -4,7 +4,7 @@
*
* @author nuxsmin
* @link https://syspass.org
* @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
* @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
*
* This file is part of sysPass.
*
@@ -68,7 +68,6 @@ final class AccountHelper extends AccountHelperBase
{
use ItemTrait;
private Acl $acl;
private AccountServiceInterface $accountService;
private AccountHistoryServiceInterface $accountHistoryService;
private PublicLinkServiceInterface $publicLinkService;

2
app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php
View File

@@ -44,7 +44,7 @@ abstract class AccountHelperBase extends HelperBase
protected ?int $actionId = null;
protected AccountActionsHelper $accountActionsHelper;
protected bool $isView = false;
private Acl $acl;
protected Acl $acl;
private MasterPassServiceInterface $masterPassService;
public function __construct(

4
app/modules/web/Controllers/Items/AccountUserController.php → app/modules/web/Controllers/Items/AccountsUserController.php
View File

@@ -33,9 +33,9 @@ use SP\Mvc\Controller\SimpleControllerHelper;
use stdClass;
/**
* Class AccountUserController
* Class AccountsUserController
*/
final class AccountUserController extends SimpleControllerBase
final class AccountsUserController extends SimpleControllerBase
{
private AccountServiceInterface $accountService;

4
app/modules/web/Init.php
View File

@@ -66,7 +66,7 @@ use SP\Modules\Web\Controllers\Error\DatabaseConnectionController;
use SP\Modules\Web\Controllers\Error\DatabaseErrorController;
use SP\Modules\Web\Controllers\Error\IndexController as ErrorIndexController;
use SP\Modules\Web\Controllers\Install\InstallController;
use SP\Modules\Web\Controllers\Items\AccountUserController;
use SP\Modules\Web\Controllers\Items\AccountsUserController;
use SP\Modules\Web\Controllers\Items\CategoriesController;
use SP\Modules\Web\Controllers\Items\ClientsController;
use SP\Modules\Web\Controllers\Items\NotificationsController;
@@ -109,7 +109,7 @@ final class Init extends HttpModuleBase
* List of controllers that don't need to update the user's session activity
*/
private const NO_SESSION_ACTIVITY = [
AccountUserController::class,
AccountsUserController::class,
CategoriesController::class,
ClientsController::class,
NotificationsController::class,

73
composer.lock generated
View File

@@ -911,24 +911,24 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.5.7",
"version": "6.5.8",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "724562fa861e21a4071c652c8a159934e4f05592"
"reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/724562fa861e21a4071c652c8a159934e4f05592",
"reference": "724562fa861e21a4071c652c8a159934e4f05592",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
"reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
"shasum": ""
},
"require": {
"ext-json": "*",
"guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1",
"guzzlehttp/psr7": "^1.9",
"php": ">=5.5",
"symfony/polyfill-intl-idn": "^1.17.0"
"symfony/polyfill-intl-idn": "^1.17"
},
"require-dev": {
"ext-curl": "*",
@@ -1006,7 +1006,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/6.5.7"
"source": "https://github.com/guzzle/guzzle/tree/6.5.8"
},
"funding": [
{
@@ -1022,7 +1022,7 @@
"type": "tidelift"
}
],
"time": "2022-06-09T21:36:50+00:00"
"time": "2022-06-20T22:16:07+00:00"
},
{
"name": "guzzlehttp/promises",
@@ -1110,16 +1110,16 @@
},
{
"name": "guzzlehttp/psr7",
"version": "1.8.5",
"version": "1.9.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
"reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
"reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
"reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
"shasum": ""
},
"require": {
@@ -1140,7 +1140,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
"dev-master": "1.9-dev"
}
},
"autoload": {
@@ -1200,7 +1200,7 @@
],
"support": {
"issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/1.8.5"
"source": "https://github.com/guzzle/psr7/tree/1.9.0"
},
"funding": [
{
@@ -1216,7 +1216,7 @@
"type": "tidelift"
}
],
"time": "2022-03-20T21:51:18+00:00"
"time": "2022-06-20T21:43:03+00:00"
},
{
"name": "klein/klein",
@@ -2067,16 +2067,16 @@
},
{
"name": "phpmailer/phpmailer",
"version": "v6.6.2",
"version": "v6.6.3",
"source": {
"type": "git",
"url": "https://github.com/PHPMailer/PHPMailer.git",
"reference": "b52ed06864fdda81b82ec8bf564cf15d45ed4f95"
"reference": "9400f305a898f194caff5521f64e5dfa926626f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/b52ed06864fdda81b82ec8bf564cf15d45ed4f95",
"reference": "b52ed06864fdda81b82ec8bf564cf15d45ed4f95",
"url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9400f305a898f194caff5521f64e5dfa926626f3",
"reference": "9400f305a898f194caff5521f64e5dfa926626f3",
"shasum": ""
},
"require": {
@@ -2133,7 +2133,7 @@
"description": "PHPMailer is a full-featured email creation and transfer class for PHP",
"support": {
"issues": "https://github.com/PHPMailer/PHPMailer/issues",
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.2"
"source": "https://github.com/PHPMailer/PHPMailer/tree/v6.6.3"
},
"funding": [
{
@@ -2141,7 +2141,7 @@
"type": "github"
}
],
"time": "2022-06-14T09:27:21+00:00"
"time": "2022-06-20T09:21:02+00:00"
},
{
"name": "phpoption/phpoption",
@@ -4829,16 +4829,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.20",
"version": "9.5.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
"reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
"reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
"shasum": ""
},
"require": {
@@ -4872,7 +4872,6 @@
"sebastian/version": "^3.0.2"
},
"require-dev": {
"ext-pdo": "*",
"phpspec/prophecy-phpunit": "^2.0.1"
},
"suggest": {
@@ -4916,7 +4915,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
},
"funding": [
{
@@ -4928,7 +4927,7 @@
"type": "github"
}
],
"time": "2022-04-01T12:37:26+00:00"
"time": "2022-06-19T12:14:25+00:00"
},
{
"name": "roave/security-advisories",
@@ -4936,12 +4935,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "0a2664d739af6996ce1a24a35cb59ed2bbd27f4b"
"reference": "880f953435f266cf634bb81fa8888e66fa7814f6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0a2664d739af6996ce1a24a35cb59ed2bbd27f4b",
"reference": "0a2664d739af6996ce1a24a35cb59ed2bbd27f4b",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/880f953435f266cf634bb81fa8888e66fa7814f6",
"reference": "880f953435f266cf634bb81fa8888e66fa7814f6",
"shasum": ""
},
"conflict": {
@@ -5082,7 +5081,7 @@
"gree/jose": "<=2.2",
"gregwar/rst": "<1.0.3",
"grumpydictator/firefly-iii": "<5.6.5",
"guzzlehttp/guzzle": "<6.5.7|>=7,<7.4.4",
"guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
"guzzlehttp/psr7": "<1.8.4|>=2,<2.1.1",
"helloxz/imgurl": "= 2.31|<=2.31",
"hillelcoren/invoice-ninja": "<5.3.35",
@@ -5114,6 +5113,7 @@
"kevinpapst/kimai2": "<1.16.7",
"kitodo/presentation": "<3.1.2",
"klaviyo/magento2-extension": ">=1,<3",
"krayin/laravel-crm": "<1.2.2",
"kreait/firebase-php": ">=3.2,<3.8.1",
"la-haute-societe/tcpdf": "<6.2.22",
"laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1",
@@ -5163,7 +5163,7 @@
"nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13",
"nilsteampassnet/teampass": "<=2.1.27.36",
"noumo/easyii": "<=0.9",
"nukeviet/nukeviet": "<4.3.4",
"nukeviet/nukeviet": "<4.5.2",
"nystudio107/craft-seomatic": "<3.4.12",
"nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1",
"october/backend": "<1.1.2",
@@ -5203,11 +5203,12 @@
"phpwhois/phpwhois": "<=4.2.5",
"phpxmlrpc/extras": "<0.6.1",
"pimcore/data-hub": "<1.2.4",
"pimcore/pimcore": "<10.4",
"pimcore/pimcore": "<10.4.4",
"pocketmine/bedrock-protocol": "<8.0.2",
"pocketmine/pocketmine-mp": ">= 4.0.0-BETA5, < 4.4.2|<4.2.10",
"pressbooks/pressbooks": "<5.18",
"prestashop/autoupgrade": ">=4,<4.10.1",
"prestashop/blockwishlist": ">=2,<2.1.1",
"prestashop/contactform": ">1.0.1,<4.3",
"prestashop/gamification": "<2.3.2",
"prestashop/prestashop": ">=1.7,<=1.7.8.2",
@@ -5237,7 +5238,7 @@
"shopware/core": "<=6.4.9",
"shopware/platform": "<=6.4.9",
"shopware/production": "<=6.3.5.2",
"shopware/shopware": "<5.7.9",
"shopware/shopware": "<5.7.12",
"shopware/storefront": "<=6.4.8.1",
"shopxo/shopxo": "<2.2.6",
"showdoc/showdoc": "<2.10.4",
@@ -5429,7 +5430,7 @@
"type": "tidelift"
}
],
"time": "2022-06-17T21:04:24+00:00"
"time": "2022-06-25T08:04:47+00:00"
},
{
"name": "sebastian/cli-parser",