Upgrade PHPStan to 2.x and raise analysis level from 6 to 10

- Bump phpstan/phpstan ^2.0 and szepeviktor/phpstan-wordpress ^2.0
- Move the analysis level into phpstan.neon (single source) and raise it to 10
- Add Val, a runtime coercion helper that narrows untyped WordPress boundary
  values (wpdb rows, REST params, superglobals, options) with explicit checks
  instead of blind casts, plus unit tests
- Type value-object fromRow() params as stdClass (what wpdb returns) and map
  columns through Val so unexpected shapes degrade safely
- Use %i identifier placeholders for table names in all wpdb::prepare() calls
  so every query string is a literal and identifiers are escaped by WordPress;
  raises the minimum WordPress version to 6.2 where %i was introduced
- Guard wpdb::prepare() null result before wpdb::query() in updateTax()
- Fix nullable get_permalink()/strtotime() handling, list types at REST and
  capability call sites, dead null-coalescing on checked superglobals, and
  narrow get_users() results before mapping
- Register Val method names with the ValidatedSanitizedInput sniff so it
  validates the real sanitizer around each superglobal read
- Update repository unit tests for the %i placeholder arguments

Co-Authored-By: Claude Fable 5 <[email protected]>

src/Booking/BookingEndpoint.php

@@ -10,6 +10,7 @@ use Unsupervised\Schedular\Payment\Payment;
 use Unsupervised\Schedular\Payment\PaymentService;
 use Unsupervised\Schedular\Policy\PolicyAcceptance;
 use Unsupervised\Schedular\Registration\RegistrationGate;
+use Unsupervised\Schedular\Val;
 
 class BookingEndpoint {
 
@@ -27,6 +28,11 @@ class BookingEndpoint {
 		private PaymentService $payments,
 	) {}
 
+	/**
+	 * Registers this endpoint's REST routes.
+	 *
+	 * @param non-falsy-string $route_namespace REST namespace the routes are registered under (e.g. `us-scheduler/v1`).
+	 */
 	public function registerRoutes( string $route_namespace ): void {
 		register_rest_route(
 			$route_namespace,
@@ -103,7 +109,7 @@ class BookingEndpoint {
 	}
 
 	public function book( \WP_REST_Request $request ): \WP_REST_Response|\WP_Error {
-		$slotId = (int) $request->get_param( 'slot_id' );
+		$slotId = Val::int( $request->get_param( 'slot_id' ) );
 		$slot   = $this->availability->findById( $slotId );
 
 		if ( null === $slot ) {
@@ -120,7 +126,7 @@ class BookingEndpoint {
 		// used must belong to the slot's instructor. This prevents substituting a
 		// cheaper/free offering to dodge payment, or another instructor's offering
 		// to misroute it.
-		$requestedOfferingId = absint( $request->get_param( 'offering_id' ) );
+		$requestedOfferingId = absint( Val::int( $request->get_param( 'offering_id' ) ) );
 		$slotOfferingId      = (int) ( $slot->offeringId ?? 0 );
 
 		if ( $slotOfferingId > 0 ) {
@@ -142,7 +148,7 @@ class BookingEndpoint {
 		}
 
 		$answers            = $this->answers( $request );
-		$acceptedVersionIds = array_map( 'absint', (array) $request->get_param( 'accepted_policy_version_ids' ) );
+		$acceptedVersionIds = array_values( array_map( static fn( mixed $v ): int => absint( Val::int( $v ) ), (array) $request->get_param( 'accepted_policy_version_ids' ) ) );
 
 		$gateError = $this->gate->validate( $offeringId, $answers, $acceptedVersionIds );
 		if ( $gateError instanceof \WP_Error ) {
@@ -150,7 +156,7 @@ class BookingEndpoint {
 		}
 
 		$studentId  = get_current_user_id();
-		$notes      = (string) $request->get_param( 'notes' );
+		$notes      = Val::string( $request->get_param( 'notes' ) );
 		$recurrence = Lesson::RECURRENCE_WEEKLY === $request->get_param( 'recurrence' )
 			? Lesson::RECURRENCE_WEEKLY
 			: Lesson::RECURRENCE_SINGLE;
@@ -212,7 +218,7 @@ class BookingEndpoint {
 	private function answers( \WP_REST_Request $request ): array {
 		$out = [];
 		foreach ( (array) $request->get_param( 'answers' ) as $questionId => $value ) {
-			$out[ (int) $questionId ] = sanitize_text_field( (string) $value );
+			$out[ (int) $questionId ] = sanitize_text_field( Val::string( $value ) );
 		}
 
 		return $out;
@@ -220,13 +226,13 @@ class BookingEndpoint {
 
 	private function clientIp(): ?string {
 		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.ValidatedSanitizedInput.MissingUnslash -- IP stored verbatim for audit.
-		$ip = sanitize_text_field( wp_unslash( $_SERVER['REMOTE_ADDR'] ?? '' ) );
+		$ip = sanitize_text_field( Val::string( wp_unslash( $_SERVER['REMOTE_ADDR'] ?? '' ) ) );
 
 		return '' !== $ip ? $ip : null;
 	}
 
 	public function updateStatus( \WP_REST_Request $request ): \WP_REST_Response|\WP_Error {
-		$id     = absint( $request->get_param( 'id' ) );
+		$id     = absint( Val::int( $request->get_param( 'id' ) ) );
 		$lesson = $this->bookings->findById( $id );
 
 		if ( null === $lesson ) {
@@ -237,7 +243,7 @@ class BookingEndpoint {
 			return new \WP_Error( 'forbidden', __( 'You cannot update this booking.', 'unsupervised-schedular' ), [ 'status' => 403 ] );
 		}
 
-		$this->bookings->updateStatus( $id, (string) $request->get_param( 'status' ) );
+		$this->bookings->updateStatus( $id, Val::string( $request->get_param( 'status' ) ) );
 
 		return new \WP_REST_Response(
 			[

src/Booking/BookingPage.php

@@ -10,14 +10,16 @@ class BookingPage {
 	/**
 	 * Renders the booking shortcode output.
 	 *
-	 * @param array<string, string> $atts Shortcode attributes (unused — reserved for future options).
+	 * @param array<string> $atts Shortcode attributes (unused — reserved for future options).
 	 */
 	public function render( array $atts ): string { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found
 		if ( ! is_user_logged_in() ) {
+			$permalink = get_permalink();
+
 			return sprintf(
 				'<p>%s <a href="%s">%s</a>.</p>',
 				esc_html__( 'Please', 'unsupervised-schedular' ),
-				esc_url( wp_login_url( get_permalink() ) ),
+				esc_url( wp_login_url( false === $permalink ? '' : $permalink ) ),
 				esc_html__( 'log in to book a lesson', 'unsupervised-schedular' )
 			);
 		}

src/Booking/BookingRepository.php

@@ -80,7 +80,7 @@ class BookingRepository {
 
 	public function findById( int $id ): ?Lesson {
 		$row = $this->db->get_row(
-			$this->db->prepare( "SELECT * FROM {$this->table} WHERE id = %d", $id )
+			$this->db->prepare( 'SELECT * FROM %i WHERE id = %d', $this->table, $id )
 		);
 
 		return $row ? Lesson::fromRow( $row ) : null;
@@ -96,12 +96,14 @@ class BookingRepository {
 
 		$rows = $this->db->get_results(
 			$this->db->prepare(
-				"SELECT l.* FROM {$this->table} l
-                 JOIN {$avTable} a ON a.id = l.slot_id
+				'SELECT l.* FROM %i l
+                 JOIN %i a ON a.id = l.slot_id
                  WHERE l.instructor_id = %d
                    AND l.status != %s
                    AND a.start_dt >= %s
-                 ORDER BY a.start_dt ASC",
+                 ORDER BY a.start_dt ASC',
+				$this->table,
+				$avTable,
 				$instructorId,
 				Lesson::STATUS_CANCELLED,
 				current_time( 'mysql' )
@@ -119,11 +121,13 @@ class BookingRepository {
 
 		return (int) $this->db->get_var(
 			$this->db->prepare(
-				"SELECT COUNT(*) FROM {$this->table} l
-                 JOIN {$avTable} a ON a.id = l.slot_id
+				'SELECT COUNT(*) FROM %i l
+                 JOIN %i a ON a.id = l.slot_id
                  WHERE l.student_id = %d
                    AND l.status != %s
-                   AND a.start_dt >= %s",
+                   AND a.start_dt >= %s',
+				$this->table,
+				$avTable,
 				$studentId,
 				Lesson::STATUS_CANCELLED,
 				current_time( 'mysql' )
@@ -139,7 +143,8 @@ class BookingRepository {
 	public function findByStudent( int $studentId ): array {
 		$rows = $this->db->get_results(
 			$this->db->prepare(
-				"SELECT * FROM {$this->table} WHERE student_id = %d ORDER BY created_at DESC",
+				'SELECT * FROM %i WHERE student_id = %d ORDER BY created_at DESC',
+				$this->table,
 				$studentId
 			)
 		);
@@ -157,11 +162,13 @@ class BookingRepository {
 
 		$rows = $this->db->get_results(
 			$this->db->prepare(
-				"SELECT l.* FROM {$this->table} l
-                 JOIN {$avTable} a ON a.id = l.slot_id
+				'SELECT l.* FROM %i l
+                 JOIN %i a ON a.id = l.slot_id
                  WHERE l.status != %s
                    AND a.start_dt >= %s
-                 ORDER BY a.start_dt ASC",
+                 ORDER BY a.start_dt ASC',
+				$this->table,
+				$avTable,
 				Lesson::STATUS_CANCELLED,
 				current_time( 'mysql' )
 			)

src/Booking/Lesson.php

@@ -3,6 +3,8 @@ declare(strict_types=1);
 
 namespace Unsupervised\Schedular\Booking;
 
+use Unsupervised\Schedular\Val;
+
 class Lesson {
 
 	public const STATUS_PENDING   = 'pending';
@@ -39,18 +41,18 @@ class Lesson {
 		public readonly ?int $id = null,
 	) {}
 
-	public static function fromRow( object $row ): self {
+	public static function fromRow( \stdClass $row ): self {
 		return new self(
-			slotId:       (int) $row->slot_id,
-			studentId:    (int) $row->student_id,
-			instructorId: (int) $row->instructor_id,
-			offeringId:   null !== $row->offering_id ? (int) $row->offering_id : null,
-			recurrence:   $row->recurrence,
-			seriesId:     null !== $row->series_id ? (int) $row->series_id : null,
-			status:       $row->status,
-			paymentId:    null !== $row->payment_id ? (int) $row->payment_id : null,
-			notes:        $row->notes,
-			id:           (int) $row->id,
+			slotId:       Val::int( $row->slot_id ),
+			studentId:    Val::int( $row->student_id ),
+			instructorId: Val::int( $row->instructor_id ),
+			offeringId:   Val::intOrNull( $row->offering_id ),
+			recurrence:   Val::string( $row->recurrence ),
+			seriesId:     Val::intOrNull( $row->series_id ),
+			status:       Val::string( $row->status ),
+			paymentId:    Val::intOrNull( $row->payment_id ),
+			notes:        Val::stringOrNull( $row->notes ),
+			id:           Val::int( $row->id ),
 		);
 	}
 

src/Booking/LessonController.php

@@ -6,6 +6,7 @@ namespace Unsupervised\Schedular\Booking;
 use Unsupervised\Schedular\Auth\RoleManager;
 use Unsupervised\Schedular\Payment\Payment;
 use Unsupervised\Schedular\Payment\PaymentRepository;
+use Unsupervised\Schedular\Val;
 
 class LessonController {
 
@@ -48,10 +49,11 @@ class LessonController {
 		}
 
 		// phpcs:disable WordPress.Security.NonceVerification.Missing -- nonce checked above.
-		$action    = sanitize_key( wp_unslash( $_POST['usc_action'] ?? '' ) );
-		$paymentId = absint( $_POST['payment_id'] ?? 0 );
-		$email     = sanitize_email( wp_unslash( $_POST['etransfer_email'] ?? '' ) );
-		$taxRate   = isset( $_POST['tax_rate'] ) ? max( 0.0, (float) $_POST['tax_rate'] ) : 0.0;
+		$action    = sanitize_key( Val::string( wp_unslash( $_POST['usc_action'] ) ) );
+		$paymentId = absint( Val::int( $_POST['payment_id'] ?? 0 ) );
+		$email     = sanitize_email( Val::string( wp_unslash( $_POST['etransfer_email'] ?? '' ) ) );
+		// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- Val::float() coerces to float; slashes cannot survive numeric coercion.
+		$taxRate = isset( $_POST['tax_rate'] ) ? max( 0.0, Val::float( $_POST['tax_rate'] ) ) : 0.0;
 		// phpcs:enable WordPress.Security.NonceVerification.Missing
 
 		if ( $paymentId <= 0 || ! in_array( $action, [ 'set_etransfer', 'set_tax' ], true ) ) {