Merge remote-tracking branch 'origin/feature/php8'

* origin/feature/php8:
  Updated packages of composer
  Fixed semantic of composer.json
  Updated composer packages
  Added update PO Files script
  Removed duplicated twoFactorAuthEnforced option flag
  Updated composer.lock
  Added the support of php8 for vagrant and composer loading of the specific packages.

# Conflicts:
#	composer.lock
pull/483/head
Ruslan Baidan 2023-03-07 08:04:20 +01:00
commit 344b3498b8
No known key found for this signature in database
GPG Key ID: 4B7724C136BF1D89
4 changed files with 19 additions and 11 deletions

View File

@ -41,7 +41,7 @@
} }
], ],
"require": { "require": {
"php": "^7.4", "php": "^7.4 || ^8.0",
"ext-json": "*", "ext-json": "*",
"ext-pdo": "*", "ext-pdo": "*",
"ext-bcmath": "*", "ext-bcmath": "*",
@ -60,8 +60,8 @@
}, },
"require-dev": { "require-dev": {
"roave/security-advisories": "dev-latest", "roave/security-advisories": "dev-latest",
"phpunit/phpunit": "^8.3", "phpunit/phpunit": "^9.5",
"laminas/laminas-test": "^3.4" "laminas/laminas-test": "^4.5"
}, },
"autoload-dev": { "autoload-dev": {
"psr-4": { "psr-4": {

View File

@ -24,7 +24,6 @@ if (!empty($appConfDir)) {
return [ return [
'modules' => [ 'modules' => [
'Laminas\Mvc\Console',
'Laminas\I18n', 'Laminas\I18n',
'Laminas\Mail', 'Laminas\Mail',
'Laminas\Log', 'Laminas\Log',

View File

@ -0,0 +1,10 @@
#!/bin/bash
pushd node_modules/ng_client
if [[ -d po && -f po/template.pot ]]; then
for f in po/*.po; do
msgmerge --backup=none -U "$f" po/template.pot
msgattrib --no-obsolete --clear-fuzzy --empty -o "$f" "$f"
done;
fi

View File

@ -29,8 +29,8 @@ session.gc_maxlifetime=604800
session.gc_probability=1 session.gc_probability=1
session.gc_divisor=1000 session.gc_divisor=1000
PHP_INI=/etc/php/7.4/apache2/php.ini PHP_INI=/etc/php/8.1/apache2/php.ini
XDEBUG_CFG=/etc/php/7.4/apache2/conf.d/20-xdebug.ini XDEBUG_CFG=/etc/php/8.1/apache2/conf.d/20-xdebug.ini
MARIA_DB_CFG=/etc/mysql/mariadb.conf.d/50-server.cnf MARIA_DB_CFG=/etc/mysql/mariadb.conf.d/50-server.cnf
# Stats service # Stats service
@ -59,7 +59,6 @@ sudo apt-get update && sudo apt-get upgrade -y
echo -e "\n--- Install base packages… ---\n" echo -e "\n--- Install base packages… ---\n"
sudo apt-get -y install vim zip unzip git gettext curl gsfonts > /dev/null sudo apt-get -y install vim zip unzip git gettext curl gsfonts > /dev/null
echo -e "\n--- Install MariaDB specific packages and settings… ---\n" echo -e "\n--- Install MariaDB specific packages and settings… ---\n"
sudo apt-get -y install mariadb-server mariadb-client > /dev/null sudo apt-get -y install mariadb-server mariadb-client > /dev/null
# Secure the MariaDB installation (especially by setting a strong root password) # Secure the MariaDB installation (especially by setting a strong root password)
@ -101,7 +100,7 @@ sudo mysql -u root -p$DBPASSWORD_ADMIN -e "FLUSH PRIVILEGES;"
sudo systemctl restart mariadb.service > /dev/null sudo systemctl restart mariadb.service > /dev/null
echo -e "\n--- Installing PHP-specific packages… ---\n" echo -e "\n--- Installing PHP-specific packages… ---\n"
sudo apt-get -y install php apache2 libapache2-mod-php php-curl php-gd php-mysql php-pear php-apcu php-xml php-mbstring php-intl php-imagick php-zip php-xdebug php-bcmath > /dev/null sudo apt-get install -y php8.1-cli php8.1-common php8.1-mysql php8.1-zip php8.1-gd php8.1-mbstring php8.1-curl php8.1-xml php8.1-bcmath php8.1-intl php8.1-imagic php8.1-xdebug > /dev/null
echo -e "\n--- Configuring PHP… ---\n" echo -e "\n--- Configuring PHP… ---\n"
for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit
@ -112,8 +111,8 @@ done
echo -e "\n--- Configuring Xdebug for development ---\n" echo -e "\n--- Configuring Xdebug for development ---\n"
sudo bash -c "cat << EOF > $XDEBUG_CFG sudo bash -c "cat << EOF > $XDEBUG_CFG
zend_extension=xdebug.so zend_extension=xdebug.so
xdebug.remote_enable=1 xdebug.mode=debug
xdebug.remote_connect_back=1 xdebug.xdebug.discover_client_host=1
xdebug.idekey=IDEKEY xdebug.idekey=IDEKEY
EOF" EOF"
@ -354,7 +353,7 @@ return [
], ],
'import' => [ 'import' => [
'uploadFolder' => $appdir . '/data/import/files', 'uploadFolder' => '$appdir/data/import/files',
'isBackgroundProcessActive' => false, 'isBackgroundProcessActive' => false,
], ],
]; ];