Merge pull request #34 from stackkit/feature/php8

PHP 8

Author: marickvantuil

.github/workflows/run-tests.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4, 7.3, 7.2]
+        php: [8.0, 7.4, 7.3, 7.2]
         laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*]
         os: [ubuntu-latest]
         include:
@@ -36,6 +36,12 @@ jobs:
             php: 7.4
           - laravel: 5.5.*
             php: 7.4
+          - laravel: 5.8.*
+            php: 8.0
+          - laravel: 5.7.*
+            php: 8.0
+          - laravel: 5.6.*
+            php: 8.0
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 
@@ -57,7 +63,7 @@ jobs:
         uses: actions/checkout@v1
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: mbstring, dom, fileinfo, mysql

README.md

@@ -28,9 +28,9 @@ Please check the table below for supported Laravel and PHP versions:
 | 5.6 | 7.2 or 7.3
 | 5.7 | 7.2 or 7.3
 | 5.8 | 7.2 or 7.3 or 7.4
-| 6.x | 7.2 or 7.3 or 7.4
-| 7.x | 7.2 or 7.3 or 7.4
-| 8.x | 7.3 or 7.4
+| 6.x | 7.2 or 7.3 or 7.4 or 8.0
+| 7.x | 7.2 or 7.3 or 7.4 or 8.0
+| 8.x | 7.3 or 7.4 or 8.0
 
 # Installation
 

composer.json

@@ -31,7 +31,6 @@
     "require-dev": {
         "mockery/mockery": "^1.2",
         "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0 || ^5.0",
-        "symfony/console": "^4.4|^5.0",
-        "tecnickcom/tcpdf": "^6.3"
+        "symfony/console": "^4.4|^5.0"
     }
 }

tests/DatabaseInteractionTest.php

@@ -4,7 +4,6 @@
 
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
-use TCPDF;
 
 class DatabaseInteractionTest extends TestCase
 {
@@ -209,10 +208,7 @@ public function attachments_should_be_saved_correctly()
     /** @test */
     public function in_memory_attachments_should_be_saved_correctly()
     {
-        $pdf = new TCPDF;
-        $pdf->Write(0, 'Hello CI!');
-
-        $rawData = $pdf->Output('generated.pdf', 'S');
+        $rawData = file_get_contents(__DIR__ . '/files/pdf-sample.pdf');
 
         $email = $this->composeEmail()
             ->attachData($rawData, 'generated.pdf', [

tests/SenderTest.php

@@ -5,7 +5,6 @@
 use Swift_Events_SendEvent;
 use Illuminate\Support\Facades\Mail;
 use Stackkit\LaravelDatabaseEmails\Email;
-use TCPDF;
 
 class SenderTest extends TestCase
 {
@@ -192,10 +191,7 @@ public function attachments_are_not_added_if_the_data_is_not_valid()
     /** @test */
     public function raw_attachments_are_added_to_the_email()
     {
-        $pdf = new TCPDF;
-        $pdf->Write(0, 'Hello CI!');
-
-        $rawData = $pdf->Output('generated.pdf', 'S');
+        $rawData = file_get_contents(__DIR__ . '/files/pdf-sample.pdf');
 
         $this->composeEmail()
             ->attachData($rawData, 'hello-ci.pdf', [