Merge pull request #1 from BinarCode/master

Origin

Author: arthurkirkosa

.github/workflows/psalm.yml

@@ -10,11 +10,13 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [7.4]
-        laravel: [7.*]
+        laravel: [^7.0, ^8.0]
         dependency-version: [prefer-stable]
         include:
-          - laravel: 7.*
-            testbench: 5.*
+          - laravel: ^7.0
+            testbench: ^5.2
+          - laravel: ^8.0
+            testbench: ^6.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

.github/workflows/run-tests.yml

@@ -16,6 +16,12 @@ You can install the package via composer:
 composer require binarcode/laravel-mailator
 ```
 
+## Publish
+
+Publish migrations: `a vendor:publish --tag=mailator-migrations`
+
+Publish config: `a vendor:publish --tag=mailator-config`
+
 ## Usage
 
 It has mainly 2 directions of usage:

README.md

@@ -18,17 +18,16 @@
     ],
     "require": {
         "php": "^7.4",
-        "illuminate/support": "^7.0",
+        "illuminate/support": "^7.0|^8.0",
         "opis/closure": "^3.5",
         "tijsverkoyen/css-to-inline-styles": "^2.2"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.16",
-        "orchestra/testbench": "^5.0",
+        "laravel/legacy-factories": "^1.0",
+        "orchestra/testbench": "^5.2|^6.0",
         "phpunit/phpunit": "^9.0",
-        "spatie/test-time": "^1.2",
-        "psalm/plugin-laravel": "^1.2",
-        "vimeo/psalm": "^3.11"
+        "spatie/test-time": "^1.2"
     },
     "autoload": {
         "psr-4": {
@@ -41,7 +40,6 @@
         }
     },
     "scripts": {
-        "psalm": "vendor/bin/psalm",
         "test": "vendor/bin/phpunit",
         "test-coverage": "vendor/bin/phpunit --coverage-html coverage",
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"

composer.json

@@ -38,7 +38,10 @@ class MailTemplate extends Model implements MailTemplateable
 
     public function placeholders()
     {
-        return $this->hasMany(MailTemplatePlaceholder::class, 'mail_template_id');
+        return $this->hasMany(
+            config('mailator.templates.placeholder_model') ?? MailTemplatePlaceholder::class,
+            'mail_template_id'
+        );
     }
 
     public function htmlWithInlinedCss(): string

src/Models/MailTemplate.php

@@ -22,6 +22,9 @@ class MailTemplatePlaceholder extends Model
 
     public function mailTemplate()
     {
-        return $this->belongsTo(MailTemplate::class, 'mail_template_id');
+        return $this->belongsTo(
+            config('mailator.templates.template_model') ?? MailTemplate::class,
+            'mail_template_id'
+        );
     }
 }