From 1d7de616dfd7e8467afa4a3d351744ba3245f13c Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Tue, 17 Jul 2018 14:47:49 +0200 Subject: [PATCH] Fix php56 builds on travis --- .travis.yml | 4 +++- src/User/Controller/SettingsController.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 251647b..27175a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,9 @@ matrix: # - vendor # - $HOME/.composer/cache +before_install: + - echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini + install: - | if [[ $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != hhv* ]]; then @@ -34,7 +37,6 @@ install: - travis_retry composer install --prefer-dist --no-interaction 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_DATA_VERSION . \"\n\";" - mysql --version diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php index d4a3a3d..d975c84 100644 --- a/src/User/Controller/SettingsController.php +++ b/src/User/Controller/SettingsController.php @@ -230,7 +230,7 @@ class SettingsController extends Controller * @throws \Throwable * @throws \yii\db\StaleObjectException */ - protected function disconnectSocialNetwork($id): void + protected function disconnectSocialNetwork($id) { /** @var SocialNetworkAccount $account */ $account = $this->socialNetworkAccountQuery->whereId($id)->one();