Fix styleci issues, try and fix a travis issue
This commit is contained in:
parent
e540eb767f
commit
b0c5374943
2 changed files with 6 additions and 5 deletions
|
@ -38,6 +38,10 @@ matrix:
|
||||||
- php: nightly
|
- php: nightly
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
|
- cp .env.travis .env
|
||||||
|
- echo 'error_log = "/tmp/php.error.log"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
|
||||||
|
- psql -U travis -c 'create database travis_ci_test'
|
||||||
|
- psql -U travis -d travis_ci_test -c 'create extension postgis'
|
||||||
- mkdir travis-phantomjs
|
- mkdir travis-phantomjs
|
||||||
- wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
|
- wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
|
||||||
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
|
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
|
||||||
|
@ -51,10 +55,6 @@ install:
|
||||||
- travis/install-nginx.sh
|
- travis/install-nginx.sh
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- echo 'error_log = "/tmp/php.error.log"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
|
|
||||||
- psql -U travis -c 'create database travis_ci_test'
|
|
||||||
- psql -U travis -d travis_ci_test -c 'create extension postgis'
|
|
||||||
- cp .env.travis .env
|
|
||||||
- php artisan key:generate
|
- php artisan key:generate
|
||||||
- php artisan migrate
|
- php artisan migrate
|
||||||
- php artisan db:seed
|
- php artisan db:seed
|
||||||
|
|
|
@ -84,8 +84,9 @@ class Place extends Model
|
||||||
// id can’t be null, so this will return empty set
|
// id can’t be null, so this will return empty set
|
||||||
return $query->whereNull('id');
|
return $query->whereNull('id');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query->where('external_urls', '@>', json_encode([
|
return $query->where('external_urls', '@>', json_encode([
|
||||||
$type => $url
|
$type => $url,
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue