Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHP 7.4/8 compatibility (OpenMage 20.x) #1256

Merged
merged 78 commits into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
dcef1ba
Supress deprecation warnings
cmuench Jul 15, 2022
d288640
Add PHP 8.1 testcase and update ddev setup
cmuench Aug 28, 2023
e4205d3
Add travis job for PHP 8.1
cmuench Aug 28, 2023
a59b1d1
Update dependency for PHP 8.1
cmuench Aug 28, 2023
a02b530
Backport TableHelper from n98-magerun2
cmuench Jul 15, 2022
dfa451f
WIP Remove old question helper
cmuench Jul 16, 2022
6112b57
Update composer packages
sreichel Nov 21, 2022
ed153d2
Fixes bootstrap.php
sreichel Nov 21, 2022
ad39054
Updated commands - replaced DialogHelper
sreichel Nov 21, 2022
bf4313d
Update symfony packages to ^5.4
sreichel Nov 21, 2022
30d6c6b
Removed MagentoConnect commands
sreichel Nov 21, 2022
1bfa29e
PhpStan fixes
sreichel Nov 21, 2022
e3a1012
Replaced fzaninotto/faker
sreichel Nov 21, 2022
ff3a611
Added php7.4 support
sreichel May 15, 2023
79fab0a
Fixed output for index:reindex
sreichel May 15, 2023
2c27393
Fixed customer:info
sreichel May 15, 2023
56d2276
Added ext-intl to sys:check
sreichel May 15, 2023
e8ee45f
Fixed admin:user:change-password
sreichel May 15, 2023
5663f5b
Fixed dev:module:observer:list
sreichel May 15, 2023
2912c11
Fixed sys:setup:run
sreichel May 15, 2023
56f4fcb
Fixed script:repo:run
sreichel May 15, 2023
5f59191
Fixed dev:module:dependencies:on & dev:module:dependencies:from
sreichel May 16, 2023
68dbdf0
Added missing validator
sreichel May 16, 2023
4cba188
Fixed design:demo-notice
sreichel May 16, 2023
6a48d2b
Fixed customer:create:dummy
sreichel May 16, 2023
a9d1824
Fixed db:maintain:check-tables
sreichel May 16, 2023
b385a6d
Fixed eav:attribute:view
sreichel May 16, 2023
00b9057
Removed shell command
sreichel May 16, 2023
bd3f4fd
Fixed install
sreichel May 16, 2023
42f9006
Fixed ParameterHelper
sreichel May 16, 2023
2cbb1cd
Output styling
sreichel May 16, 2023
a6a8755
Reverted change to test
sreichel May 16, 2023
818c8cf
Output styling
sreichel May 16, 2023
36186a5
Try to update the Github Actions to latest Ubuntu
cmuench Aug 28, 2023
7fdb392
Replace Magento installation step
cmuench May 17, 2023
7db3338
Fix n98-magerun call in Github Action
cmuench May 17, 2023
ae64adf
Simplify the installation command
cmuench May 17, 2023
ccca680
Use mysql service in Github Action
cmuench May 17, 2023
1cdf755
Fix DB connection in installation
cmuench May 17, 2023
2a653b9
Add missing db name
cmuench May 17, 2023
2773240
Use relative directory to install Magento
cmuench May 17, 2023
f403a5e
Run bin/n98-magerun via php binary
cmuench May 17, 2023
9512181
Install gawk in ddev
cmuench May 17, 2023
f7c13ff
Remove bundled Composer and install requests library
cmuench May 20, 2023
85a564c
Install dependencies direct after ddev start
cmuench May 20, 2023
c59e55f
Remove not used ES parameter
cmuench May 20, 2023
ac0daa5
Remove Composer Alias Commands
cmuench May 20, 2023
1b7bdce
Backport self-update command from Magerun 2
cmuench May 20, 2023
e19547e
Backport version file printer from Magerun 2
cmuench May 20, 2023
85f2f5d
Backport ProcessArguments class to handle process calls
cmuench May 23, 2023
e444d9d
Backport the composer console helper
cmuench May 23, 2023
86690ff
Backport sub command support
cmuench May 23, 2023
907e3c9
WIP backport installer
cmuench Aug 28, 2023
84d33d1
Updated config.yaml
cmuench Aug 28, 2023
4cf2a5f
Updated MAGENTO_INSTALL_SCRIPT_PATH
sreichel May 24, 2023
f097e55
Test
sreichel May 24, 2023
44260ce
Revert "Test"
sreichel May 24, 2023
00cbf0f
Test
sreichel May 24, 2023
cc57a50
Revert "Test"
sreichel May 24, 2023
4d32ec1
Try to fix the installer
cmuench May 30, 2023
72a737f
Fix db password parameter and add "skip url validation"
cmuench May 30, 2023
5569564
Fix some parameters of the installer
cmuench May 30, 2023
d8be755
Remove dba entry in ddev config
cmuench Aug 8, 2023
46a4004
Add n98-magerun logo
cmuench Aug 28, 2023
1f7746a
Compatibility with ddev v1.22.1
cmuench Aug 27, 2023
433651c
Remove unused database util class
cmuench Aug 27, 2023
c214f09
Add sample data installer
cmuench Aug 27, 2023
d998a54
Update phpunit to v9
cmuench Aug 27, 2023
2846d77
Replace Dialog with Question Helper
cmuench Aug 27, 2023
21712af
First bunch of refactored test (helpers)
cmuench Aug 27, 2023
aae4c53
Refactoring the next bunch of tests
cmuench Aug 28, 2023
385fe65
Prepare dev release v3.0.0
cmuench Aug 28, 2023
cd40ea0
Fix next bunch of tests
cmuench Aug 28, 2023
aa1a2ba
Fix syntax error
cmuench Aug 28, 2023
0dfcf94
Fix database helper tests
cmuench Aug 28, 2023
b4c81c1
MariaDB vs. MySQL (old version?)
cmuench Aug 28, 2023
1424291
Update twig to 3.x
cmuench Aug 28, 2023
7739bbb
Make iterator compatible (fix warnings)
cmuench Aug 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 4 additions & 6 deletions .ddev/commands/web/install-openmage
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ MAGENTO_VERSION=$1
MAGENTO_DB_NAME="magento_${MAGENTO_VERSION//[-.]/_}"
MAGENTO_ROOT_DIR="/opt/magento-test-environments/magento_${MAGENTO_VERSION//[-.]/_}"
MAGENTO_SUBDOMAIN="${MAGENTO_VERSION//[-_.]/-}"
USE_ELASTICSEARCH=$2

fix_permissions() {
sudo chown -R "$(id -u):$(id -g)" /opt/magento-test-environments
Expand Down Expand Up @@ -54,16 +53,15 @@ install_magento() {

if [ ! -d $MAGENTO_ROOT_DIR ]; then

#composer --no-interaction create-project --repository-url=https://repo.magento.com/ magento/project-community-edition="$MAGENTO_VERSION" "$MAGENTO_ROOT_DIR"
/var/www/html/bin/n98-magerun install \
--dbHost="db" \
--dbUser="db" \
--dbPass="db" \
--dbPass="db" \
--dbName="${MAGENTO_DB_NAME}" \
--installSampleData=yes \
--useDefaultConfigParams=yes \
--magentoVersionByName="openmage-${MAGENTO_VERSION}" \
--installationFolder="${MAGENTO_ROOT_DIR}" \
--useDefaultConfigParams=yes \
--magentoVersionByName="openmage-${MAGENTO_VERSION}" \
--installationFolder="${MAGENTO_ROOT_DIR}" \
--baseUrl="http://${MAGENTO_SUBDOMAIN}.${DDEV_PROJECT}.ddev.site/"

fi
Expand Down
77 changes: 44 additions & 33 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: n98-magerun
type: php
docroot: ""
php_version: "7.4"
php_version: "8.1"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
Expand All @@ -10,9 +10,10 @@ additional_hostnames: []
additional_fqdns: []
database:
type: mariadb
version: "10.3"
nfs_mount_enabled: false
mutagen_enabled: false
version: "10.2"
hooks:
post-start:
- composer: install
webimage_extra_packages: [gawk]
use_dns_when_possible: true
composer_version: "2"
Expand All @@ -28,7 +29,7 @@ nodejs_version: "16"

# docroot: <relative_path> # Relative path to the directory containing index.php.

# php_version: "7.4" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"
# php_version: "8.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"

# You can explicitly specify the webimage but this
# is not recommended, as the images are often closely tied to ddev's' behavior,
Expand All @@ -37,13 +38,13 @@ nodejs_version: "16"
# webimage: <docker_image> # nginx/php docker image.

# database:
# type: <dbtype> # mysql, mariadb
# version: <version> # database version, like "10.3" or "8.0"
# Note that mariadb_version or mysql_version from v1.18 and earlier
# will automatically be converted to this notation with just a "ddev config --auto"
# type: <dbtype> # mysql, mariadb, postgres
# version: <version> # database version, like "10.4" or "8.0"
# mariadb versions can be 5.5-10.8 and 10.11, mysql versions can be 5.5-8.0
# postgres versions can be 9-15.

# router_http_port: <port> # Port to be used for http (defaults to port 80)
# router_https_port: <port> # Port for https (defaults to 443)
# router_http_port: <port> # Port to be used for http (defaults to global configuration, usually 80)
# router_https_port: <port> # Port for https (defaults to global configuration, usually 443)

# xdebug_enabled: false # Set to true to enable xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands
Expand All @@ -55,7 +56,7 @@ nodejs_version: "16"
# "ddev xhprof" to enable xhprof and "ddev xhprof off" to disable it work better,
# as leaving xhprof enabled all the time is a big performance hit.

# webserver_type: nginx-fpm # or apache-fpm
# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn

# timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP;
Expand All @@ -79,8 +80,8 @@ nodejs_version: "16"
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
# To reinstall Composer after the image was built, run "ddev debug refresh".

# nodejs_version: "16"
# change from the default system Node.js version to another supported version, like 12, 14, 17, 18.
# nodejs_version: "18"
# change from the default system Node.js version to another supported version, like 14, 16, 18, 20.
# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any
# Node.js version, including v6, etc.

Expand All @@ -96,10 +97,19 @@ nodejs_version: "16"
# would provide http and https URLs for "example.com" and "sub1.example.com"
# Please take care with this because it can cause great confusion.

# upload_dir: custom/upload/dir
# would set the destination path for ddev import-files to <docroot>/custom/upload/dir
# upload_dirs: "custom/upload/dir"
#
# upload_dirs:
# - custom/upload/dir
# - ../private
#
# would set the destination paths for ddev import-files to <docroot>/custom/upload/dir
# When mutagen is enabled this path is bind-mounted so that all the files
# in the upload_dir don't have to be synced into mutagen
# in the upload_dirs don't have to be synced into mutagen.

# disable_upload_dirs_warning: false
# If true, turns off the normal warning that says
# "You have Mutagen enabled and your 'php' project type doesn't have upload_dirs set"

# working_dir:
# web: /var/www/html
Expand All @@ -108,19 +118,24 @@ nodejs_version: "16"
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.

# omit_containers: [db, dba, ddev-ssh-agent]
# omit_containers: [db, ddev-ssh-agent]
# Currently only these containers are supported. Some containers can also be
# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
# the "db" container, several standard features of ddev that access the
# database container will be unusable. In the global configuration it is also
# possible to omit ddev-router, but not here.

# nfs_mount_enabled: false
# Great performance improvement but requires host configuration first.
# performance_mode: "global"
# DDEV offers performance optimization strategies to improve the filesystem
# performance depending on your host system. Should be configured globally.
#
# If set, will override the global config. Possible values are:
# - "global": uses the value from the global config.
# - "none": disables performance optimization for this project.
# - "mutagen": enables Mutagen for this project.
# - "nfs": enables NFS for this project.
#
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs

# mutagen_enabled: false
# Performance improvement using mutagen asynchronous updates.
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen

# fail_on_hook_fail: False
Expand All @@ -142,14 +157,6 @@ nodejs_version: "16"
# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
# unless explicitly specified.

# phpmyadmin_port: "8036"
# phpmyadmin_https_port: "8037"
# The PHPMyAdmin ports can be changed from the default 8036 and 8037

# host_phpmyadmin_port: "8036"
# The phpmyadmin (dba) port is not normally bound on the host at all, instead being routed
# through ddev-router, but it can be specified and bound.

# mailhog_port: "8025"
# mailhog_https_port: "8026"
# The MailHog ports can be changed from the default 8025 and 8026
Expand Down Expand Up @@ -178,7 +185,7 @@ nodejs_version: "16"

# ngrok_args: --basic-auth username:pass1234
# Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs#http or run "ngrok http -h"
# https://ngrok.com/docs/ngrok-agent/config or run "ngrok http -h"

# disable_settings_management: false
# If true, ddev will not create CMS-specific settings files like
Expand Down Expand Up @@ -216,12 +223,16 @@ nodejs_version: "16"
# https_port: 4000
# http_port: 3999
# Allows a set of extra ports to be exposed via ddev-router
# Fill in all three fields even if you don’t intend to use the https_port!
# If you don’t add https_port, then it defaults to 0 and ddev-router will fail to start.
#
# The port behavior on the ddev-webserver must be arranged separately, for example
# using web_extra_daemons.
# For example, with a web app on port 3000 inside the container, this config would
# expose that web app on https://<project>.ddev.site:9999 and http://<project>.ddev.site:9998
# web_extra_exposed_ports:
# - container_port: 3000
# - name: myapp
# container_port: 3000
# http_port: 9998
# https_port: 9999

Expand Down
1 change: 1 addition & 0 deletions .github/doc/magerun-logo-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/doc/magerun-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading