Merge branch 'master' into phpunit

zumba · Aug 8, 2019 · 4b87bfc · 4b87bfc
2 parents 2ddaa6b + a4de458
commit 4b87bfc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "8.3.*",
-        "squizlabs/php_codesniffer": "2.6.*"
+        "squizlabs/php_codesniffer": "3.4.*"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Amplitude.php b/src/Amplitude.php
@@ -359,6 +359,7 @@ public function setDeviceId($deviceId)
      * If no events are logged, it will not get sent to Amplitude
      *
      * @param array $userProperties
+     * @return \Zumba\Amplitude\Amplitude
      */
     public function setUserProperties(array $userProperties)
     {