Closes #6756 Increase phpstan level 2

composer.json

@@ -57,6 +57,7 @@
 		"php-stubs/wordpress-tests-stubs": "^6.5",
 		"phpcompatibility/phpcompatibility-wp": "^2.0",
 		"phpstan/extension-installer": "^1.3",
+		"phpstan/phpstan-mockery": "^1.1",
 		"phpstan/phpstan-phpunit": "^1.4",
 		"phpunit/phpunit": "^7.5 || ^8 || ^9",
 		"psr/container": "1.1.1",
@@ -69,6 +70,7 @@
 		"wp-media/phpunit": "^3",
 		"wp-media/rocket-lazyload-common": "^3.0.11",
 		"wp-media/wp-imagify-partner": "^1.0",
+		"wpackagist-plugin/cloudflare":"4.12.7",
 		"wpackagist-plugin/amp": "^1.1.4",
 		"wpackagist-plugin/hummingbird-performance": "2.0.1",
 		"wpackagist-plugin/jetpack": "9.3.2",

inc/Engine/Admin/Settings/Page.php

@@ -284,6 +284,10 @@ public function customer_data() {
 
 		$data['license_type'] = rocket_get_license_type( $user );
 
+		if ( ! is_object( $user ) ) {
+			return $data;
+		}
+
 		if ( ! empty( $user->licence_expiration ) ) {
 			$data['license_class'] = time() < $user->licence_expiration ? 'wpr-isValid' : 'wpr-isInvalid';
 		}

inc/Engine/Cache/AdminSubscriber.php

@@ -5,6 +5,7 @@
 use WP_Filesystem_Direct;
 use WP_Rocket\Event_Management\Event_Manager;
 use WP_Rocket\Event_Management\Event_Manager_Aware_Subscriber_Interface;
+use WP_Term;
 
 /**
  * Subscriber for the cache admin events
@@ -15,7 +16,7 @@ class AdminSubscriber implements Event_Manager_Aware_Subscriber_Interface {
 	/**
 	 * Event Manager instance
 	 *
-	 * @var Event_Manager;
+	 * @var Event_Manager
 	 */
 	protected $event_manager;
 

inc/Engine/Cache/Purge.php

@@ -5,6 +5,7 @@
 use WP_Rocket\Engine\Preload\Database\Queries\Cache;
 use DirectoryIterator;
 use Exception;
+use WP_Filesystem_Direct;
 use WP_Term;
 use WP_Post;
 

inc/Engine/Cache/WPCache.php

@@ -2,6 +2,7 @@
 
 namespace WP_Rocket\Engine\Cache;
 
+use WP_Filesystem_Direct;
 use WP_Rocket\Engine\Activation\ActivationInterface;
 use WP_Rocket\Engine\Deactivation\DeactivationInterface;
 

inc/Engine/Capabilities/Manager.php

@@ -4,6 +4,7 @@
 
 use WP_Rocket\Engine\Activation\ActivationInterface;
 use WP_Rocket\Engine\Deactivation\DeactivationInterface;
+use WP_Role;
 
 class Manager implements ActivationInterface, DeactivationInterface {
 	/**

inc/Engine/Common/Database/Queries/AbstractQuery.php

@@ -101,13 +101,13 @@ public function get_on_submit_jobs( int $count = 100 ) {
 			return [];
 		}
 
-		$in_progress_count = $this->query(
+		$in_progress_count = (int) $this->query(
 			[
 				'count'  => true,
 				'status' => [ 'in-progress' ],
 			]
 		);
-		$pending_count     = $this->query(
+		$pending_count     = (int) $this->query(
 			[
 				'count'  => true,
 				'status' => [ 'pending' ],
@@ -188,7 +188,7 @@ public function get_pending_jobs( int $count = 100 ) {
 			return [];
 		}
 
-		$inprogress_count = $this->query(
+		$inprogress_count = (int) $this->query(
 			[
 				'count'  => true,
 				'status' => 'in-progress',

inc/Engine/Common/JobManager/APIHandler/AbstractSafeAPIClient.php

@@ -98,10 +98,10 @@ private function send_request( $method, $params = [], $safe = false ) {
 	private function set_timeout_transients( $previous_expiration ) {
 		$transient_key = $this->get_transient_key();
 
-		$expiration = ( 0 === $previous_expiration )
+		$expiration = ( 0 === (int) $previous_expiration )
 			? 300
-			: ( 2 * $previous_expiration <= DAY_IN_SECONDS
-				? 2 * $previous_expiration
+			: ( 2 * (int) $previous_expiration <= DAY_IN_SECONDS
+				? 2 * (int) $previous_expiration
 				: DAY_IN_SECONDS
 			);
 

inc/Engine/Common/JobManager/JobProcessor.php

@@ -4,7 +4,7 @@
 
 use WP_Rocket\Logger\LoggerAware;
 use WP_Rocket\Logger\LoggerAwareInterface;
-use WP_Rocket\Engine\Common\Queue\QueueInterface;
+use WP_Rocket\Engine\Common\JobManager\Queue\Queue;
 use WP_Rocket\Engine\Common\JobManager\Strategy\Factory\StrategyFactory;
 use WP_Rocket\Engine\Common\JobManager\APIHandler\APIClient;
 use WP_Rocket\Engine\Common\Clock\WPRClock;
@@ -23,7 +23,7 @@ class JobProcessor implements LoggerAwareInterface {
 	/**
 	 * Queue instance.
 	 *
-	 * @var QueueInterface
+	 * @var Queue
 	 */
 	private $queue;
 
@@ -52,14 +52,14 @@ class JobProcessor implements LoggerAwareInterface {
 	 * Instantiate the class.
 	 *
 	 * @param array           $factories Array of factories.
-	 * @param QueueInterface  $queue Queue instance.
+	 * @param Queue           $queue Queue instance.
 	 * @param StrategyFactory $strategy_factory Strategy Factory.
 	 * @param APIClient       $api APIClient instance.
 	 * @param WPRClock        $clock Clock object instance.
 	 */
 	public function __construct(
 		array $factories,
-		QueueInterface $queue,
+		Queue $queue,
 		StrategyFactory $strategy_factory,
 		APIClient $api,
 		WPRClock $clock
@@ -174,7 +174,7 @@ public function process_pending_jobs() {
 	public function check_job_status( string $url, bool $is_mobile, string $optimization_type ) {
 
 		$row_details = $this->get_single_job( $url, $is_mobile, $optimization_type );
-		if ( ! $row_details ) {
+		if ( ! is_object( $row_details ) ) {
 			$this->logger::debug( 'Url - ' . $url . ' not found for is_mobile -  ' . (int) $is_mobile );
 			// Nothing in DB, bailout.
 			return;

inc/Engine/Common/JobManager/Managers/AbstractManager.php

@@ -127,7 +127,7 @@ public function get_single_job( string $url, bool $is_mobile ) {
 	 * @param integer $num_rows Number of rows to grab with each CRON iteration.
 	 * @return array|int
 	 */
-	public function get_on_submit_jobs( int $num_rows ): array {
+	public function get_on_submit_jobs( int $num_rows ) {
 		return $this->query->get_on_submit_jobs( $num_rows );
 	}
 

inc/Engine/Common/JobManager/Strategy/Context/RetryContext.php

@@ -8,7 +8,7 @@ class RetryContext {
 	/**
 	 * Strategy Interface.
 	 *
-	 * @var StrategyInterface;
+	 * @var StrategyInterface
 	 */
 	protected $strategy;
 

inc/Engine/Common/JobManager/Strategy/Strategies/DefaultProcess.php

@@ -3,7 +3,7 @@
 namespace WP_Rocket\Engine\Common\JobManager\Strategy\Strategies;
 
 use WP_Rocket\Engine\Common\Clock\WPRClock;
-use WP_Rocket\Engine\Common\JobManager\Managers\ManagerInterface;
+use WP_Rocket\Engine\Optimization\RUCSS\Jobs\Manager;
 
 /**
  * Class managing the default error for retry process
@@ -13,7 +13,7 @@ class DefaultProcess implements StrategyInterface {
 	/**
 	 * Job Manager.
 	 *
-	 * @var ManagerInterface
+	 * @var Manager
 	 */
 	private $manager;
 
@@ -48,10 +48,10 @@ class DefaultProcess implements StrategyInterface {
 	/**
 	 * Strategy Constructor.
 	 *
-	 * @param ManagerInterface $manager Job Manager.
-	 * @param WPRClock         $clock Clock object.
+	 * @param Manager  $manager Job Manager.
+	 * @param WPRClock $clock Clock object.
 	 */
-	public function __construct( ManagerInterface $manager, WPRClock $clock ) {
+	public function __construct( Manager $manager, WPRClock $clock ) {
 		$this->manager = $manager;
 		$this->clock   = $clock;
 

inc/Engine/Common/JobManager/Strategy/Strategies/JobSetFail.php

@@ -2,7 +2,7 @@
 
 namespace WP_Rocket\Engine\Common\JobManager\Strategy\Strategies;
 
-use WP_Rocket\Engine\Common\JobManager\Managers\ManagerInterface;
+use WP_Rocket\Engine\Optimization\RUCSS\Jobs\Manager;
 
 /**
  * Class managing the retry process whenever a job isn't found in the SaaS.
@@ -11,16 +11,16 @@ class JobSetFail implements StrategyInterface {
 	/**
 	 * Job Manager.
 	 *
-	 * @var ManagerInterface
+	 * @var Manager
 	 */
 	private $manager;
 
 	/**
 	 * Strategy Constructor.
 	 *
-	 * @param ManagerInterface $manager Job Manager.
+	 * @param Manager $manager Job Manager.
 	 */
-	public function __construct( ManagerInterface $manager ) {
+	public function __construct( Manager $manager ) {
 		$this->manager = $manager;
 	}
 

inc/Engine/Common/JobManager/Strategy/Strategies/ResetRetryProcess.php

@@ -2,7 +2,7 @@
 
 namespace WP_Rocket\Engine\Common\JobManager\Strategy\Strategies;
 
-use WP_Rocket\Engine\Common\JobManager\Managers\ManagerInterface;
+use WP_Rocket\Engine\Optimization\RUCSS\Jobs\Manager;
 
 /**
  * Class managing the retry process whenever a job isn't found in the SaaS.
@@ -11,16 +11,16 @@ class ResetRetryProcess implements StrategyInterface {
 	/**
 	 * Job Manager.
 	 *
-	 * @var ManagerInterface
+	 * @var Manager
 	 */
 	private $manager;
 
 	/**
 	 * Strategy Constructor.
 	 *
-	 * @param ManagerInterface $manager Job Manager.
+	 * @param Manager $manager Job Manager.
 	 */
-	public function __construct( ManagerInterface $manager ) {
+	public function __construct( Manager $manager ) {
 		$this->manager = $manager;
 	}
 

inc/Engine/CriticalPath/APIClient.php

@@ -20,7 +20,7 @@ class APIClient {
 	 * @param string $url    The URL to send a CPCSS generation request for.
 	 * @param array  $params Optional. Parameters needed to be sent in the body. Default: [].
 	 * @param string $item_type Optional. Type for this item if it's custom or specific type. Default: custom.
-	 * @return array|WP_Error
+	 * @return object|array|WP_Error
 	 */
 	public function send_generation_request( $url, $params = [], $item_type = 'custom' ) {
 		$params['url'] = $url;

inc/Engine/CriticalPath/Admin/Admin.php

@@ -2,6 +2,7 @@
 
 namespace WP_Rocket\Engine\CriticalPath\Admin;
 
+use WP_Admin_Bar;
 use WP_Rocket\Admin\Options_Data;
 use WP_Rocket\Engine\CriticalPath\ProcessorService;
 use WP_Rocket\Engine\CriticalPath\TransientTrait;

inc/Engine/CriticalPath/Admin/Subscriber.php

@@ -3,6 +3,7 @@
 
 namespace WP_Rocket\Engine\CriticalPath\Admin;
 
+use WP_Admin_Bar;
 use WP_Rocket\Event_Management\Subscriber_Interface;
 
 class Subscriber implements Subscriber_Interface {

inc/Engine/CriticalPath/CriticalCSSSubscriber.php

@@ -20,7 +20,7 @@ class CriticalCSSSubscriber implements Subscriber_Interface {
 	/**
 	 * Instance of Critical CSS.
 	 *
-	 * @var Critical_CSS
+	 * @var CriticalCSS
 	 */
 	protected $critical_css;
 

inc/Engine/CriticalPath/ProcessorService.php

@@ -87,7 +87,7 @@ private function send_generation_request( $item_url, $item_path, $is_mobile = fa
 		$generated_job = $this->api_client->send_generation_request( $item_url, $params, $item_type );
 
 		// validate generate response.
-		if ( is_wp_error( $generated_job ) ) {
+		if ( is_wp_error( $generated_job ) || ! is_object( $generated_job ) ) {
 			// Failed so return back the data.
 			return $generated_job;
 		}
@@ -172,7 +172,7 @@ private function check_cpcss_job_status( $job_id, $item_path, $item_url, $is_mob
 	 *
 	 * @since 3.6
 	 *
-	 * @param array  $job_details Job details array.
+	 * @param object $job_details Job details object.
 	 * @param string $item_url    Url for web page to be processed, used for error messages.
 	 * @param bool   $is_mobile   Bool identifier for is_mobile CPCSS generation.
 	 * @param string $item_type Optional. Type for this item if it's custom or specific type. Default: custom.

inc/Engine/CriticalPath/TransientTrait.php

@@ -12,7 +12,7 @@ trait TransientTrait {
 	 * @param string      $item_path Path for processed item.
 	 * @param bool        $mobile    If this request is for mobile cpcss.
 	 * @param string      $message   CPCSS reply message.
-	 * @param bool/string $success   CPCSS success or failure.
+	 * @param bool|string $success   CPCSS success or failure.
 	 * @return void
 	 */
 	private function update_running_transient( $transient, $item_path, $mobile, $message, $success ) {

inc/Engine/Media/AboveTheFold/AJAX/Controller.php

@@ -88,12 +88,12 @@ public function add_lcp_data() {
 				continue;
 			}
 
-			if ( 'lcp' === $image->label ) {
+			if ( isset( $image->label ) && 'lcp' === $image->label ) {
 				$lcp = $image_object;
 				continue;
 			}
 
-			if ( 'above-the-fold' === $image->label && 0 < $max_atf_images_number ) {
+			if ( isset( $image->label ) && 'above-the-fold' === $image->label && 0 < $max_atf_images_number ) {
 				$viewport[] = $image_object;
 
 				--$max_atf_images_number;

inc/Engine/Media/AboveTheFold/Frontend/Controller.php

@@ -151,6 +151,10 @@ private function set_fetchpriority( $lcp, string $html ): string {
 			return $html;
 		}
 
+		if ( empty( $lcp->src ) ) {
+			return $html;
+		}
+
 		$html    = $this->replace_html_comments( $html );
 		$url     = urldecode( preg_quote( $lcp->src, '/' ) );
 		$pattern = '#<img(?:[^>]*?\s+)?src=["\']' . $url . '["\'](?:\s+[^>]*?)?>#';

inc/Engine/Optimization/DelayJS/Admin/SiteList.php

@@ -5,15 +5,14 @@
 
 use WP_Rocket\Admin\Options;
 use WP_Rocket\Admin\Options_Data;
-use WP_Rocket\Engine\Optimization\DynamicLists\DelayJSLists\DataManager;
 use WP_Rocket\Engine\Optimization\DynamicLists\DynamicLists;
 use WP_Theme;
 
 class SiteList {
 	/**
 	 * Delay JS data manager.
 	 *
-	 * @var DataManager
+	 * @var DynamicLists
 	 */
 	protected $dynamic_lists;
 
@@ -246,14 +245,15 @@ public function prepare_delayjs_ui_list() {
 
 		return $full_list;
 	}
+
 	/**
 	 * Fetch the icon.
 	 *
-	 * @param array $item item from the list.
+	 * @param object $item item from the list.
 	 * @return string
 	 */
 	private function get_icon( $item ) {
-		if ( empty( $item ) || empty( $item->icon_url ) ) {
+		if ( empty( $item->icon_url ) ) {
 			return '';
 		}
 

inc/Engine/Optimization/DynamicLists/DynamicLists.php

@@ -253,7 +253,7 @@ public function get_preload_exclusions(): array {
 	/**
 	 * Get Delay JS dynamic list.
 	 *
-	 * @return array
+	 * @return object
 	 */
 	public function get_delayjs_list() {
 		return $this->providers['delayjslists']->data_manager->get_lists();