stan

Author: dpslwk

app/Console/Commands/Database/MigrateInstrumentaionCommand.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands\Database;
 
 use Carbon\Carbon;
+use DateTimeZone;
 use HMS\Tools\ToolManager;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
@@ -379,12 +380,12 @@ class MigrateInstrumentaionCommand extends Command
     protected $description = 'Migrate data form old instrumentation database';
 
     /**
-     * @var null|\DateTimeZone
+     * @var null|DateTimeZone
      */
     private static $utc = null;
 
     /**
-     * @var null|\DateTimeZone
+     * @var null|DateTimeZone
      */
     private static $gmt = null;
 
@@ -409,10 +410,10 @@ public function __construct(ToolManager $toolManager)
     public function handle()
     {
         if (is_null(self::$utc)) {
-            self::$utc = new \DateTimeZone('UTC');
+            self::$utc = new DateTimeZone('UTC');
         }
         if (is_null(self::$gmt)) {
-            self::$gmt = new \DateTimeZone('Europe/London');
+            self::$gmt = new DateTimeZone('Europe/London');
         }
 
         $this->info('Please provide details for connecting to the instrumentation database.');

app/Console/Commands/Database/MigrateMembersAreaCommand.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands\Database;
 
 use Carbon\Carbon;
+use DateTimeZone;
 use Doctrine\ORM\EntityManagerInterface;
 use HMS\Entities\Banking\BankType;
 use HMS\Entities\Gatekeeper\AccessLogResult;
@@ -113,12 +114,12 @@ class MigrateMembersAreaCommand extends Command
     protected $description = 'Migrate data form old members-area database';
 
     /**
-     * @var null|\DateTimeZone
+     * @var null|DateTimeZone
      */
     private static $utc = null;
 
     /**
-     * @var null|\DateTimeZone
+     * @var null|DateTimeZone
      */
     private static $gmt = null;
 
@@ -130,10 +131,10 @@ class MigrateMembersAreaCommand extends Command
     public function handle()
     {
         if (is_null(self::$utc)) {
-            self::$utc = new \DateTimeZone('UTC');
+            self::$utc = new DateTimeZone('UTC');
         }
         if (is_null(self::$gmt)) {
-            self::$gmt = new \DateTimeZone('Europe/London');
+            self::$gmt = new DateTimeZone('Europe/London');
         }
 
         $this->info('Please provide details for connecting to the members-area database.');

app/Console/Commands/Invites/PurgeCommand.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands\Invites;
 
 use Carbon\Carbon;
+use DateInterval;
 use HMS\Repositories\InviteRepository;
 use HMS\Repositories\MetaRepository;
 use Illuminate\Console\Command;
@@ -59,7 +60,7 @@ public function handle()
                 if ($this->metaRepository->has('purge_cutoff_interval')) {
                     $interval = $this->metaRepository->get('purge_cutoff_interval');
                     $date = Carbon::now()
-                        ->sub(new \DateInterval($interval));
+                        ->sub(new DateInterval($interval));
                 } else {
                     $date = Carbon::now()->subMonths(6);
                 }

app/Console/Commands/Permissions/BaseCommand.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands\Permissions;
 
 use Doctrine\ORM\EntityManagerInterface;
-use Hms\Entities\Role;
+use HMS\Entities\Role;
 use HMS\Repositories\RoleRepository;
 use Illuminate\Console\Command;
 use LaravelDoctrine\ACL\Permissions\Permission;

app/Console/Commands/Permissions/ListCommand.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands\Permissions;
 
-use Hms\Entities\Role;
+use HMS\Entities\Role;
 
 class ListCommand extends BaseCommand
 {

app/HMS/Doctrine/CarbonType.php

@@ -13,7 +13,7 @@
 class CarbonType extends DateTimeType
 {
     /**
-     * @var null|\DateTimeZone
+     * @var null|DateTimeZone
      */
     private static $utc = null;
 
@@ -39,7 +39,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
         }
 
         if (is_null(self::$utc)) {
-            self::$utc = new \DateTimeZone('UTC');
+            self::$utc = new DateTimeZone('UTC');
         }
 
         if ($value instanceof DateTime) {
@@ -67,7 +67,7 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
         }
 
         if (is_null(self::$utc)) {
-            self::$utc = new \DateTimeZone('UTC');
+            self::$utc = new DateTimeZone('UTC');
         }
 
         if ($value instanceof DateTime) {

app/HMS/Entities/User.php

@@ -3,6 +3,7 @@
 namespace HMS\Entities;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Exception;
 use HMS\Entities\Banking\Account;
 use HMS\Entities\Gatekeeper\Pin;
 use HMS\Entities\Gatekeeper\RfidTag;
@@ -240,7 +241,7 @@ public function getAuthPassword()
         // TODO: when using Doctrine PasswordStore
         // return $this->getPassword();
         // else
-        throw new \Exception('Not Supported');
+        throw new Exception('Not Supported');
     }
 
     /**

app/HMS/Gatekeeper/TemporaryAccessBookingManager.php

@@ -9,6 +9,7 @@
 use App\Events\Gatekeeper\NewBooking;
 use Carbon\Carbon;
 use Carbon\CarbonInterval;
+use DateInterval;
 use HMS\Entities\Gatekeeper\BookableArea;
 use HMS\Entities\Gatekeeper\Building;
 use HMS\Entities\Gatekeeper\BuildingAccessState;
@@ -91,7 +92,7 @@ public function book(
 
         // BASIC CHECKS
         $maxLength = (int) CarbonInterval::instance(
-            new \DateInterval($this->metaRepository->get('temp_access_reset_interval', 'PT12H'))
+            new DateInterval($this->metaRepository->get('temp_access_reset_interval', 'PT12H'))
         )->totalMinutes;
         $basicChecks = $this->basicTimeChecks($start, $end, $maxLength);
         if (is_string($basicChecks)) {
@@ -217,7 +218,7 @@ public function book(
      *
      * @return string|TemporaryAccessBooking String with error message or a Booking
      */
-    public function update(TemporaryAccessBooking $booking, Carbon $start = null, Carbon $end = null)
+    public function update(TemporaryAccessBooking $booking, ?Carbon $start = null, ?Carbon $end = null)
     {
         $messages = collect(); // TODO: thinking of a way to pass over limit warnings back to grant.all
         // check isApproved
@@ -237,7 +238,7 @@ public function update(TemporaryAccessBooking $booking, Carbon $start = null, Ca
         }
 
         $maxLength = (int) CarbonInterval::instance(
-            new \DateInterval($this->metaRepository->get('temp_access_reset_interval', 'PT12H'))
+            new DateInterval($this->metaRepository->get('temp_access_reset_interval', 'PT12H'))
         )->totalMinutes;
         $basicChecks = $this->basicTimeChecks($start, $end, $maxLength);
 

app/HMS/Tools/BookingManager.php

@@ -50,7 +50,7 @@ public function __construct(
      *
      * @return string|Booking String with error message or a Booking
      */
-    public function bookNormal(Tool $tool, Carbon $start, Carbon $end, User $user = null)
+    public function bookNormal(Tool $tool, Carbon $start, Carbon $end, ?User $user = null)
     {
         if (is_null($user)) {
             $user = Auth::user();
@@ -100,7 +100,7 @@ public function bookNormal(Tool $tool, Carbon $start, Carbon $end, User $user =
      *
      * @return string|Booking String with error message or a Booking
      */
-    public function bookInduction(Tool $tool, Carbon $start, Carbon $end, User $user = null)
+    public function bookInduction(Tool $tool, Carbon $start, Carbon $end, ?User $user = null)
     {
         if (is_null($user)) {
             $user = Auth::user();
@@ -143,7 +143,7 @@ public function bookInduction(Tool $tool, Carbon $start, Carbon $end, User $user
      *
      * @return string|Booking String with error message or a Booking
      */
-    public function bookMaintenance(Tool $tool, Carbon $start, Carbon $end, User $user = null)
+    public function bookMaintenance(Tool $tool, Carbon $start, Carbon $end, ?User $user = null)
     {
         if (is_null($user)) {
             $user = Auth::user();
@@ -190,7 +190,7 @@ public function bookMaintenance(Tool $tool, Carbon $start, Carbon $end, User $us
      *
      * @return string|Booking String with error message or a Booking
      */
-    public function update(Tool $tool, Booking $booking, Carbon $start = null, Carbon $end = null)
+    public function update(Tool $tool, Booking $booking, ?Carbon $start = null, ?Carbon $end = null)
     {
         $user = Auth::user();
 

app/HMS/Traits/Entities/SoftDeletable.php

@@ -18,7 +18,7 @@ trait SoftDeletable
      *
      * @return $this
      */
-    public function setDeletedAt(Carbon $deletedAt = null)
+    public function setDeletedAt(?Carbon $deletedAt = null)
     {
         $this->deletedAt = $deletedAt;