Merge pull request #36 from endeveit/bugfix/iss-34-php7

Fix #34. Evaluation of indirect expressions in PHP7
thephpleague · Sep 22, 2016 · bad91f2 · bad91f2
2 parents 8c31ec0 + 6c81ab4
commit bad91f2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
 
 before_script:
   - composer self-update

diff --git a/src/Laravel/Provider/StatsdServiceProvider.php b/src/Laravel/Provider/StatsdServiceProvider.php
@@ -44,20 +44,26 @@ protected function registerStatsD()
             function ($app) {
                 // Set Default host and port
                 $options = array();
-                if (isset($app['config']['statsd.host'])) {
-                    $options['host'] = $app['config']['statsd.host'];
+                $config  = $app['config'];
+
+                if (isset($config['statsd.host'])) {
+                    $options['host'] = $config['statsd.host'];
                 }
-                if (isset($app['config']['statsd.port'])) {
-                    $options['port'] = $app['config']['statsd.port'];
+
+                if (isset($config['statsd.port'])) {
+                    $options['port'] = $config['statsd.port'];
                 }
-                if (isset($app['config']['statsd.namespace'])) {
-                    $options['namespace'] = $app['config']['statsd.namespace'];
+
+                if (isset($config['statsd.namespace'])) {
+                    $options['namespace'] = $config['statsd.namespace'];
                 }
-                if (isset($app['config']['statsd.timeout'])) {
-                    $options['timeout'] = $app['config']['statsd.timeout'];
+
+                if (isset($config['statsd.timeout'])) {
+                    $options['timeout'] = $config['statsd.timeout'];
                 }
-                if (isset($app['config']['statsd.throwConnectionExceptions'])) {
-                    $options['throwConnectionExceptions'] = $app['config']['statsd.throwConnectionExceptions'];
+
+                if (isset($config['statsd.throwConnectionExceptions'])) {
+                    $options['throwConnectionExceptions'] = (boolean) $config['statsd.throwConnectionExceptions'];
                 }
 
                 // Create

diff --git a/src/Laravel5/Provider/StatsdServiceProvider.php b/src/Laravel5/Provider/StatsdServiceProvider.php
@@ -47,20 +47,26 @@ protected function registerStatsD()
             function ($app) {
                 // Set Default host and port
                 $options = array();
-                if (isset($app['config']['statsd.host'])) {
-                    $options['host'] = $app['config']['statsd.host'];
+                $config  = $app['config'];
+
+                if (isset($config['statsd.host'])) {
+                    $options['host'] = $config['statsd.host'];
                 }
-                if (isset($app['config']['statsd.port'])) {
-                    $options['port'] = $app['config']['statsd.port'];
+
+                if (isset($config['statsd.port'])) {
+                    $options['port'] = $config['statsd.port'];
                 }
-                if (isset($app['config']['statsd.namespace'])) {
-                    $options['namespace'] = $app['config']['statsd.namespace'];
+
+                if (isset($config['statsd.namespace'])) {
+                    $options['namespace'] = $config['statsd.namespace'];
                 }
-                if (isset($app['config']['statsd.timeout'])) {
-                    $options['timeout'] = $app['config']['statsd.timeout'];
+
+                if (isset($config['statsd.timeout'])) {
+                    $options['timeout'] = $config['statsd.timeout'];
                 }
-                if (isset($app['config']['statsd.throwConnectionExceptions'])) {
-                    $options['throwConnectionExceptions'] = $app['config']['statsd.throwConnectionExceptions'];
+
+                if (isset($config['statsd.throwConnectionExceptions'])) {
+                    $options['throwConnectionExceptions'] = (boolean) $config['statsd.throwConnectionExceptions'];
                 }
 
                 // Create