Skip to content

Commit ae45ab8

Browse files
chore: add more types for phpstan
1 parent a22859e commit ae45ab8

File tree

3 files changed

+57
-170
lines changed

3 files changed

+57
-170
lines changed

inc/rest.php

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ class Optml_Rest {
164164

165165
/**
166166
* Optml_Rest constructor.
167+
*
168+
* @return void
167169
*/
168170
public function __construct() {
169171
$this->namespace = OPTML_NAMESPACE . '/v1';
@@ -233,6 +235,8 @@ private function register_route( $route, $method = 'GET', $args = [], $permissio
233235

234236
/**
235237
* Register rest routes.
238+
*
239+
* @return void
236240
*/
237241
public function register() {
238242

@@ -249,6 +253,8 @@ public function register() {
249253

250254
/**
251255
* Method to register service specific routes.
256+
*
257+
* @return void
252258
*/
253259
public function register_service_routes() {
254260
foreach ( self::$rest_routes['service_routes'] as $route => $details ) {
@@ -262,6 +268,8 @@ public function register_service_routes() {
262268

263269
/**
264270
* Method to register image specific routes.
271+
*
272+
* @return void
265273
*/
266274
public function register_image_routes() {
267275
foreach ( self::$rest_routes['image_routes'] as $route => $details ) {
@@ -274,6 +282,8 @@ public function register_image_routes() {
274282
}
275283
/**
276284
* Method to register media offload specific routes.
285+
*
286+
* @return void
277287
*/
278288
public function register_media_offload_routes() {
279289
foreach ( self::$rest_routes['media_cloud_routes'] as $route => $details ) {
@@ -287,6 +297,8 @@ public function register_media_offload_routes() {
287297

288298
/**
289299
* Method to register conflicts specific routes.
300+
*
301+
* @return void
290302
*/
291303
public function register_conflict_routes() {
292304
foreach ( self::$rest_routes['conflict_routes'] as $route => $details ) {
@@ -296,6 +308,8 @@ public function register_conflict_routes() {
296308

297309
/**
298310
* Method to register cache specific routes.
311+
*
312+
* @return void
299313
*/
300314
public function register_cache_routes() {
301315
foreach ( self::$rest_routes['cache_routes'] as $route => $details ) {
@@ -331,6 +345,7 @@ public function register_notification_routes() {
331345
* Clear Cache request.
332346
*
333347
* @param WP_REST_Request $request clear cache rest request.
348+
* @phpstan-param WP_REST_Request<array{type?: string}> $request
334349
*
335350
* @return WP_Error|WP_REST_Response
336351
*/
@@ -350,6 +365,7 @@ public function clear_cache_request( WP_REST_Request $request ) {
350365
* Connect to optimole service.
351366
*
352367
* @param WP_REST_Request $request connect rest request.
368+
* @phpstan-param WP_REST_Request<array{api_key: string, application?: string}> $request
353369
*
354370
* @return WP_Error|WP_REST_Response
355371
*/
@@ -392,6 +408,7 @@ public function connect( WP_REST_Request $request ) {
392408
* Select application.
393409
*
394410
* @param WP_REST_Request $request Rest request.
411+
* @phpstan-param WP_REST_Request<array{api_key: string, application?: string}> $request
395412
*
396413
* @return WP_REST_Response
397414
*/
@@ -420,7 +437,8 @@ public function select_application( WP_REST_Request $request ) {
420437
/**
421438
* Wrapper for api response.
422439
*
423-
* @param mixed $data data from api.
440+
* @param mixed $data data from api.
441+
* @param string|int $code Response code.
424442
*
425443
* @return WP_REST_Response
426444
*/
@@ -432,6 +450,7 @@ private function response( $data, $code = 'success' ) {
432450
* Connect to optimole service.
433451
*
434452
* @param WP_REST_Request $request connect rest request.
453+
* @phpstan-param WP_REST_Request<array{email: string, auto_connect?: string}> $request
435454
*
436455
* @return WP_Error|WP_REST_Response
437456
*/
@@ -510,6 +529,7 @@ public function register_service( WP_REST_Request $request ) {
510529
* Return image samples.
511530
*
512531
* @param WP_REST_Request $request Rest request.
532+
* @phpstan-param WP_REST_Request<array{quality?: int, force?: string}> $request
513533
*
514534
* @return WP_REST_Response Image urls.
515535
*/
@@ -558,6 +578,9 @@ public function get_sample_rate( WP_REST_Request $request ) {
558578
/**
559579
* Crawl & upload initial load.
560580
*
581+
* @param WP_REST_Request $request Rest request.
582+
* @phpstan-param WP_REST_Request<array{offset?: int}> $request
583+
*
561584
* @return WP_REST_Response If there are more posts left to receive.
562585
*/
563586
public function upload_onboard_images( WP_REST_Request $request ) {
@@ -615,7 +638,7 @@ public function upload_onboard_images( WP_REST_Request $request ) {
615638
/**
616639
* Return sample image data.
617640
*
618-
* @return array Image data.
641+
* @return array{url: string, width: string|int, height: string|int, id: int} Image data.
619642
*/
620643
private function fetch_sample_image() {
621644
$accepted_mimes = [ 'image/jpeg' ];
@@ -666,6 +689,8 @@ private function fetch_sample_image() {
666689
* Disconnect from optimole service.
667690
*
668691
* @param WP_REST_Request $request disconnect rest request.
692+
*
693+
* @return void
669694
*/
670695
public function disconnect( WP_REST_Request $request ) {
671696
$settings = new Optml_Settings();
@@ -677,6 +702,7 @@ public function disconnect( WP_REST_Request $request ) {
677702
* Get optimized images from API.
678703
*
679704
* @param WP_REST_Request $request rest request.
705+
* @phpstan-param WP_REST_Request<array{api_key?: string}> $request
680706
*
681707
* @return WP_REST_Response
682708
*/
@@ -732,6 +758,7 @@ public function poll_conflicts( WP_REST_Request $request ) {
732758
* Dismiss conflict.
733759
*
734760
* @param WP_REST_Request $request rest request.
761+
* @phpstan-param WP_REST_Request<array{conflictID?: string}> $request
735762
*
736763
* @return WP_REST_Response
737764
*/
@@ -770,6 +797,7 @@ public function request_update( WP_REST_Request $request ) {
770797
* Update options method.
771798
*
772799
* @param WP_REST_Request $request option update rest request.
800+
* @phpstan-param WP_REST_Request<array{settings?: array<string, mixed>}> $request
773801
*
774802
* @return WP_REST_Response
775803
*/
@@ -790,6 +818,7 @@ public function update_option( WP_REST_Request $request ) {
790818
* Update options method.
791819
*
792820
* @param WP_REST_Request $request option update rest request.
821+
* @phpstan-param WP_REST_Request<array{images?: array<string, array{src?: list<string>, ignoredUrls?: int}>}> $request
793822
*
794823
* @return WP_REST_Response
795824
*/
@@ -852,6 +881,7 @@ public function check_redirects( WP_REST_Request $request ) {
852881
* Get total number of images.
853882
*
854883
* @param WP_REST_Request $request rest request object.
884+
* @phpstan-param WP_REST_Request<array{action?: string, refresh?: bool}> $request
855885
*
856886
* @return WP_REST_Response
857887
*/
@@ -912,6 +942,7 @@ public function get_offload_conflicts( WP_REST_Request $request ) {
912942
* Insert images request.
913943
*
914944
* @param WP_REST_Request $request insert images rest request.
945+
* @phpstan-param WP_REST_Request<array{images?: array<mixed>}> $request
915946
*
916947
* @return WP_REST_Response
917948
*/
@@ -931,6 +962,7 @@ public function insert_images( WP_REST_Request $request ) {
931962
* Dismiss a notification (set the notification key to 'yes').
932963
*
933964
* @param WP_REST_Request $request the incoming request.
965+
* @phpstan-param WP_REST_Request<array{key?: string}> $request
934966
*
935967
* @return WP_REST_Response
936968
*/
@@ -954,6 +986,7 @@ public function dismiss_notice( WP_REST_Request $request ) {
954986
* Store optimization data.
955987
*
956988
* @param WP_REST_Request $request Rest request.
989+
* @phpstan-param WP_REST_Request<array{d: int, a: array<mixed>, u: string, t?: int, h?: string, pu?: string, b?: array<string, array<string, list<string>>>, l?: array{i?: string, s?: string, u?: list<string>}, m?: array<int, array{w: int, h: int}>, s?: array<int, list<array{w: int, h: int, d: int, s: string, b: int}>>, c?: array<int, bool>}> $request
957990
*
958991
* @return WP_REST_Response
959992
*/
@@ -1082,6 +1115,8 @@ function ( $url ) {
10821115

10831116
/**
10841117
* Method to register above fold data routes.
1118+
*
1119+
* @return void
10851120
*/
10861121
public function register_optimization_routes() {
10871122
foreach ( self::$rest_routes['optimization_routes'] as $route => $details ) {
@@ -1093,6 +1128,7 @@ public function register_optimization_routes() {
10931128
* Move image.
10941129
*
10951130
* @param WP_REST_Request $request Rest request.
1131+
* @phpstan-param WP_REST_Request<array{id: int, action: string, status?: string}> $request
10961132
*
10971133
* @return WP_REST_Response
10981134
*/

inc/settings.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,12 @@ private function is_allowed( $key ) {
221221
* Auto connect action.
222222
*/
223223
public function auto_connect() {
224+
225+
/**
226+
* Connect rest request.
227+
*
228+
* @var WP_REST_Request<array{api_key: string, application?: string}>
229+
*/
224230
$request = new WP_REST_Request( 'POST' );
225231
$request->set_param( 'api_key', constant( 'OPTIML_API_KEY' ) );
226232
Optml_Main::instance()->rest->connect( $request );

0 commit comments

Comments
 (0)