Monarc
/
MonarcAppFO
mirror of https://github.com/monarc-project/MonarcAppFO
1
0
Fork 0
Code Issues Releases Wiki Activity

Added the support of php8 for vagrant and composer loading of the specific packages.

pull/478/head
Ruslan Baidan 2022-11-15 11:52:23 +01:00
parent 84ded7122e
commit 2a0a209811
No known key found for this signature in database
GPG Key ID: 4B7724C136BF1D89
6 changed files with 991 additions and 1042 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.json
View File

@ -41,12 +41,12 @@
} }
], ],
"require": { "require": {
"php": "^7.4", "php": "^7.4|^8",
"ext-json": "*", "ext-json": "*",
"ext-pdo": "*", "ext-pdo": "*",
"ext-bcmath": "*", "ext-bcmath": "*",
"monarc/frontoffice": "^2.10.3", "monarc/frontoffice": "dev-feature/php8",
"monarc/core": "^2.10.3", "monarc/core": "dev-feature/php8",
"laminas/laminas-mvc": "^3.1", "laminas/laminas-mvc": "^3.1",
"laminas/laminas-di": "^3.1", "laminas/laminas-di": "^3.1",
"laminas/laminas-permissions-rbac": "^3.0", "laminas/laminas-permissions-rbac": "^3.0",
@ -59,8 +59,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": {

2008
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

1
config/application.config.php
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',

1
config/autoload/local.php.dist
View File

@ -96,6 +96,7 @@ return [
], ],
'instanceName' => 'Development', // for example a short URL or client name from ansible 'instanceName' => 'Development', // for example a short URL or client name from ansible
'twoFactorAuthEnforced' => false,
'terms' => 'https://my.monarc.lu/terms.html', 'terms' => 'https://my.monarc.lu/terms.html',

2
vagrant/Vagrantfile vendored
View File

@ -57,7 +57,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# #
# # Use VBoxManage to customize the VM. For example to change memory: # # Use VBoxManage to customize the VM. For example to change memory:
vb.customize ["modifyvm", :id, "--memory", "2048"] vb.customize ["modifyvm", :id, "--memory", "2048"]
vb.customize ["modifyvm", :id, "--name", "MONARC FO - Ubuntu 20.04 - DEV"] vb.customize ["modifyvm", :id, "--name", "MONARC FO - Ubuntu 20.04 - PHP8"]
end end
# #
# View the documentation for the provider you're using for more # View the documentation for the provider you're using for more

11
vagrant/bootstrap.sh
View File

@ -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,15 @@ 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 -y install php apache2 libapache2-mod-php
sudo apt install software-properties-common
sudo add-apt-repository ppa:ondrej/php
sudo apt install php8.0 libapache2-mod-php8.0
sudo apt install php8.0-fpm libapache2-mod-fcgid
sudo apt-get install -y php8.0-cli php8.0-common php8.0-mysql php8.0-zip php8.0-gd php8.0-mbstring php8.0-curl php8.0-xml php8.0-bcmath php8.0-intl php8.0-imagic php8.0-xdebug > /dev/null
sudo a2enmod proxy_fcgi setenvif
sudo a2enconf php8.0-fpm
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