From c2e80c73ec4833c7e64d02be8da805f2b5a8fb06 Mon Sep 17 00:00:00 2001 From: Tom Newby Date: Fri, 2 Aug 2019 20:06:23 +1000 Subject: [PATCH 1/4] fix(doc): add return type for setUserProperties --- src/Amplitude.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Amplitude.php b/src/Amplitude.php index 1208807..317e0fd 100644 --- 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) { From f9fbd4e030b10be7a4d448d48af60546769508a8 Mon Sep 17 00:00:00 2001 From: Tom Newby Date: Fri, 2 Aug 2019 20:20:43 +1000 Subject: [PATCH 2/4] chore(update): update codesniffer version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8f380d9..7d947c2 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "phpunit/phpunit": "4.8.*", - "squizlabs/php_codesniffer": "2.6.*" + "squizlabs/php_codesniffer": "3.4.*" }, "autoload": { "psr-4": { From 21596de3fa979699b22786963ff22afc2805e871 Mon Sep 17 00:00:00 2001 From: Tom Newby Date: Fri, 2 Aug 2019 21:41:06 +1000 Subject: [PATCH 3/4] chore(php): update to supported versions --- .travis.yml | 16 +++++++--------- composer.json | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f58bec0..35302bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,19 +2,17 @@ language: php sudo: false php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - - hhvm + - 7.2 + - 7.3 + - 7.4 before_script: - - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then composer require satooshi/php-coveralls; fi + - composer require satooshi/php-coveralls - composer install --dev script: - - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi - - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then ./vendor/bin/phpcs --standard=psr2 src test; fi + - vendor/bin/phpunit --coverage-clover build/logs/clover.xml + - ./vendor/bin/phpcs --standard=psr2 src test after_success: - - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then php vendor/bin/coveralls; fi + - php vendor/bin/coveralls diff --git a/composer.json b/composer.json index 8f380d9..1f351f8 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": ">=5.4", + "php": ">=7.2", "psr/log": "^1.0" }, "require-dev": { From 6e2749f2e169c7658a200aa60643fda182808482 Mon Sep 17 00:00:00 2001 From: Tom Newby Date: Fri, 2 Aug 2019 21:45:16 +1000 Subject: [PATCH 4/4] Remove 7.4 for now --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 35302bf..9e4d269 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ sudo: false php: - 7.2 - 7.3 - - 7.4 before_script: - composer require satooshi/php-coveralls