phpstan adjust

Author: leonstafford

phpstan.neon

@@ -15,3 +15,5 @@ parameters:
         - '#Call to static method l\(\) on an unknown class WP2Static\\WsLog.#'
         - '#Call to static method getUrl\(\) on an unknown class WP2Static\\SiteInfo.#'
         - '#Call to static method getPath\(\) on an unknown class WP2Static\\SiteInfo.#'
+        - '#Call to static method fileisCached\(\) on an unknown class WP2Static\\DeployCache.#'
+        - '#Call to static method addFile\(\) on an unknown class WP2Static\\DeployCache.#'

src/CLI.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace WP2StaticS3;
+
+use WP_CLI;
+
+
+/**
+ * WP2StaticS3 WP-CLI commands
+ *
+ * Registers WP-CLI commands for WP2StaticS3 under main wp2static cmd
+ *
+ * Usage: wp wp2static options set s3Bucket mybucketname
+ */
+class CLI {
+
+    /**
+     * S3 commands
+     *
+     * @param string[] $args CLI args
+     * @param string[] $assoc_args CLI args
+     */
+    public function s3(
+        array $args,
+        array $assoc_args
+    ) : void {
+        $action = isset( $args[0] ) ? $args[0] : null;
+
+        if ( empty( $action ) ) {
+            WP_CLI::error( 'Missing required argument: <options>' );
+        }
+
+        if ( $action === 'options' ) {
+            WP_CLI::line( 'TBC setting options for S3 addon' );
+        }
+    }
+}
+

src/Controller.php

@@ -3,8 +3,7 @@
 namespace WP2StaticS3;
 
 class Controller {
-    public function run() {
-        // initialize options DB
+    public function run() : void {
         global $wpdb;
 
         $table_name = $wpdb->prefix . 'wp2static_addon_s3_options';
@@ -23,8 +22,6 @@ public function run() {
         require_once ABSPATH . 'wp-admin/includes/upgrade.php';
         dbDelta( $sql );
 
-        // check for seed data
-        // if deployment_url option doesn't exist, create:
         $options = $this->getOptions();
 
         if ( ! isset( $options['s3Bucket'] ) ) {
@@ -49,21 +46,17 @@ public function run() {
 
         add_action(
             'wp2static_post_deploy_trigger',
-            [ 'WP2StaticS3\Deployer', 'cloudfront_invalidate' ],
+            [ 'WP2StaticS3\Deployer', 'cloudfront_invalidate_all_items' ],
             15,
             1
         );
 
-        // if ( defined( 'WP_CLI' ) ) {
-        // \WP_CLI::add_command(
-        // 'wp2static s3',
-        // [ 'WP2StaticS3\CLI', 's3' ]);
-        // }
-    }
-
-    // TODO: is this needed? confirm slashing of destination URLs...
-    public function modifyWordPressSiteURL( $site_url ) {
-        return rtrim( $site_url, '/' );
+        if ( defined( 'WP_CLI' ) ) {
+            \WP_CLI::add_command(
+                'wp2static s3',
+                [ 'WP2StaticS3\CLI', 's3' ]
+            );
+        }
     }
 
     /**
@@ -210,8 +203,10 @@ public static function seedOptions() : void {
 
     /**
      * Save options
+     *
+     * @param mixed $value option value to save
      */
-    public static function saveOption( $name, $value ) : void {
+    public static function saveOption( string $name, $value ) : void {
         global $wpdb;
 
         $table_name = $wpdb->prefix . 'wp2static_addon_s3_options';
@@ -238,7 +233,7 @@ public static function renderS3Page() : void {
     }
 
 
-    public function deploy( $processed_site_path ) {
+    public function deploy( string $processed_site_path ) : void {
         \WP2Static\WsLog::l( 'S3 Addon deploying' );
 
         $s3_deployer = new Deployer();
@@ -249,7 +244,7 @@ public function deploy( $processed_site_path ) {
      * Naive encypting/decrypting
      *
      */
-    public static function encrypt_decrypt( $action, $string ) {
+    public static function encrypt_decrypt( string $action, string $string ) : string {
         $output = false;
         $encrypt_method = 'AES-256-CBC';
 
@@ -268,13 +263,13 @@ public static function encrypt_decrypt( $action, $string ) {
 
         if ( $action == 'encrypt' ) {
             $output = openssl_encrypt( $string, $encrypt_method, $key, 0, $variate );
-            $output = base64_encode( $output );
+            $output = base64_encode( (string) $output );
         } elseif ( $action == 'decrypt' ) {
             $output =
                 openssl_decrypt( base64_decode( $string ), $encrypt_method, $key, 0, $variate );
         }
 
-        return $output;
+        return (string) $output;
     }
 
     public static function activate_for_single_site() : void {
@@ -337,13 +332,19 @@ public static function activate( bool $network_wide = null ) : void {
         }
     }
 
-    public static function addSubmenuPage( $submenu_pages ) {
+    /**
+     * Add WP2Static submenu
+     *
+     * @param mixed[] $submenu_pages array of submenu pages
+     * @return mixed[] array of submenu pages
+     */
+    public static function addSubmenuPage( array $submenu_pages ) : array {
         $submenu_pages['s3'] = [ 'WP2StaticS3\Controller', 'renderS3Page' ];
 
         return $submenu_pages;
     }
 
-    public static function saveOptionsFromUI() {
+    public static function saveOptionsFromUI() : void {
         check_admin_referer( 'wp2static-s3-options' );
 
         global $wpdb;

src/Deployer.php

@@ -7,6 +7,7 @@
 use Aws\S3\S3Client;
 use Aws\CloudFront\CloudFrontClient;
 use Aws\Exception\AwsException;
+use Aws\Credentials\Credentials;
 
 // TODO: pull out of old core GuessMimeType( $local_file )
 
@@ -19,7 +20,7 @@ class Deployer {
 
     public function __construct() {}
 
-    public function upload_files( $processed_site_path ) : void {
+    public function upload_files( string $processed_site_path ) : void {
         // check if dir exists
         if ( ! is_dir( $processed_site_path ) ) {
             return;
@@ -81,7 +82,7 @@ public function upload_files( $processed_site_path ) : void {
 
                 if ( ! $real_filepath ) {
                     $err = 'Trying to add unknown file to Zip: ' . $filename;
-                    WsLog::l( $err );
+                    \WP2Static\WsLog::l( $err );
                     continue;
                 }
 
@@ -99,6 +100,11 @@ public function upload_files( $processed_site_path ) : void {
                     ltrim( str_replace( $processed_site_path, '', $filename ), '/' );
 
                 $finfo = finfo_open( FILEINFO_MIME_TYPE );
+
+                if ( ! $finfo ) {
+                    continue;
+                }
+
                 $mime_type = finfo_file( $finfo, $filename );
 
                 $result = $s3->putObject(
@@ -119,12 +125,12 @@ public function upload_files( $processed_site_path ) : void {
     }
 
 
-    public function cloudfront_invalidate_all_items() {
+    public function cloudfront_invalidate_all_items() : void {
         if ( ! Controller::getValue( 'cfDistributionID' ) ) {
             return;
         }
 
-        \WsLog::l( 'Invalidating all CloudFront items' );
+        \WP2Static\WsLog::l( 'Invalidating all CloudFront items' );
 
         $client_options = [
             'profile' => 'default',
@@ -145,7 +151,7 @@ public function cloudfront_invalidate_all_items() {
             Controller::getValue( 's3SecretAccessKey' )
         ) {
 
-            $credentials = new Aws\Credentials\Credentials(
+            $credentials = new \Aws\Credentials\Credentials(
                 Controller::getValue( 's3AccessKeyID' ),
                 \WP2StaticS3\Controller::encrypt_decrypt(
                     'decrypt',
@@ -156,7 +162,7 @@ public function cloudfront_invalidate_all_items() {
             $client_options['credentials'] = $credentials;
         }
 
-        $client = new Aws\CloudFront\CloudFrontClient( $client );
+        $client = new \Aws\CloudFront\CloudFrontClient( $client_options );
 
         try {
             $result = $client->createInvalidation(

tests/phpstan/bootstrap.php

@@ -6,4 +6,4 @@
 define( 'WP_PLUGIN_DIR', '' );
 
 // WP2Static constants
-define( 'WP2STATIC_ZIP_VERSION', '' );
+define( 'WP2STATIC_S3_VERSION', '' );