sportarchive / CloudTranscode

src/utils/S3Utils.php

Indentation +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
  * This class allows you to call the two S3 scripts
  * to download and upload files.
  * The scripts are executed using the CommandExecuter
-  */
+ */
 
 require_once __DIR__ . '/CommandExecuter.php';
 
@@ -89,7 +89,7 @@ 
             $cmd,
             1,
             array(1 => array("pipe", "w"),
-                  2 => array("pipe", "w")),
+                    2 => array("pipe", "w")),
             $callback,
             $callbackParams, 
             true,

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
  * The scripts are executed using the CommandExecuter
   */
 
-require_once __DIR__ . '/CommandExecuter.php';
+require_once __DIR__.'/CommandExecuter.php';
 
 use SA\CpeSdk;
 
@@ -36,7 +36,7 @@ 
         $callbackParams = null,
         $logKey = null)
     {   
-        $cmd = "php " . __DIR__ . self::GET_FROM_S3;
+        $cmd = "php ".__DIR__.self::GET_FROM_S3;
         $cmd .= " --bucket $bucket";
         $cmd .= " --file $filename";
         $cmd .= " --to $saveFileTo";
@@ -60,7 +60,7 @@ 
         $callbackParams = null,
         $logKey = null)
     {
-        $cmd  = "php " . __DIR__ . self::PUT_IN_S3;
+        $cmd  = "php ".__DIR__.self::PUT_IN_S3;
         $cmd .= " --bucket $bucket";
         $cmd .= " --file $filename";
         $cmd .= " --from $pathToFileToSend";

Braces +21 added lines, -14 removed lines

@@ -22,8 +22,9 @@ 
     
     public function __construct($cpeLogger = null)
     {
-        if (!$cpeLogger)
-            $this->cpeLogger = new CpeSdk\CpeLogger(null, 'S3Utils');
+        if (!$cpeLogger) {
+                    $this->cpeLogger = new CpeSdk\CpeLogger(null, 'S3Utils');
+        }
         $this->cpeLogger = $cpeLogger;
     }
 
@@ -64,10 +65,12 @@ 
         $cmd .= " --bucket $bucket";
         $cmd .= " --file $filename";
         $cmd .= " --from $pathToFileToSend";
-        if ($options['rrs'])
-            $cmd .= " --rrs";
-        if ($options['encrypt'])
-            $cmd .= " --encrypt";
+        if ($options['rrs']) {
+                    $cmd .= " --rrs";
+        }
+        if ($options['encrypt']) {
+                    $cmd .= " --encrypt";
+        }
     
         // HAndle execution
         return ($this->handle_s3_ops(
@@ -96,21 +99,25 @@ 
             2
         );
         
-        if ($out['outErr'])
-            throw new CpeSdk\CpeException($out['outErr'],
+        if ($out['outErr']) {
+                    throw new CpeSdk\CpeException($out['outErr'],
                 self::S3_OPS_FAILED);
+        }
 
-        if (!$out['out'])
-            throw new CpeSdk\CpeException("Script '$caller' didn't return any data !",
+        if (!$out['out']) {
+                    throw new CpeSdk\CpeException("Script '$caller' didn't return any data !",
                 self::NO_OUTPUT_DATA);
+        }
     
-        if (!($decoded = json_decode($out['out'], true)))
-            throw new CpeSdk\CpeException($out['out'],
+        if (!($decoded = json_decode($out['out'], true))) {
+                    throw new CpeSdk\CpeException($out['out'],
                 self::S3_OPS_FAILED);
+        }
     
-        if ($decoded["status"] == "ERROR")
-            throw new CpeSdk\CpeException($decoded["msg"],
+        if ($decoded["status"] == "ERROR") {
+                    throw new CpeSdk\CpeException($decoded["msg"],
                 self::S3_OPS_FAILED);
+        }
 
         return ($decoded);
     }