Merge pull request #11 from gdebrauwer/delete-old-codes-query-fix-2

Fix deletion of old codes again

Author: gdebrauwer

.travis.yml

@@ -1,5 +1,8 @@
 language: php
 
+services:
+  - mysql
+
 env:
   global:
     - COVERAGE=0
@@ -25,6 +28,7 @@ matrix:
 
 before_script:
     - composer config discard-changes true
+    - mysql -e 'create database testing;'
 
 before_install:
   - travis_retry composer self-update
@@ -37,7 +41,7 @@ install:
   - travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction --no-suggest
 
 script:
-  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
+  - vendor/bin/phpunit --configuration=phpunit.travis.xml.dist --coverage-text --coverage-clover=coverage.clover
 
 after_success:
   - if [[ $COVERAGE = 1 ]]; then php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover report; fi

phpunit.travis.xml.dist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         verbose="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="Next Apps Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="tap" target="build/report.tap"/>
+        <log type="junit" target="build/report.junit.xml"/>
+        <log type="coverage-text" target="build/coverage.txt"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+    <php>
+        <env name="DB_CONNECTION" value="mysql"/>
+        <env name="DB_DATABASE" value="testing"/>
+        <env name="DB_USERNAME" value="root"/>
+    </php>
+</phpunit>

src/Models/VerificationCode.php

@@ -63,12 +63,14 @@ public static function boot()
                 return;
             }
 
-            VerificationCode::for($verificationCode->verifiable)
+            $oldVerificationCodeIds = VerificationCode::for($verificationCode->verifiable)
                 ->orderByDesc('expires_at')
                 ->orderByDesc('id')
                 ->skip($maxCodes)
                 ->take(PHP_INT_MAX)
-                ->delete();
+                ->pluck('id');
+
+            VerificationCode::whereIn('id', $oldVerificationCodeIds)->delete();
         });
     }
 

tests/TestCase.php

@@ -2,14 +2,16 @@
 
 namespace NextApps\VerificationCode\Tests;
 
+use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Facades\Notification;
 use NextApps\VerificationCode\VerificationCodeServiceProvider;
 use Orchestra\Testbench\TestCase as Orchestra;
 
 abstract class TestCase extends Orchestra
 {
-    use WithFaker;
+    use WithFaker,
+        DatabaseMigrations;
 
     /**
      * Setup the test environment.