Skip to content

Commit

Permalink
FIX Remove subsites from the module and fix linting error
Browse files Browse the repository at this point in the history
  • Loading branch information
raissanorth committed Jan 17, 2018
1 parent ddc5fde commit fbd89b3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ matrix:
- php: 7.1
env: DB=MYSQL PHPUNIT_COVERAGE_TEST=1
- php: 7.2
env: DB=MYSQL PHPUNIT_TEST=1 SUBSITES=1
env: DB=MYSQL PHPUNIT_TEST=1

before_script:
- phpenv rehash
- phpenv config-rm xdebug.ini

- composer validate
- if [[ $DB == "PGSQL" ]]; then composer require --no-update silverstripe/postgresql 2.0.x-dev; fi
- if [[ $SUBSITES ]]; then composer require --no-update silverstripe/subsites 2.0.x-dev; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile

script:
Expand Down
4 changes: 2 additions & 2 deletions src/Jobs/GenerateCSVJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ public function setup()

/**
* Normally Director::handleRequest will register an HTTPRequest service (when routing via frontend controllers).
* If that hasn't happened yet, we will register one instead (e.g. for unit testing, or when running from the command
* line). Also register a new controller if one hasn't been pushed yet.
* If that hasn't happened yet, we will register one instead (e.g. for unit testing, or when running from the
* command line). Also register a new controller if one hasn't been pushed yet.
*/
protected function initRequest()
{
Expand Down

0 comments on commit fbd89b3

Please sign in to comment.