Merge branch 'v2'

.travis.yml

@@ -1,14 +1,11 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
   - 7.3
 
-sudo: false
-
 env:
   matrix:
     - COMPOSER_FLAGS="--prefer-lowest"

README.md

@@ -66,19 +66,27 @@ There are also two .env variables you'll need to set depending on if you use not
 - **LARAMETRICS_NOTIFICATION_EMAIL**, the address that all email notifications will be routed to
 - **LARAMETRICS_NOTIFICATION_SLACK_WEBHOOK**, a Slack webhook configured for receiving requests and adding messages to a specified channel. More info [here](https://get.slack.help/hc/en-us/articles/115005265063-Incoming-WebHooks-for-Slack).
 
+Additionally, there's a few other niche variables that you can set specifically for notifications. See a brief description of each below, or a more details on the documentation site.
+
+- **LARAMETRICS_FROM_EMAIL**, the email address that notifications will appear to be sent from
+- **LARAMETRICS_FROM_NAME**, the name that will appear alongside associated email notifications
+- **LARAMETRICS_MODEL_SUBJECT**, the subject of notification emails that arrive when models are created/updated/deleted
+- **LARAMETRICS_LOG_SUBJECT**, the subject of notification emails that arrive when an application log event is recorded
+- **LARAMETRICS_ROUTE_SUBJECT**, the subject of notification emails that arrive when a route has been visited
+
 ## Roadmap
 Larametrics is still in development, constantly being optimized and attempting to be made compatible for older Laravel versions. Here's what's on the path ahead:
 
 - [x] Add the ability to ignore specific request paths
+- [x] Integrate custom webhooks as a notification option
+- [x] Move listeners out of root directory and into their own namespace
+- [x] Optimize front-end for mobile devices
+- [x] Expand on the notification filter options
 - [ ] Integrate Twilio for text message notifications
-- [ ] Integrate Zapier for custom notifications
-- [ ] Move listeners out of root directory and into their own namespace
 - [ ] Optimize database querying for expired models to improve performance
-- [ ] Optimize front-end for mobile devices
 - [ ] Add Artisan commands for displaying Larametrics data
 - [ ] Add watcher for Queues
 - [ ] Add watcher for Scheduled Tasks
-- [ ] Expand on the notification filter options
 - [ ] Compatibility for Laravel 4.2+
 
 ## Difference to Laravel Telescope

composer.json

@@ -11,16 +11,26 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4"
+        "php": "^7.0",
+        "guzzlehttp/guzzle": "^6.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5"
+        "orchestra/testbench": "~3.4.0|~3.6.0|~3.7.0|~3.8.0|^4.0",
+        "phpunit/phpunit": "^6.0|^7.0|^8.0"
     },
     "autoload": {
         "psr-4": {
-            "Aschmelyun\\Larametrics\\": "src/"
+            "Aschmelyun\\Larametrics\\": "src"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Aschmelyun\\Larametrics\\Tests\\": "tests"
+        }
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit"
+    },
     "extra": {
         "laravel": {
             "providers": [

src/config/larametrics.php → config/larametrics.php

@@ -158,7 +158,8 @@
     */
     'notificationMethods' => [
         'email' => env('LARAMETRICS_NOTIFICATION_EMAIL', 'admin@localhost'),
-        'slack' => env('LARAMETRICS_NOTIFICATION_SLACK_WEBHOOK', '')
+        'slack' => env('LARAMETRICS_NOTIFICATION_SLACK_WEBHOOK', ''),
+        'webhook' => env('LARAMETRICS_NOTIFICATION_CUSTOM_WEBHOOK', '')
     ]
 
 ];

database/migrations/2020_01_09_000000_add_user_id_column_to_larametrics_models_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUserIdColumnToLarametricsModelsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('larametrics_models', function ($table) {
+            $table->integer('user_id')
+                ->after('model_id')
+                ->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('larametrics_models', function ($table) {
+            $table->dropColumn('user_id');
+        });
+    }
+}