remove support for php 7.x

Author: Bart-Kuenen-nextapps

composer.json

@@ -28,7 +28,7 @@
         }
     ],
     "require": {
-        "php": "^7.3|^7.4|^8.0|^8.1|^8.2",
+        "php": "^8.0|^8.1|^8.2",
         "illuminate/database": "^7.0|^8.0|^9.0|^10.0",
         "illuminate/notifications": "^7.0|^8.0|^9.0|^10.0",
         "illuminate/support": "^7.0|^8.0|^9.0|^10.0"

database/migrations/create_verification_codes_table.php.stub

@@ -6,12 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 class CreateVerificationCodesTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
+    public function up() : void
     {
         Schema::create('verification_codes', function (Blueprint $table) {
             $table->bigIncrements('id');
@@ -22,12 +17,7 @@ class CreateVerificationCodesTable extends Migration
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
+    public function down() : void
     {
         Schema::dropIfExists('verification_codes');
     }

src/Models/VerificationCode.php

@@ -2,46 +2,27 @@
 
 namespace NextApps\VerificationCode\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Hash;
 use NextApps\VerificationCode\Support\CodeGenerator;
 
 class VerificationCode extends Model
 {
-    /**
-     * The attributes that are mass assignable.
-     *
-     * @var array
-     */
     protected $fillable = [
         'code',
         'verifiable',
         'expires_at',
     ];
 
-    /**
-     * The attributes that should be hidden for arrays.
-     *
-     * @var array
-     */
     protected $hidden = [
         'code',
     ];
 
-    /**
-     * The attributes that should be cast to native types.
-     *
-     * @var array
-     */
     protected $casts = [
         'expires_at' => 'datetime',
     ];
 
-    /**
-     * The "booting" method of the model.
-     *
-     * @return void
-     */
     public static function boot()
     {
         parent::boot();
@@ -74,14 +55,7 @@ public static function boot()
         });
     }
 
-    /**
-     * Create a verification code for the verifiable.
-     *
-     * @param string $verifiable
-     *
-     * @return string
-     */
-    public static function createFor(string $verifiable)
+    public static function createFor(string $verifiable) : string
     {
         self::create([
             'code' => $code = app(CodeGenerator::class)->generate(),
@@ -91,27 +65,12 @@ public static function createFor(string $verifiable)
         return $code;
     }
 
-    /**
-     * Scope a query to only include verification codes for the provided verifiable.
-     *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     * @param string $verifiable
-     *
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    public function scopeFor($query, string $verifiable)
+    public function scopeFor(Builder $query, string $verifiable) : Builder
     {
         return $query->where('verifiable', $verifiable);
     }
 
-    /**
-     * Scope a query to only include verification codes that have not expired.
-     *
-     * @param \Illuminate\Database\Eloquent\Builder $query
-     *
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    public function scopeNotExpired($query)
+    public function scopeNotExpired(Builder $query) : Builder
     {
         return $query->where('expires_at', '>=', now());
     }

src/Notifications/VerificationCodeCreated.php

@@ -11,37 +11,19 @@ class VerificationCodeCreated extends Notification implements ShouldQueue, Verif
 {
     use Queueable;
 
-    /**
-     * @var string
-     */
     public $code;
 
-    /**
-     * Create a new message instance.
-     *
-     * @param string $code
-     */
     public function __construct(string $code)
     {
         $this->code = $code;
     }
 
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @return array
-     */
-    public function via()
+    public function via() : array
     {
         return ['mail'];
     }
 
-    /**
-     * Build the mail representation of the notification.
-     *
-     * @return \Illuminate\Notifications\Messages\MailMessage
-     */
-    public function toMail()
+    public function toMail() : MailMessage
     {
         return (new MailMessage())
             ->subject(__('Your verification code'))

src/Notifications/VerificationCodeCreatedInterface.php

@@ -4,10 +4,5 @@
 
 interface VerificationCodeCreatedInterface
 {
-    /**
-     * Create a new notification instance.
-     *
-     * @param string $code
-     */
     public function __construct(string $code);
 }

src/Support/CodeGenerator.php

@@ -6,12 +6,7 @@
 
 class CodeGenerator
 {
-    /**
-     * Generate a random code.
-     *
-     * @return string
-     */
-    public function generate()
+    public function generate() : string
     {
         $length = $this->getLength();
         $characters = $this->getCharacters();
@@ -23,14 +18,7 @@ public function generate()
             ->join('');
     }
 
-    /**
-     * Get the required length.
-     *
-     * @throws \RuntimeException
-     *
-     * @return int
-     */
-    protected function getLength()
+    protected function getLength() : int
     {
         $length = config('verification-code.length');
 
@@ -41,14 +29,7 @@ protected function getLength()
         return $length;
     }
 
-    /**
-     * Get the allowed characters.
-     *
-     * @throws \RuntimeException
-     *
-     * @return string
-     */
-    protected function getCharacters()
+    protected function getCharacters() : string
     {
         $characters = config('verification-code.characters');
 

src/VerificationCode.php

@@ -12,12 +12,7 @@
  */
 class VerificationCode extends Facade
 {
-    /**
-     * Get the registered name of the component.
-     *
-     * @return string
-     */
-    protected static function getFacadeAccessor()
+    protected static function getFacadeAccessor() : string
     {
         return 'verification-code';
     }

src/VerificationCodeManager.php

@@ -14,13 +14,8 @@ class VerificationCodeManager
 {
     /**
      * Create and send a verification code.
-     *
-     * @param string $verifiable
-     * @param string $channel
-     *
-     * @return void
      */
-    public function send(string $verifiable, string $channel = 'mail')
+    public function send(string $verifiable, string $channel = 'mail') : void
     {
         if ($this->isTestVerifiable($verifiable)) {
             return;
@@ -38,16 +33,7 @@ public function send(string $verifiable, string $channel = 'mail')
         Notification::route($channel, $verifiable)->notify($notification);
     }
 
-    /**
-     * Verify the code.
-     *
-     * @param string $code
-     * @param string $verifiable
-     * @param bool $deleteAfterVerification
-     *
-     * @return bool
-     */
-    public function verify(string $code, string $verifiable, bool $deleteAfterVerification = true)
+    public function verify(string $code, string $verifiable, bool $deleteAfterVerification = true) : bool
     {
         if ($this->isTestVerifiable($verifiable)) {
             return $this->isTestCode($code);
@@ -72,14 +58,7 @@ public function verify(string $code, string $verifiable, bool $deleteAfterVerifi
         return true;
     }
 
-    /**
-     * Check if the verifiable is a test verifiable.
-     *
-     * @param string $verifiable
-     *
-     * @return bool
-     */
-    protected function isTestVerifiable(string $verifiable)
+    protected function isTestVerifiable(string $verifiable) : bool
     {
         $testVerifiables = config('verification-code.test_verifiables', []);
 
@@ -90,14 +69,7 @@ protected function isTestVerifiable(string $verifiable)
         return in_array(strtolower($verifiable), $testVerifiables);
     }
 
-    /**
-     * Check if the code is the test code.
-     *
-     * @param string $code
-     *
-     * @return bool
-     */
-    protected function isTestCode(string $code)
+    protected function isTestCode(string $code) : bool
     {
         if (empty(config('verification-code.test_code'))) {
             return false;
@@ -106,14 +78,7 @@ protected function isTestCode(string $code)
         return $code === config('verification-code.test_code');
     }
 
-    /**
-     * Get the notification class.
-     *
-     * @throws \RuntimeException
-     *
-     * @return string
-     */
-    protected function getNotificationClass()
+    protected function getNotificationClass() : string
     {
         $notificationClass = config('verification-code.notification', VerificationCodeCreated::class);
 

src/VerificationCodeServiceProvider.php

@@ -7,9 +7,6 @@
 
 class VerificationCodeServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the application services.
-     */
     public function boot()
     {
         $this->publishes([
@@ -23,9 +20,6 @@ public function boot()
         }
     }
 
-    /**
-     * Register the application services.
-     */
     public function register()
     {
         $this->app->bind('verification-code', function () {

tests/TestCase.php

@@ -13,11 +13,6 @@ abstract class TestCase extends Orchestra
     use WithFaker,
         DatabaseMigrations;
 
-    /**
-     * Setup the test environment.
-     *
-     * @return void
-     */
     protected function setUp() : void
     {
         parent::setUp();
@@ -28,25 +23,16 @@ protected function setUp() : void
     }
 
     /**
-     * Load package service provider.
-     *
      * @param \Illuminate\Foundation\Application $app
-     *
-     * @return array
      */
-    protected function getPackageProviders($app)
+    protected function getPackageProviders($app) : array
     {
         return [
             VerificationCodeServiceProvider::class,
         ];
     }
 
-    /**
-     * Set up the database.
-     *
-     * @return void
-     */
-    protected function setUpDatabase()
+    protected function setUpDatabase() : void
     {
         include_once __DIR__ . '/../database/migrations/create_verification_codes_table.php.stub';