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.

Sign up for GitHub

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

Fix #116 Solve Fatal error from League Container conflict with WooCommerce 4.4 #117

Merged
merged 5 commits into from
Aug 19, 2020
Merged

Fix #116 Solve Fatal error from League Container conflict with WooCommerce 4.4 #117

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7244484
update composer.json to require league container on dev, update mozar…
engahmeds3ed Aug 19, 2020
31a2707
running composer install to let mozar get dependencies
engahmeds3ed Aug 19, 2020
ae99388
adjust travis to remove mozart before install
engahmeds3ed Aug 19, 2020
ee873ac
adjust travis to use --no-scripts when using composer install
engahmeds3ed Aug 19, 2020
c54e94a
add --no-scripts when removing mozart package for travis
engahmeds3ed Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ matrix:
env: WP_VERSION=latest
- php: 5.6
env: WP_VERSION=latest
before_install:
- composer remove --dev coenjacobs/mozart
install:
- export PATH="$HOME/.composer/vendor/bin:$PATH"
- composer install --no-progress
- composer install --no-progress --no-scripts
- |
if [ -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini ]; then
phpenv config-rm xdebug.ini
Expand Down
11 changes: 6 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"require": {
"php": ">=5.6",
"composer/installers": "~1.0",
"league/container": "^2.4",
"wp-media/rocket-lazyload-common": "^2.0"
},
"require-dev": {
"league/container": "^2.4",
"brain/monkey": "^2.0",
"coenjacobs/mozart": "^0.4.0",
"coenjacobs/mozart": "^0.5.1",
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
"phpcompatibility/phpcompatibility-wp": "^2.0",
"phpunit/phpunit": "^5.7",
Expand All @@ -56,18 +56,19 @@
"packages": [
"wp-media/rocket-lazyload-common",
"league/container"
]
],
"delete_vendor_directories": true
}
},
"scripts": {
"test-unit":"\"vendor/bin/phpunit\" --testsuite unit --colors=always",
"test-integration": "\"vendor/bin/phpunit\" --testsuite integration --colors=always --configuration tests/Integration/phpunit.xml.dist",
"post-install-cmd": [
"\"vendor/bin/mozart\" compose",
"[ $COMPOSER_DEV_MODE -eq 0 ] || \"vendor/bin/mozart\" compose",
"composer dump-autoload"
],
"post-update-cmd": [
"\"vendor/bin/mozart\" compose",
"[ $COMPOSER_DEV_MODE -eq 0 ] || \"vendor/bin/mozart\" compose",
"composer dump-autoload"
]
}
Expand Down
Loading