Merge branch 'master' into feature-update-core-ui

Author: bambamboole

.env.example

@@ -37,6 +37,7 @@ MAIL_ENCRYPTION=null
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
 
 # Access
 ENABLE_REGISTRATION=true

.gitignore

@@ -19,6 +19,7 @@ Thumbs.db
 *.sublime-workspace
 .project
 _ide_helper.php
+.phpstorm.meta.php
 composer.phar
 error.log
 output.txt

app/Helpers/Frontend/Auth/Socialite.php

@@ -41,11 +41,11 @@ public function getSocialLinks()
             $socialite_enable[] = "<a href='".route('frontend.auth.social.login', 'twitter')."' class='btn btn-sm btn-outline-info m-1'><i class='fa fa-twitter'></i>  ".__('labels.frontend.auth.login_with', ['social_media' => 'Twitter']).'</a>';
         }
 
-        if (count($socialite_enable)) {
+        if ($count = count($socialite_enable)) {
             $socialite_links .= '<hr />';
         }
 
-        for ($i = 0; $i < count($socialite_enable); $i++) {
+        for ($i = 0; $i < $count; $i++) {
             $socialite_links .= ($socialite_links != '' ? ' ' : '').$socialite_enable[$i];
         }
 

composer.json

@@ -9,9 +9,9 @@
         "appstract/laravel-blade-directives": "^0.4.4",
         "arcanedev/log-viewer": "^4.4",
         "arcanedev/no-captcha": "^5.0",
+        "codedungeon/phpunit-result-printer": "0.4.4",
         "creativeorange/gravatar": "~1.0",
         "davejamesmiller/laravel-breadcrumbs": "^4.1",
-        "doctrine/dbal": "^2.6",
         "fideloper/proxy": "~3.3",
         "hieu-le/active": "^3.5",
         "laravel/framework": "5.5.*",
@@ -23,6 +23,7 @@
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.0",
+        "barryvdh/laravel-ide-helper": "^2.4",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "laravel/browser-kit-testing": "^2.0",