Merge pull request #61 from halfpastfouram/dev

Updated examples, minor feature updates, corrected JsonSerializable methods

.travis.yml

@@ -4,6 +4,8 @@ php:
   - '7.0'
   - '7.1'
   - '7.2'
+  - '7.3'
+  - '7.4'
   - nightly
 
 before_script:
@@ -12,11 +14,9 @@ before_script:
   - mkdir build/logs -p
 
 script:
-  - phpunit
+  - composer test
   - composer cs-check
-
-after_success:
-  - vendor/bin/test-reporter
+  - php vendor/bin/security-checker security:check
 
 after_script:
   - rm -rf build/logs
@@ -27,5 +27,5 @@ matrix:
 
 branches:
   only:
-  - master
-  - dev
+    - master
+    - dev

composer.json

@@ -8,7 +8,7 @@
   ],
   "homepage": "http://github.com/halfpastfouram/PHPChartJS",
   "type": "package",
-  "version": "v1.1.0",
+  "version": "v1.2.0-dev",
   "license": "AGPL-3.0-or-later",
   "authors": [
     {
@@ -17,15 +17,17 @@
   ],
   "require": {
     "php": ">=5.6.0 || ^7.0",
-    "zendframework/zend-json": "3.0.0",
-    "zf1/zend-reflection": "1.12.11",
-    "halfpastfouram/collection": "1.0.0"
+    "ext-dom": "*",
+    "ext-json": "*",
+    "laminas/laminas-json": "3.1.2",
+    "halfpastfouram/collection": "1.0.0",
+    "symfony/var-dumper": "^3.4"
   },
   "require-dev": {
     "phpunit/phpunit": "5.7.*",
-    "codeclimate/php-test-reporter": "dev-master",
-    "squizlabs/php_codesniffer": "3.0.0",
-    "friendsofphp/php-cs-fixer": "2.11.1"
+    "squizlabs/php_codesniffer": "3.5.3",
+    "friendsofphp/php-cs-fixer": "*",
+    "sensiolabs/security-checker": "^5.0"
   },
   "autoload": {
     "psr-4": {
@@ -34,6 +36,7 @@
     }
   },
   "scripts": {
+    "test": "./vendor/bin/phpunit",
     "cs-check": "./vendor/bin/phpcs",
     "cs-fix": "./vendor/bin/phpcbf"
   }