leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix php56 builds on travis

Browse Source
This commit is contained in:
Lorenzo Milesi
2018-07-17 14:47:49 +02:00
parent 7a571f4800
commit 1d7de616df
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -21,6 +21,9 @@ matrix:
# - vendor # - vendor
# - $HOME/.composer/cache # - $HOME/.composer/cache
before_install:
- echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
install: install:
- | - |
if [[ $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != hhv* ]]; then if [[ $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != hhv* ]]; then
@ -34,7 +37,6 @@ install:
- travis_retry composer install --prefer-dist --no-interaction - travis_retry composer install --prefer-dist --no-interaction
before_script: before_script:
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- php -r "echo INTL_ICU_VERSION . \"\n\";" - php -r "echo INTL_ICU_VERSION . \"\n\";"
- php -r "echo INTL_ICU_DATA_VERSION . \"\n\";" - php -r "echo INTL_ICU_DATA_VERSION . \"\n\";"
- mysql --version - mysql --version

2
src/User/Controller/SettingsController.php
View File

@ -230,7 +230,7 @@ class SettingsController extends Controller
* @throws \Throwable * @throws \Throwable
* @throws \yii\db\StaleObjectException * @throws \yii\db\StaleObjectException
*/ */
protected function disconnectSocialNetwork($id): void protected function disconnectSocialNetwork($id)
{ {
/** @var SocialNetworkAccount $account */ /** @var SocialNetworkAccount $account */
$account = $this->socialNetworkAccountQuery->whereId($id)->one(); $account = $this->socialNetworkAccountQuery->whereId($id)->one();