[DB] minor fixes

Author: barryo

app/Models/User.php

@@ -247,7 +247,7 @@ public function scopeActiveOnly( Builder $query ): Builder
      *
      * @return Builder
      */
-    public function scopeByPrivs( Builder $query, int $priv = null ): Builder
+    public function scopeByPrivs( Builder $query, ?int $priv = null ): Builder
     {
         return $query->select( 'user.*' )->leftJoin( 'customer_to_users AS c2u', 'c2u.user_id', 'user.id' )
             ->when( $priv, function( Builder $q, $priv ){

app/Services/Grapher/Graph.php

@@ -1030,7 +1030,7 @@ public function getParamsAsArray(): array
      *
      * @return string|null The verified / sanitised / default value
      */
-    public static function processParameterPeriod( string $value = null, string $default = null, $withExtended = false ): string|null
+    public static function processParameterPeriod( ?string $value = null, ?string $default = null, $withExtended = false ): string|null
     {
         if( $withExtended && !isset( self::PERIODS_EXTENDED[ $value ] ) ) {
             $value = $default ?? self::PERIOD_DEFAULT;
@@ -1051,7 +1051,7 @@ public static function processParameterPeriod( string $value = null, string $def
      *
      * @return string|null The verified / sanitised / default value
      */
-    public static function processParameterProtocol( string $value = null ): string|null
+    public static function processParameterProtocol( ?string $value = null ): string|null
     {
         if( !isset( self::PROTOCOLS[ $value ] ) ) {
             $value = self::PROTOCOL_DEFAULT;
@@ -1068,7 +1068,7 @@ public static function processParameterProtocol( string $value = null ): string|
      * @param string|null $value The user input value
      * @return string|null The verified / sanitised / default value
      */
-    public static function processParameterRealProtocol( string $value = null ): string|null
+    public static function processParameterRealProtocol( ?string $value = null ): string|null
     {
         if( !isset( self::PROTOCOLS_REAL[ $value ] ) ) {
             $value = self::PROTOCOL_IPV4;
@@ -1087,7 +1087,7 @@ public static function processParameterRealProtocol( string $value = null ): str
      *
      * @return string|null The verified / sanitised / default value
      */
-    public static function processParameterCategory( string $value = null, bool $bits_pkts_only = false ): string|null
+    public static function processParameterCategory( ?string $value = null, bool $bits_pkts_only = false ): string|null
     {
         if( ( $bits_pkts_only && !isset( self::CATEGORIES_BITS_PKTS[$value] ) ) || ( !$bits_pkts_only && !isset( self::CATEGORIES[ $value ] ) ) ) {
             $value = self::CATEGORY_DEFAULT;
@@ -1105,7 +1105,7 @@ public static function processParameterCategory( string $value = null, bool $bit
      *
      * @return string|null The verified / sanitised / default value
      */
-    public static function processParameterType( string $value = null ): string|null
+    public static function processParameterType( ?string $value = null ): string|null
     {
         if( !isset( self::TYPES[ $value ] ) ) {
             $value = self::TYPE_DEFAULT;

app/Support/helpers.php

@@ -147,11 +147,11 @@ function rrd_graph( $a, $b ) { return []; }
  *  on 21 Apr 2024 as that repo has switched to read-only and was
  *  marked as no longer supported. MIT licensed.
  *
- * @param string $value
- * @param bool $inline
+ * @param ?string $value
+ * @param ?bool $inline
  * @return Parsedown|string
  */
-function parsedown(?string $value = null, bool $inline = null)
+function parsedown(?string $value = null, ?bool $inline = null): Parsedown|string
 {
     /**
      * @var Parsedown $parser

composer.json

@@ -129,7 +129,7 @@
             "pestphp/pest-plugin": true
         },
         "platform": {
-            "php": "8.3.0"
+            "php": "8.3.11"
         }
     },
    "minimum-stability": "dev",

composer.lock

@@ -40,8 +40,8 @@ public function up()
 
         $infrastructure_fks = array_column(
             Schema::getConnection()->select('SELECT CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE '
-                . 'WHERE TABLE_SCHEMA = "ixp" AND TABLE_NAME = "infrastructure" AND '
-                . 'REFERENCED_TABLE_SCHEMA = "ixp" AND REFERENCED_TABLE_NAME = "ixp"'
+                . 'WHERE TABLE_SCHEMA = "' . config('database.connections.mysql.database') . '" AND TABLE_NAME = "infrastructure" AND '
+                . 'REFERENCED_TABLE_SCHEMA = "' . config('database.connections.mysql.database') . '" AND REFERENCED_TABLE_NAME = "ixp"'
             ), 'CONSTRAINT_NAME'
         );
 
@@ -54,8 +54,8 @@ public function up()
 
         $traffic_daily_fks = array_column(
             Schema::getConnection()->select('SELECT CONSTRAINT_NAME FROM information_schema.KEY_COLUMN_USAGE '
-                . 'WHERE TABLE_SCHEMA = "ixp" AND TABLE_NAME = "traffic_daily" AND '
-                . 'REFERENCED_TABLE_SCHEMA = "ixp" AND REFERENCED_TABLE_NAME = "ixp"'
+                . 'WHERE TABLE_SCHEMA = "' . config('database.connections.mysql.database') . '" AND TABLE_NAME = "traffic_daily" AND '
+                . 'REFERENCED_TABLE_SCHEMA = "' . config('database.connections.mysql.database') . '" AND REFERENCED_TABLE_NAME = "ixp"'
             ), 'CONSTRAINT_NAME'
         );