Skip to content
This repository has been archived by the owner on Mar 1, 2021. It is now read-only.

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
* master: (173 commits)
  Added configure_tests script support for Magento EE, removed Rabbit MQ from integration test config on Magento CE.
  Problems with deep_merge paliarush#124
  Updated README.md
  Fix status message format
  Alter reinstall scripts to delete TestModule* and kill rabbit queue processes
  Added item to FAQ about Permission Denied
  Added FAQ item about Unit tests in PhpStorm
  Added FAQ item about Windows 10 to readme
  Fix typo in readme
  Add changelog and readme information
  Include vendor directory in MessageQueue check
  Add instructions to specify composer package version
  Add License file check for message queue module to determine whether or not to add --amqp-* options for install
  Update README.md
  Added PHP 7.1 and PHP 7.2 support for Magento 2.3 paliarush#169
  Added PHP 7.2 support for Magento 2.3 paliarush#169
  Added PHP 7.1 support for Magento 2.3 paliarush#169
  Added PHP 7.1 support for Magento 2.3 paliarush#169
  Add PHP 7.1 and 7.2 support for Magento 2.3 paliarush#169
  Update README.md
  ...

# Conflicts:
#	scripts/guest/m-reinstall
  • Loading branch information
Orlando Thöny committed Sep 18, 2018
2 parents e953cd8 + 1e4d865 commit 75fdcb1
Show file tree
Hide file tree
Showing 72 changed files with 3,393 additions and 415 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
/.vagrant
/.idea
/.idea
/log/*.log
/scripts/.current_nesting_level
/scripts/.current_log_path
.DS_Store
107 changes: 91 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,95 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

* [\[Unreleased\]](#unreleased)
* [\[v2.2.0\] - 2017-02-25](#v220---2017-02-25)
* [\[v2.1.0\] - 2016-06-22](#v210---2016-06-22)
* [\[v2.0.0\] - 2016-02-05](#v200---2016-02-05)
* [\[v1.0.0\] - 2016-01-11](#v100---2016-01-11)

## [Unreleased]

Nothing yet
### Changed

- Verified compatibility with Vagrant 2.x and loosened Vagrant version requirement
- Config option 'php_version' should now be used for PHP version selection instead of 'use_php7'
- Upgraded Varnish to v4.1
- Improved Magento re-installation speed by avoiding unnecessary cache cleaning
- Custom code sniffer rules replaced with PSR2
- MessageQueue module will now be installed with CE if using Magento v2.3+

### Added

- PHP 7.1 and PHP 7.2 support
- Support for new location of `generated` directory in Magento 2.2.0
- Basic data generation can be turned off. Added configurable product and customer address generation
- Documentation in config.yaml.dist for choosing specific composer package versions

### Fixed

- Magento 2.2.0 EE installation from composer

## [v2.2.0] - 2017-02-25

### Changed

- Magento EE and sample data directories are added to 'Exclude list' in PhpStorm
- Redis is used as default cache backend instead of filesystem
- After EE is linked, EE versions of composer.lock and composer.json are replaced back with CE versions (thus are not marked by git as modified)
- Improved CLI scripts output formatting

### Fixed

- Issue with some files marked as unversioned in git after EE linking
- It is now possible to use spaces in path to vagrant project on Windows. On OSX and Linux hosts it works in non-NFS mode, in NFS mode it does not work because of [bug in vagrant](mitchellh/vagrant#7540)
- Issue with MySQL being down after VM power off

### Added

- Added ability to configure number of CPUs for virtual machine via [etc/config.yaml](etc/config.yaml.dist)
- Added generation of basic sample data for testing purposes
- Ability to upgrade Magento using `m-switch-to-ce` and `m-switch-to-ee` (when `-u` flag is specified)
- Redis support for Magento caching
- Access to Magento developer mode and storefront/admin UI debugging features via [etc/config.yaml](etc/config.yaml.dist)
- Composer-based installation support
- Magento cache warming up after re-install and clearing cache (when `-w` flag is specified)
- Tests configuration files are generated during project initialization
- Sample data support
- ElasticSearch support
- NodeJS, NPM, Gulp and Grunt are installed as part of the provisioning process

## [v2.1.0] - 2016-06-22

### Changed

- Removed requirement for public github token due to Composer limitations (issue is fixed on Composer side)
- Changed requirement for minimum box version from 1.0 to 1.1
- Upgraded PHP 5.5.9 to PHP 5.6
- When [init_project.sh](init_project.sh) is executed, EE will be installed by default, if EE repository is specified in [etc/config.yaml](etc/config.yaml.dist). Not supported on Windows hosts

### Fixed

- Permissions during Magento installation on Windows hosts
- Issue with Magento compiler on Windows hosts
- "stdin: is not a tty" warning

### Added

- Setup and upgrade cron scripts to crontab
- Logging of all emails in HTML format to `vagrant-magento/log/email`
- Host wrapper script for bin/magento command on guest
- Ability to modify guest config files (PHP, Apache etc) directly from host IDE
- Ability to choose if PhpStorm configs should be removed during project reinitialization
- Ability to switch PHP version without destroying the project ("vagrant reload" is required)
- Ability to do force switch to CE or EE (even if already switched to target edition)
- Ability to use Varnish full page caching automatically. (Using "vagrant reload" or m-varnish script)

## [v2.0.0] - 2016-02-05

### Changed

- Moved provisioning scripts
- Magento project directory moved to vagrant project root. Current structure is as follows: `vagrant-magento/magento2ce/magento2ee`
- PHP 7.0 is installed by default instead of PHP 5.5.9 (can be configured in [etc/config.yaml.dist](etc/config.yaml.dist))
- PHP 7.0 is installed by default instead of PHP 5.5.9 (can be configured in [etc/config.yaml](etc/config.yaml.dist))
- Renamed configuration folder from `local.config` to `etc`
- Set minimum Vagrant version as 1.8
- Improved deployment speed in case of disabled NFS for folders sync
Expand All @@ -30,27 +105,27 @@ Nothing yet
- Added [project initialization script](init_project.sh) and host scripts for routine flows (compatible with OSX, *nix and Windows)
- Implemented static value of forwarded SSH port to prevent necessity to reconfigure software accessing guest via SSH
- Implemented collision prevention for IP address and host name (in case when several machines are created at once)
- Added configuration file [etc/config.yaml.dist](etc/config.yaml.dist)
- Added PHP 7.0 support
- Added PHP Storm configuration during project initialization (particularly automatic deployment settings)
- Added automatic vagrant plugins installation
- Configuration file [etc/config.yaml](etc/config.yaml.dist)
- PHP 7.0 support
- PHP Storm configuration during project initialization (particularly automatic deployment settings)
- Automatic vagrant plugins installation

## [v1.0.0] - 2016-01-11

### Added

- Integrated vagrant host manager plugin to allow automatic /etc/hosts update
- Added support of EE linked to CE using symlinks on *nix hosts
- Added ${MAGENTO_ROOT} environment variable, which stores installation path on the guest
- Added support of Rabbit MQ
- Added possibility to specify tokens for repo.magento.com composer repository
- Integrated vagrant host manager plugin to allow automatic /etc/hosts update
- Support of EE linked to CE using symlinks on *nix hosts
- ${MAGENTO_ROOT} environment variable, which stores installation path on the guest
- Support of Rabbit MQ
- Possibility to specify tokens for repo.magento.com composer repository
- git is now installed on guest machine
- Removed 'magento' MySQL user, password of 'root' user removed
- Database for integration tests are created by default
- Added script for clearing Magento cache from host command line
- Removed 'magento' MySQL user, password of 'root' user removed
- Database for integration tests are created by default
- Added script for clearing Magento cache from host command line
- Configured XDebug to allow remote debugging
- Fixed max_nesting_level issue with XDebug enabled
- Fixed max_nesting_level issue with XDebug enabled
- Apache is run by 'vagrant' user
- Enabled Magento cron jobs
- Enabled Magento cron jobs
- Enabled XDebug by default
- Created vagrant configuration for Magneto 2 CE developer's environment installation
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Everyone is welcome to contribute improvements and fixes to this project. There are no specific requirements, just create a pull request with proposed modifications.
Everyone is welcome to contribute improvements and fixes to this project. There are no specific requirements, just create a pull request with proposed modifications and try to run [tests](https://github.com/paliarush/magento2-vagrant-for-developers-tests) on your local environment.
Loading

0 comments on commit 75fdcb1

Please sign in to comment.