Rename all method names to camel case.

Author: john-shaffer

src/Controller.php

@@ -260,7 +260,7 @@ public function deploy( string $processed_site_path, string $enabled_deployer )
         \WP2Static\WsLog::l( 'S3 Addon deploying' );
 
         $s3_deployer = new Deployer();
-        $s3_deployer->upload_files( $processed_site_path );
+        $s3_deployer->uploadFiles( $processed_site_path );
     }
 
     public static function createOptionsTable() : void {
@@ -292,12 +292,12 @@ public static function createOptionsTable() : void {
         }
     }
 
-    public static function activate_for_single_site(): void {
+    public static function activateForSingleSite(): void {
         self::createOptionsTable();
         self::seedOptions();
     }
 
-    public static function deactivate_for_single_site() : void {
+    public static function deactivateForSingleSite() : void {
     }
 
     public static function deactivate( bool $network_wide = null ) : void {
@@ -316,12 +316,12 @@ public static function deactivate( bool $network_wide = null ) : void {
 
             foreach ( $site_ids as $site_id ) {
                 switch_to_blog( $site_id );
-                self::deactivate_for_single_site();
+                self::deactivateForSingleSite();
             }
 
             restore_current_blog();
         } else {
-            self::deactivate_for_single_site();
+            self::deactivateForSingleSite();
         }
     }
 
@@ -341,12 +341,12 @@ public static function activate( bool $network_wide = null ) : void {
 
             foreach ( $site_ids as $site_id ) {
                 switch_to_blog( $site_id );
-                self::activate_for_single_site();
+                self::activateForSingleSite();
             }
 
             restore_current_blog();
         } else {
-            self::activate_for_single_site();
+            self::activateForSingleSite();
         }
     }
 

src/Deployer.php

@@ -21,7 +21,7 @@ class Deployer {
 
     public function __construct() {}
 
-    public function upload_files( string $processed_site_path ) : void {
+    public function uploadFiles( string $processed_site_path ) : void {
         // check if dir exists
         if ( ! is_dir( $processed_site_path ) ) {
             return;
@@ -30,7 +30,7 @@ public function upload_files( string $processed_site_path ) : void {
         $namespace = self::DEFAULT_NAMESPACE;
 
         // instantiate S3 client
-        $s3 = self::s3_client();
+        $s3 = self::s3Client();
 
         // iterate each file in ProcessedSite
         $iterator = new RecursiveIteratorIterator(
@@ -85,7 +85,7 @@ public function upload_files( string $processed_site_path ) : void {
                     ltrim( $cache_key, '/' ) :
                     ltrim( $cache_key, '/' );
 
-                $mime_type = MimeTypes::GuessMimeType( $filename );
+                $mime_type = MimeTypes::guessMimeType( $filename );
                 if ( 'text/' === substr( $mime_type, 0, 5 ) ) {
                     $mime_type = $mime_type . '; charset=UTF-8';
                 }
@@ -177,16 +177,16 @@ public function upload_files( string $processed_site_path ) : void {
         if ( $distribution_id && $num_stale > 0 ) {
             if ( $num_stale > $cf_max_paths ) {
                 WsLog::l( 'Invalidating all CloudFront paths' );
-                self::invalidate_items( $distribution_id, [ '/*' ] );
+                self::invalidateItems( $distribution_id, [ '/*' ] );
             } else {
                 $path_text = ( $num_stale === 1 ) ? 'path' : 'paths';
                 WsLog::l( "Invalidating $num_stale CloudFront $path_text" );
-                self::invalidate_items( $distribution_id, $cf_stale_paths );
+                self::invalidateItems( $distribution_id, $cf_stale_paths );
             }
         }
     }
 
-    public static function s3_client() : \Aws\S3\S3Client {
+    public static function s3Client() : \Aws\S3\S3Client {
         $client_options = [
             'version' => 'latest',
             'region' => Controller::getValue( 's3Region' ),
@@ -218,7 +218,7 @@ public static function s3_client() : \Aws\S3\S3Client {
         return new \Aws\S3\S3Client( $client_options );
     }
 
-    public static function cloudfront_client() : \Aws\CloudFront\CloudFrontClient {
+    public static function cloudfrontClient() : \Aws\CloudFront\CloudFrontClient {
         /*
             If no credentials option, SDK attempts to load credentials from
             your environment in the following order:
@@ -272,8 +272,8 @@ public static function cloudfront_client() : \Aws\CloudFront\CloudFrontClient {
      *
      * @param mixed[] $items mixed array
      */
-    public static function create_invalidation( string $distribution_id, array $items ) : string {
-        $client = self::cloudfront_client();
+    public static function createInvalidation( string $distribution_id, array $items ) : string {
+        $client = self::cloudfrontClient();
 
         return $client->createInvalidation(
             [
@@ -294,9 +294,9 @@ public static function create_invalidation( string $distribution_id, array $item
      *
      * @param mixed[] $items mixed array
      */
-    public static function invalidate_items( string $distribution_id, array $items ) : ?string {
+    public static function invalidateItems( string $distribution_id, array $items ) : ?string {
         try {
-            return self::create_invalidation( $distribution_id, $items );
+            return self::createInvalidation( $distribution_id, $items );
         } catch ( AwsException $e ) {
             WsLog::l( 'Error creating CloudFront invalidation: ' . $e->getMessage() );
             return null;

src/MimeTypes.php

@@ -5,15 +5,15 @@
 class MimeTypes {
     /*
      * Takes a filename and returns its mimetype.
-     * GuessMimeTypes first looks at the file extension and looks it up
+     * guessMimeTypes first looks at the file extension and looks it up
      * in an array of known mimetypes. If that lookup misses, it uses
      * finfo to guess the mimetype based on magic bytes. If that also fails,
      * "application/octet-stream" is returned.
      *
      * @param string $filename filename
      * @return string mimetype
      */
-    public static function GuessMimeType( string $filename ) : string {
+    public static function guessMimeType( string $filename ) : string {
         static $mime_types = [
             '123' => 'application/vnd.lotus-1-2-3',
             '3dml' => 'text/vnd.in3d.3dml',