Merge branch '2' into 3

This commit is contained in:
Dan Hensby 2020-04-07 08:43:19 +01:00
commit f39fafcd6d
No known key found for this signature in database
GPG Key ID: F76D6B5FE0626A99
4 changed files with 12 additions and 4 deletions

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/vendor/
/resources/
composer.lock

View File

@ -25,10 +25,10 @@ before_script:
- echo 'memory_limit=2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- composer validate
- composer require --no-update symbiote/silverstripe-queuedjobs ^4.0
- if [[ $SUBSITES ]]; then composer require --no-update silverstripe/subsites 2.3.x-dev; fi
- if [[ $DB == "PGSQL" ]]; then composer require --no-update silverstripe/postgresql 2.3.x-dev; fi
- composer require --no-update silverstripe/installer "$INSTALLER_VERSION"
- composer require symbiote/silverstripe-queuedjobs:^4.0 --no-update
- if [[ $SUBSITES ]]; then composer require silverstripe/subsites:2.3.x-dev --no-update; fi
- if [[ $DB == "PGSQL" ]]; then composer require silverstripe/postgresql:2.3.x-dev --no-update; fi
- composer require silverstripe/installer "$INSTALLER_VERSION" --no-update
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
script:

View File

@ -6,6 +6,7 @@
[![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
Adds support for fulltext search engines like Sphinx and Solr to SilverStripe CMS.
Compatible with PHP 7.2
## Maintainer Contact

View File

@ -46,6 +46,10 @@
"3.x-dev": "3.7.x-dev"
}
},
"scripts": {
"lint": "phpcs -s src/ tests/",
"lint-clean": "phpcbf src/ tests/"
},
"suggest": {
"symbiote/silverstripe-queuedjobs": "Add background execution of indexing tasks",
"silverstripe/fulltextsearch-localsolr": "Adds a ready-to-use local Solr server for initial development"