bayrepo/hestiacp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update composer for new version of fm and brepo/phpquoteshellarg

Browse Source
This commit is contained in:
Alexey Berezhok
2025-02-04 21:53:22 +03:00
parent 316ca0e292
commit b7e404e18c
7 changed files with 7364 additions and 9660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/v-run-cli-cmd
View File

@@ -43,6 +43,15 @@ if [ "$clicmd" = "wp" ]; then
clicmd="$homedir/.wp-cli/wp" clicmd="$homedir/.wp-cli/wp"
fi fi
if [[ "$clicmd" =~ php[0-9][0-9] ]]; then
php_ver=$(echo "$clicmd" | grep -oP "\d+")
if [ "$LOCAL_PHP" == "yes" ]; then
clicmd="/opt/brepo/php${php_ver}/bin/php"
else
clicmd="/usr/bin/php${php_ver}"
fi
fi
if [ -z "$(which "$clicmd")" ]; then if [ -z "$(which "$clicmd")" ]; then
check_result "$E_NOTEXIST" "Cli command does not exist $clicmd" check_result "$E_NOTEXIST" "Cli command does not exist $clicmd"
fi fi
@@ -61,15 +70,6 @@ if [ "$basecmd" != 'ps' -a \
"$basecmd" != 'egrep' -a \ "$basecmd" != 'egrep' -a \
"$basecmd" != 'sed' -a \ "$basecmd" != 'sed' -a \
"$basecmd" != 'cat' -a \ "$basecmd" != 'cat' -a \
"$basecmd" != 'php5.6' -a \
"$basecmd" != 'php7.0' -a \
"$basecmd" != 'php7.1' -a \
"$basecmd" != 'php7.2' -a \
"$basecmd" != 'php7.3' -a \
"$basecmd" != 'php7.4' -a \
"$basecmd" != 'php8.0' -a \
"$basecmd" != 'php8.1' -a \
"$basecmd" != 'php8.2' -a \
"$basecmd" != 'php' -a \ "$basecmd" != 'php' -a \
"$basecmd" != "wp" -a \ "$basecmd" != "wp" -a \
"$basecmd" != 'composer' ]; then "$basecmd" != 'composer' ]; then

14
install/common/filegator/composer.json
View File

@@ -3,13 +3,19 @@
"description": "Filegator", "description": "Filegator",
"license": "MIT", "license": "MIT",
"type": "project", "type": "project",
"repositories": [
{
"type": "git",
"url": "https://dev.brepo.ru/brepo/phpquoteshellarg.git"
}
],
"config": { "config": {
"platform": { "platform": {
"php": "7.2.5" "php": "8.1"
} }
}, },
"require": { "require": {
"php": "^7.2", "php": "^8.1",
"monolog/monolog": "^1.24", "monolog/monolog": "^1.24",
"nikic/fast-route": "^1.3", "nikic/fast-route": "^1.3",
"symfony/security-csrf": "^4.4", "symfony/security-csrf": "^4.4",
@@ -20,7 +26,7 @@
"league/flysystem": "^1.1", "league/flysystem": "^1.1",
"league/flysystem-ziparchive": "^1.0", "league/flysystem-ziparchive": "^1.0",
"league/flysystem-sftp": "^1.0", "league/flysystem-sftp": "^1.0",
"hestiacp/phpquoteshellarg": "^1.0" "brepo/phpquoteshellarg": "dev-master"
}, },
"authors": [ "authors": [
{ {
@@ -42,6 +48,6 @@
"phpunit/phpunit": "^8.0", "phpunit/phpunit": "^8.0",
"symfony/var-dumper": "^4.4", "symfony/var-dumper": "^4.4",
"league/flysystem-memory": "^1.0", "league/flysystem-memory": "^1.0",
"phpstan/phpstan": "^0.11.8" "phpstan/phpstan": "^2.0.3"
} }
} }

1914
install/common/filegator/composer.lock generated
View File

File diff suppressed because it is too large Load Diff

14
install/rpm/filemanager/filegator/composer.json
View File

@@ -3,13 +3,19 @@
"description": "Filegator", "description": "Filegator",
"license": "MIT", "license": "MIT",
"type": "project", "type": "project",
"repositories": [
{
"type": "git",
"url": "https://dev.brepo.ru/brepo/phpquoteshellarg.git"
}
],
"config": { "config": {
"platform": { "platform": {
"php": "7.2.5" "php": "8.1"
} }
}, },
"require": { "require": {
"php": "^7.2", "php": "^8.1",
"monolog/monolog": "^1.24", "monolog/monolog": "^1.24",
"nikic/fast-route": "^1.3", "nikic/fast-route": "^1.3",
"symfony/security-csrf": "^4.4", "symfony/security-csrf": "^4.4",
@@ -20,7 +26,7 @@
"league/flysystem": "^1.1", "league/flysystem": "^1.1",
"league/flysystem-ziparchive": "^1.0", "league/flysystem-ziparchive": "^1.0",
"league/flysystem-sftp": "^1.0", "league/flysystem-sftp": "^1.0",
"hestiacp/phpquoteshellarg": "^1.0" "brepo/phpquoteshellarg": "dev-master"
}, },
"authors": [ "authors": [
{ {
@@ -42,6 +48,6 @@
"phpunit/phpunit": "^8.0", "phpunit/phpunit": "^8.0",
"symfony/var-dumper": "^4.4", "symfony/var-dumper": "^4.4",
"league/flysystem-memory": "^1.0", "league/flysystem-memory": "^1.0",
"phpstan/phpstan": "^0.11.8" "phpstan/phpstan": "^2.0.3"
} }
} }

1914
install/rpm/filemanager/filegator/composer.lock generated
View File

File diff suppressed because it is too large Load Diff

8
web/inc/composer.json
View File

@@ -1,7 +1,13 @@
{ {
"repositories": [
{
"type": "git",
"url": "https://dev.brepo.ru/brepo/phpquoteshellarg.git"
}
],
"require": { "require": {
"phpmailer/phpmailer": "6.8.0", "phpmailer/phpmailer": "6.8.0",
"hestiacp/phpquoteshellarg": "1.0.2", "brepo/phpquoteshellarg": "dev-master",
"robthree/twofactorauth": "2.0.0" "robthree/twofactorauth": "2.0.0"
} }
} }

38
web/inc/composer.lock generated
View File

@@ -4,45 +4,36 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "bd5fba3223573f480531e48f5e3ce14e", "content-hash": "134682d586741e300ffeae0ccfb99351",
"packages": [ "packages": [
{ {
"name": "hestiacp/phpquoteshellarg", "name": "brepo/phpquoteshellarg",
"version": "v1.0.2", "version": "dev-master",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/hestiacp/phpquoteshellarg.git", "url": "https://dev.brepo.ru/brepo/phpquoteshellarg.git",
"reference": "7fd1a3a648cdc39a3fe2aab78a1a3a0267f92f49" "reference": "943298a03acc3ff7a89eff948534f90d1c6ba950"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/hestiacp/phpquoteshellarg/zipball/7fd1a3a648cdc39a3fe2aab78a1a3a0267f92f49",
"reference": "7fd1a3a648cdc39a3fe2aab78a1a3a0267f92f49",
"shasum": ""
}, },
"require": { "require": {
"php": ">=7.2" "php": ">=8.0"
}, },
"default-branch": true,
"type": "library", "type": "library",
"autoload": { "autoload": {
"files": [ "files": [
"src/Hestiacp/quoteshellarg/quoteshellarg.php" "src/Hestiacp/quoteshellarg/quoteshellarg.php"
] ]
}, },
"notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
"Unlicense" "Unlicense"
], ],
"description": "Improved escape shell arguments for support of special charactars", "description": "Improved escape shell arguments for support of special charactars",
"homepage": "https://github.com/hestiacp", "homepage": "https://dev.brepo.ru/bayrepo/hestiacp",
"keywords": [ "keywords": [
"escapeshellarg", "escapeshellarg",
"quoteshellarg" "quoteshellarg"
], ],
"support": { "time": "2025-02-03T20:07:58+00:00"
"source": "https://github.com/hestiacp/phpquoteshellarg/tree/v1.0.2"
},
"time": "2023-07-23T09:16:27+00:00"
}, },
{ {
"name": "phpmailer/phpmailer", "name": "phpmailer/phpmailer",
@@ -209,10 +200,13 @@
"packages-dev": [], "packages-dev": [],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": [], "stability-flags": {
"brepo/phpquoteshellarg": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": [], "platform": {},
"platform-dev": [], "platform-dev": {},
"plugin-api-version": "2.3.0" "plugin-api-version": "2.6.0"
} }