Use top-level imports

Author: john-shaffer

src/S3/Deployer.php

@@ -10,6 +10,7 @@
 use Aws\Exception\AwsException;
 use Aws\S3\S3Client;
 use WP2Static\CrawledFiles;
+use WP2Static\DeployCache;
 use WP2Static\Options;
 use WP2Static\WsLog;
 
@@ -159,7 +160,7 @@ public function uploadFilesIter( \Iterator $files ): void {
 
                     if ( ! $real_filepath ) {
                         $err = 'Trying to deploy unknown file to S3: ' . $filename;
-                        \WP2Static\WsLog::l( $err );
+                        WsLog::l( $err );
                         continue;
                     }
 
@@ -228,7 +229,7 @@ public function uploadFilesIter( \Iterator $files ): void {
                     }
                 }
 
-                $is_cached = \WP2Static\DeployCache::fileisCached(
+                $is_cached = DeployCache::fileisCached(
                     $cache_key,
                     $this->namespace,
                     $hash,
@@ -266,7 +267,7 @@ public function uploadFilesIter( \Iterator $files ): void {
                 'fulfilled' =>
                 function ( $result, $iter_key, $promise ) use ( &$items_by_iter_key ) {
                     $item = $items_by_iter_key[ $iter_key ];
-                    \WP2Static\DeployCache::addFile(
+                    DeployCache::addFile(
                         $item['cache_key'],
                         $this->namespace,
                         $item['hash']
@@ -331,7 +332,7 @@ public static function s3Client(): \Aws\S3\S3Client {
         ) {
             $client_options['credentials'] = [
                 'key' => S3Options::getValue( 'awsAccessKeyId' ),
-                'secret' => \WP2Static\Options::encrypt_decrypt(
+                'secret' => Options::encrypt_decrypt(
                     'decrypt',
                     S3Options::getValue( 'awsSecretAccessKey' )
                 ),
@@ -358,7 +359,7 @@ public static function cloudfrontClient(): \Aws\CloudFront\CloudFrontClient {
             // Use the supplied access keys.
             $credentials = new \Aws\Credentials\Credentials(
                 S3Options::getValue( 'awsAccessKeyId' ),
-                \WP2Static\Options::encrypt_decrypt(
+                Options::encrypt_decrypt(
                     'decrypt',
                     S3Options::getValue( 'awsSecretAccessKey' )
                 )

src/S3/S3Controller.php

@@ -4,6 +4,8 @@
 
 use WP2Static\Controller;
 use WP2Static\Options;
+use WP2Static\SiteInfo;
+use WP2Static\WsLog;
 
 class S3Controller {
     public function run(): void {
@@ -65,7 +67,7 @@ public static function renderS3Page(): void {
 
         $view = [];
         $view['nonce_action'] = Controller::getHookName( 's3_save_options' );
-        $view['uploads_path'] = \WP2Static\SiteInfo::getPath( 'uploads' );
+        $view['uploads_path'] = SiteInfo::getPath( 'uploads' );
 
         $view['options'] = Options::getAll( S3Options::optionSpecs() );
 
@@ -78,7 +80,7 @@ public function deploy( string $processed_site_path, string $enabled_deployer ):
             return;
         }
 
-        \WP2Static\WsLog::l( 'S3 Addon deploying' );
+        WsLog::l( 'S3 Addon deploying' );
 
         $s3_deployer = new Deployer();
         $s3_deployer->uploadFiles( $processed_site_path );