sportarchive / CloudTranscode

src/activities/transcoders/AudioTranscoder.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/BasicTranscoder.php';
+require_once __DIR__.'/BasicTranscoder.php';
 
 class AudioTranscoder extends BasicTranscoder
 {

src/activities/transcoders/ImageTranscoder.php

Doc Comments +6 added lines

@@ -21,6 +21,12 @@
     // $metadata should contain the ffprobe video stream array.
 
     // Start Convert for output transcoding
+
+    /**
+     * @param string $tmpPathInput
+     * @param null|string $pathToInputFile
+     * @param string $pathToOutputFiles
+     */
     public function transcode_asset(
         $tmpPathInput,
         $pathToInputFile, 

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
             $this->cpeLogger->logOut(
                 "INFO", 
                 basename(__FILE__), 
-                "Input Video metadata: " . print_r($metadata, true),
+                "Input Video metadata: ".print_r($metadata, true),
                 $this->activityLogKey
             );
 
@@ -132,7 +132,7 @@ 
             $this->cpeLogger->logOut(
                 "ERROR", 
                 basename(__FILE__), 
-                "Execution of command '".$convertCmd."' failed: " . print_r($metadata, true). ". ".$e->getMessage(),
+                "Execution of command '".$convertCmd."' failed: ".print_r($metadata, true).". ".$e->getMessage(),
                 $this->activityLogKey
             );
             return false;
@@ -184,7 +184,7 @@ 
         
         // Append output filename to path
         $pathToOutputFiles .=
-            "/" . $outputWanted->{'output_file_info'}['basename'];
+            "/".$outputWanted->{'output_file_info'}['basename'];
         
         $convertCmd = "convert $convertArgs $pathToOutputFiles";
 
@@ -207,7 +207,7 @@ 
             $pathToInputFile, $convertCmd);
 
         // Append output filename to path
-        $pathToOutputFiles .= "/" . $outputWanted->{'output_file_info'}['basename'];
+        $pathToOutputFiles .= "/".$outputWanted->{'output_file_info'}['basename'];
         // Replace ${output_file} by output filename and path to local disk
         $convertCmd = preg_replace('/\$\{output_file\}/',
             $pathToOutputFiles, $convertCmd);

Braces +5 added lines, -6 removed lines

@@ -54,13 +54,14 @@ 
             $this->activityLogKey
         );
 
-        if ($metadata)
-            $this->cpeLogger->logOut(
+        if ($metadata) {
+                    $this->cpeLogger->logOut(
                 "INFO", 
                 basename(__FILE__), 
                 "Input Video metadata: " . print_r($metadata, true),
                 $this->activityLogKey
             );
+        }
 
         try {
             $convertCmd = "";
@@ -81,8 +82,7 @@ 
                     $metadata, 
                     $outputWanted
                 );
-            }
-            else {
+            } else {
                 $convertCmd = $this->craft_convert_cmd(
                     $tmpPathInput,
                     $pathToInputFile,
@@ -127,8 +127,7 @@ 
             // XXX: Remove FFprobe for image convertion. Save time
             $outputInfo =
                 $this->getAssetInfo($pathToOutputFiles."/".$outputWanted->{'output_file_info'}['basename']);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->logOut(
                 "ERROR", 
                 basename(__FILE__), 

src/activities/BasicActivity.php

Doc Comments +4 added lines

@@ -113,6 +113,10 @@
      */
     
     // Create TMP folder and download file to process
+
+    /**
+     * @param string $saveFileTo
+     */
     public function getFileToProcess($task, $inputBuket, $inputFile, $saveFileTo)
     {        
         // Get file from S3 or local copy if any

Indentation +9 added lines, -9 removed lines

@@ -78,8 +78,8 @@ 
         {
             if ($this->debug)
                 $this->cpeLogger->logOut("DEBUG", basename(__FILE__), 
-                                         "Creating TMP input folder '".$this->tmpInputPath."'",
-                                         $this->logKey);
+                                            "Creating TMP input folder '".$this->tmpInputPath."'",
+                                            $this->logKey);
             
             if (!mkdir($this->tmpInputPath, 0750, true))
                 throw new CpeSdk\CpeException(
@@ -117,9 +117,9 @@ 
     {        
         // Get file from S3 or local copy if any
         $this->cpeLogger->logOut("INFO", 
-                                 basename(__FILE__), 
-                                 "Downloading '$inputBuket/$inputFile' to '$saveFileTo' ...",
-                                 $this->logKey);
+                                    basename(__FILE__), 
+                                    "Downloading '$inputBuket/$inputFile' to '$saveFileTo' ...",
+                                    $this->logKey);
         
         // Use the S3 utils to initiate the download
         $s3Output = $this->s3Utils->get_file_from_s3(
@@ -132,12 +132,12 @@ 
         );
         
         $this->cpeLogger->logOut("INFO", basename(__FILE__), 
-                                 $s3Output['msg'],
-                                 $this->logKey);
+                                    $s3Output['msg'],
+                                    $this->logKey);
         
         $this->cpeLogger->logOut("INFO", basename(__FILE__), 
-                                 "Input file successfully downloaded into local TMP folder '$saveFileTo' !",
-                                 $this->logKey);
+                                    "Input file successfully downloaded into local TMP folder '$saveFileTo' !",
+                                    $this->logKey);
         
         return $saveFileTo;
     }

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
 
 class BasicActivity extends CpeSdk\CpeActivity
 {
-    public $tmpInputPath;    // Path to directory containing TMP file
-    public $inputFilePath;   // Path to input file locally
-    public $s3Utils;         // Used to manipulate S3. Download/Upload
+    public $tmpInputPath; // Path to directory containing TMP file
+    public $inputFilePath; // Path to input file locally
+    public $s3Utils; // Used to manipulate S3. Download/Upload
   
     // Constants
     const TMP_FOLDER_FAIL      = "TMP_FOLDER_FAIL";
@@ -92,7 +92,7 @@ 
         if (isset($this->input->{'input_asset'}->{'http'}))
         {
             // Pad HTTP input so it is cached in case of full encodes
-            $this->inputFilePath = 'cache:' . $this->input->{'input_asset'}->{'http'};
+            $this->inputFilePath = 'cache:'.$this->input->{'input_asset'}->{'http'};
         }
         else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
                  isset($this->input->{'input_asset'}->{'file'}))

Braces +7 added lines, -6 removed lines

@@ -76,16 +76,18 @@ 
         // Create the tmp folder if doesn't exist
         if (!file_exists($this->tmpInputPath)) 
         {
-            if ($this->debug)
-                $this->cpeLogger->logOut("DEBUG", basename(__FILE__), 
+            if ($this->debug) {
+                            $this->cpeLogger->logOut("DEBUG", basename(__FILE__), 
                                          "Creating TMP input folder '".$this->tmpInputPath."'",
                                          $this->logKey);
+            }
             
-            if (!mkdir($this->tmpInputPath, 0750, true))
-                throw new CpeSdk\CpeException(
+            if (!mkdir($this->tmpInputPath, 0750, true)) {
+                            throw new CpeSdk\CpeException(
                     "Unable to create temporary folder '$this->tmpInputPath' !",
                     self::TMP_FOLDER_FAIL
                 );
+            }
         }
         
         $this->inputFilePath = null;
@@ -93,8 +95,7 @@ 
         {
             // Pad HTTP input so it is cached in case of full encodes
             $this->inputFilePath = 'cache:' . $this->input->{'input_asset'}->{'http'};
-        }
-        else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
+        } else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
                  isset($this->input->{'input_asset'}->{'file'}))
         {
             // Download input file and store it in TMP folder

src/activities/transcoders/BasicTranscoder.php

Doc Comments +4 added lines

@@ -78,6 +78,10 @@
      */
 
     // Execute FFPROBE to get asset information
+
+    /**
+     * @param string|null $inputFilePath
+     */
     public function getAssetInfo($inputFilePath)
     {
         $inputFilePath = escapeshellarg($inputFilePath);

Spacing +5 added lines, -5 removed lines

@@ -29,12 +29,12 @@
 class BasicTranscoder 
 {
     public $activityObj; // Calling activity object
-    public $task;        // Activity TASK
-    public $logKey;      // Valling activity loggin key
+    public $task; // Activity TASK
+    public $logKey; // Valling activity loggin key
 
-    public $cpeLogger;   // Logger
-    public $s3Utils;     // Used to manipulate S3
-    public $executer;    // Executer obj
+    public $cpeLogger; // Logger
+    public $s3Utils; // Used to manipulate S3
+    public $executer; // Executer obj
 
     const EXEC_VALIDATE_FAILED  = "EXEC_VALIDATE_FAILED";
     const TRANSCODE_FAIL        = "TRANSCODE_FAIL";

Braces +4 added lines, -3 removed lines

@@ -59,7 +59,9 @@ 
 
     public function isDirEmpty($dir)
     {
-        if (!is_readable($dir)) return null; 
+        if (!is_readable($dir)) {
+            return null;
+        }
         $handle = opendir($dir);
         while (false !== ($entry = readdir($handle))) {
             if ($entry !== '.' && $entry !== '..') { 
@@ -94,8 +96,7 @@ 
                 false, false, 
                 false, 1
             );
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->logOut(
                 "ERROR", 
                 basename(__FILE__), 

src/activities/transcoders/VideoTranscoder.php

Doc Comments +6 added lines

@@ -55,6 +55,12 @@
     // $metadata should contain the ffprobe video stream array.
 
     // Start FFmpeg for output transcoding
+
+    /**
+     * @param string $tmpInputPath
+     * @param null|string $inputFilePath
+     * @param string $outputFilesPath
+     */
     public function transcode_asset(
         $tmpInputPath,
         $inputFilePath,

Indentation +20 added lines, -20 removed lines

@@ -208,9 +208,9 @@ 
         // Process options for watermark
         if (isset($outputWanted->{'watermark'}) && $outputWanted->{'watermark'}) {
             $watermarkOptions =
-                              $this->get_watermark_options(
-                                  $tmpInputPath,
-                                  $outputWanted->{'watermark'});
+                                $this->get_watermark_options(
+                                    $tmpInputPath,
+                                    $outputWanted->{'watermark'});
             // Replace ${watermark_options} by watermark options
             $ffmpegCmd = preg_replace('/\$\{watermark_options\}/', $watermarkOptions, $ffmpegCmd);
         }
@@ -263,16 +263,16 @@ 
         $formattedOptions = "";
         if (isset($outputWanted->{'preset_values'}->{'video_codec_options'})) {
             $formattedOptions =
-                              $this->set_output_video_codec_options($outputWanted->{'preset_values'}->{'video_codec_options'});
+                                $this->set_output_video_codec_options($outputWanted->{'preset_values'}->{'video_codec_options'});
         }
 
         $watermarkOptions = "";
         // Process options for watermark
         if (isset($outputWanted->{'watermark'}) && $outputWanted->{'watermark'}) {
             $watermarkOptions =
-                              $this->get_watermark_options(
-                                  $tmpInputPath,
-                                  $outputWanted->{'watermark'});
+                                $this->get_watermark_options(
+                                    $tmpInputPath,
+                                    $outputWanted->{'watermark'});
         }
 
         // Create FFMpeg arguments
@@ -329,7 +329,7 @@ 
             }
 
             $outputFilesPath .= "/" . $outputFileInfo['filename'] . "%06d."
-                             . $outputFileInfo['extension'];
+                                . $outputFileInfo['extension'];
             $frameOptions = " -vf fps=fps=1/$intervals";
         }
 
@@ -361,9 +361,9 @@ 
             $watermarkPath);
 
         $this->cpeLogger->logOut("INFO",
-                                 basename(__FILE__),
-                                 $s3Output['msg'],
-                                 $this->logKey);
+                                    basename(__FILE__),
+                                    $s3Output['msg'],
+                                    $this->logKey);
 
         // Transform watermark for opacity
         $convertCmd = "convert $watermarkPath -alpha on -channel A -evaluate Multiply " . $watermarkOptions->{'opacity'} . " +channel $newWatermarkPath";
@@ -550,12 +550,12 @@ 
     {
         if (!$output_wanted) {
             throw new CpeSdk\CpeException("No output data provided to transcoder !",
-                                          self::NO_OUTPUT);
+                                            self::NO_OUTPUT);
         }
 
         if (!isset($output_wanted->{"preset"})) {
             throw new CpeSdk\CpeException("No preset selected for output !",
-                                          self::BAD_PRESETS_DIR);
+                                            self::BAD_PRESETS_DIR);
         }
 
         $preset     = $output_wanted->{"preset"};
@@ -563,12 +563,12 @@ 
 
         if (!($presetContent = file_get_contents($presetPath.$preset.".json"))) {
             throw new CpeSdk\CpeException("Can't open preset file !",
-                                          self::OPEN_PRESET_FAILED);
+                                            self::OPEN_PRESET_FAILED);
         }
 
         if (!($decodedPreset = json_decode($presetContent))) {
             throw new CpeSdk\CpeException("Bad preset JSON format !",
-                                          self::BAD_PRESET_FORMAT);
+                                            self::BAD_PRESET_FORMAT);
         }
 
         return ($decodedPreset);
@@ -579,7 +579,7 @@ 
     {
         if (!isset($output->{"preset"})) {
             throw new CpeSdk\CpeException("No preset selected for output !",
-                                          self::BAD_PRESETS_DIR);
+                                            self::BAD_PRESETS_DIR);
         }
 
         $preset     = $output->{"preset"};
@@ -587,7 +587,7 @@ 
 
         if (!($files = scandir($presetPath))) {
             throw new CpeSdk\CpeException("Unable to open preset directory '$presetPath' !",
-                                          self::BAD_PRESETS_DIR);
+                                            self::BAD_PRESETS_DIR);
         }
 
         foreach ($files as $presetFile)
@@ -600,12 +600,12 @@ 
                 {
                     if (!($presetContent = file_get_contents("$presetPath/$presetFile"))) {
                         throw new CpeSdk\CpeException("Can't open preset file '$presetPath/$presetFile'!",
-                                                      self::OPEN_PRESET_FAILED);
+                                                        self::OPEN_PRESET_FAILED);
                     }
 
                     if (!($decodedPreset = json_decode($presetContent))) {
                         throw new CpeSdk\CpeException("Bad preset JSON format '$presetPath/$presetFile'!",
-                                                      self::BAD_PRESET_FORMAT);
+                                                        self::BAD_PRESET_FORMAT);
                     }
 
                     return true;
@@ -614,7 +614,7 @@ 
         }
 
         throw new CpeSdk\CpeException("Unkown preset file '$preset' !",
-                                      self::UNKNOWN_PRESET);
+                                        self::UNKNOWN_PRESET);
     }
 
     // Extract Metadata from ffprobe

Spacing +25 added lines, -25 removed lines

@@ -22,7 +22,7 @@ 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once __DIR__ . '/BasicTranscoder.php';
+require_once __DIR__.'/BasicTranscoder.php';
 
 use SA\CpeSdk;
 
@@ -84,7 +84,7 @@ 
             $this->cpeLogger->logOut(
                 "INFO",
                 basename(__FILE__),
-                "Input Video metadata: " . print_r($metadata, true),
+                "Input Video metadata: ".print_r($metadata, true),
                 $this->logKey
             );
 
@@ -170,7 +170,7 @@ 
             $this->cpeLogger->logOut(
                 "ERROR",
                 basename(__FILE__),
-                "Execution of command '".$ffmpegCmd."' failed: " . print_r($metadata, true). ". ".$e->getMessage(),
+                "Execution of command '".$ffmpegCmd."' failed: ".print_r($metadata, true).". ".$e->getMessage(),
                 $this->logKey
             );
             throw $e;
@@ -216,7 +216,7 @@ 
         }
 
         // Append output filename to path
-        $outputFilesPath .= "/" . $outputWanted->{'output_file_info'}['basename'];
+        $outputFilesPath .= "/".$outputWanted->{'output_file_info'}['basename'];
         // Replace ${output_file} by output filename and path to local disk
         $ffmpegCmd = preg_replace('/\$\{output_file\}/', $outputFilesPath, $ffmpegCmd);
 
@@ -276,7 +276,7 @@ 
         }
 
         // Create FFMpeg arguments
-        $ffmpegArgs =  " -i $inputFilePath -y -threads 0";
+        $ffmpegArgs = " -i $inputFilePath -y -threads 0";
         $ffmpegArgs .= " -vf scale=$size";
         $ffmpegArgs .= " -vcodec $videoCodec";
         $ffmpegArgs .= " -acodec $audioCodec";
@@ -287,9 +287,9 @@ 
         $ffmpegArgs .= " $watermarkOptions";
 
         // Append output filename to path
-        $outputFilesPath .= "/" . $outputWanted->{'output_file_info'}['basename'];
+        $outputFilesPath .= "/".$outputWanted->{'output_file_info'}['basename'];
         // Final command
-        $ffmpegCmd  = "ffmpeg $ffmpegArgs $outputFilesPath";
+        $ffmpegCmd = "ffmpeg $ffmpegArgs $outputFilesPath";
 
         return ($ffmpegCmd);
     }
@@ -316,8 +316,8 @@ 
                 $snapshot_sec = $outputWanted->{'snapshot_sec'};
             }
 
-            $time = gmdate("H:i:s", $snapshot_sec) . ".000";
-            $outputFilesPath .= "/" . $outputFileInfo['basename'];
+            $time = gmdate("H:i:s", $snapshot_sec).".000";
+            $outputFilesPath .= "/".$outputFileInfo['basename'];
             $frameOptions = " -ss $time -vframes 1";
         }
         else if ($outputWanted->{'mode'} == 'intervals')
@@ -328,14 +328,14 @@ 
                 $intervals = $outputWanted->{'intervals'};
             }
 
-            $outputFilesPath .= "/" . $outputFileInfo['filename'] . "%06d."
+            $outputFilesPath .= "/".$outputFileInfo['filename']."%06d."
                              . $outputFileInfo['extension'];
             $frameOptions = " -vf fps=fps=1/$intervals";
         }
 
         // Create FFMpeg arguments
-        $ffmpegArgs  =  " -i $inputFilePath -y -threads 0";
-        $ffmpegArgs .= " -vf scale=" . $outputWanted->{'size'};
+        $ffmpegArgs  = " -i $inputFilePath -y -threads 0";
+        $ffmpegArgs .= " -vf scale=".$outputWanted->{'size'};
         $ffmpegArgs .= " $frameOptions -f image2 -q:v 8";
 
         // Final command
@@ -366,7 +366,7 @@ 
                                  $this->logKey);
 
         // Transform watermark for opacity
-        $convertCmd = "convert $watermarkPath -alpha on -channel A -evaluate Multiply " . $watermarkOptions->{'opacity'} . " +channel $newWatermarkPath";
+        $convertCmd = "convert $watermarkPath -alpha on -channel A -evaluate Multiply ".$watermarkOptions->{'opacity'}." +channel $newWatermarkPath";
 
         try {
             $out = $this->executer->execute($convertCmd, 1,
@@ -395,7 +395,7 @@ 
         // Format options for FFMpeg
         $size      = $watermarkOptions->{'size'};
         $positions = $this->get_watermark_position($watermarkOptions);
-        $formattedOptions = "-vf \"movie=$newWatermarkPath, scale=$size [wm]; [in][wm] overlay=" . $positions['x'] . ':' . $positions['y'] . " [out]\"";
+        $formattedOptions = "-vf \"movie=$newWatermarkPath, scale=$size [wm]; [in][wm] overlay=".$positions['x'].':'.$positions['y']." [out]\"";
 
         return ($formattedOptions);
     }
@@ -412,10 +412,10 @@ 
             $positions['y'] = $watermarkOptions->{'y'};
         }
         if ($watermarkOptions->{'x'} < 0) {
-            $positions['x'] = 'main_w-overlay_w' . $watermarkOptions->{'x'};
+            $positions['x'] = 'main_w-overlay_w'.$watermarkOptions->{'x'};
         }
         if ($watermarkOptions->{'y'} < 0) {
-            $positions['y'] = 'main_h-overlay_h' . $watermarkOptions->{'y'};
+            $positions['y'] = 'main_h-overlay_h'.$watermarkOptions->{'y'};
         }
 
         return ($positions);
@@ -490,7 +490,7 @@ 
             }
         }
 
-        return (str_replace("x",":", $size));
+        return (str_replace("x", ":", $size));
     }
 
     // REad ffmpeg output and calculate % progress
@@ -524,7 +524,7 @@ 
 
         // # finally, progress is easy
         if ($done && $duration) {
-            $progress = round(($done/$duration)*100);
+            $progress = round(($done / $duration) * 100);
         }
 
         $this->cpeLogger->logOut(
@@ -559,7 +559,7 @@ 
         }
 
         $preset     = $output_wanted->{"preset"};
-        $presetPath = __DIR__ . '/../../../presets/';
+        $presetPath = __DIR__.'/../../../presets/';
 
         if (!($presetContent = file_get_contents($presetPath.$preset.".json"))) {
             throw new CpeSdk\CpeException("Can't open preset file !",
@@ -583,7 +583,7 @@ 
         }
 
         $preset     = $output->{"preset"};
-        $presetPath = __DIR__ . '/../../../presets/';
+        $presetPath = __DIR__.'/../../../presets/';
 
         if (!($files = scandir($presetPath))) {
             throw new CpeSdk\CpeException("Unable to open preset directory '$presetPath' !",
@@ -633,22 +633,22 @@ 
         }
 
         $analyse = [
-            'duration' => isset($metadata->format->duration) ? (float)$metadata->format->duration : 0,
+            'duration' => isset($metadata->format->duration) ? (float) $metadata->format->duration : 0,
             'video' => empty($videoStreams) ? null : [
                 'codec' => $videoStreams->codec_name,
                 'color' => @$videoStreams->color_space,
-                'resolution' => $videoStreams->width . 'x' . $videoStreams->height,
+                'resolution' => $videoStreams->width.'x'.$videoStreams->height,
                 'sar' => $videoStreams->sample_aspect_ratio,
                 'dar' => $videoStreams->display_aspect_ratio,
                 'framerate' => $videoStreams->r_frame_rate,
-                'bitrate' => isset($videoStreams->bit_rate) ? (int)$videoStreams->bit_rate : null
+                'bitrate' => isset($videoStreams->bit_rate) ? (int) $videoStreams->bit_rate : null
             ],
             'audio' => empty($audioStreams) ? null : [
                 'codec' => $audioStreams->codec_name,
                 'frequency' => $audioStreams->sample_rate,
-                'channels' => (int)$audioStreams->channels,
+                'channels' => (int) $audioStreams->channels,
                 'depth' => $audioStreams->bits_per_sample,
-                'bitrate' => (int)$audioStreams->bit_rate
+                'bitrate' => (int) $audioStreams->bit_rate
             ]
         ];
 

Braces +7 added lines, -10 removed lines

@@ -80,13 +80,14 @@ 
             $this->logKey
         );
 
-        if ($metadata)
-            $this->cpeLogger->logOut(
+        if ($metadata) {
+                    $this->cpeLogger->logOut(
                 "INFO",
                 basename(__FILE__),
                 "Input Video metadata: " . print_r($metadata, true),
                 $this->logKey
             );
+        }
 
         try {
             $ffmpegCmd = "";
@@ -165,8 +166,7 @@ 
 
             // FFProbe the output file and return its information
             $outputInfo = $this->getAssetInfo($outputFilesPath."/".$outputWanted->{'output_file_info'}['basename']);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->logOut(
                 "ERROR",
                 basename(__FILE__),
@@ -319,8 +319,7 @@ 
             $time = gmdate("H:i:s", $snapshot_sec) . ".000";
             $outputFilesPath .= "/" . $outputFileInfo['basename'];
             $frameOptions = " -ss $time -vframes 1";
-        }
-        else if ($outputWanted->{'mode'} == 'intervals')
+        } else if ($outputWanted->{'mode'} == 'intervals')
         {
             $intervals = self::INTERVALS_DEFAULT;
             if (isset($outputWanted->{'intervals'}) &&
@@ -373,8 +372,7 @@ 
                                             array(1 => array("pipe", "w"), 2 => array("pipe", "w")),
                                             false, false,
                                             false, 1);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $this->cpeLogger->logOut(
                 "ERROR",
                 basename(__FILE__),
@@ -626,8 +624,7 @@ 
         foreach ($metadata->streams as $key => $value) {
             if ($value->codec_type === 'video') {
                 $videoStreams = $value;
-            }
-            else if ($value->codec_type === 'audio') {
+            } else if ($value->codec_type === 'audio') {
                 $audioStreams = $value;
             }
         }

src/activities/TranscodeAssetActivity.php

Indentation +9 added lines, -9 removed lines

@@ -79,7 +79,7 @@ 
                 break;
             default:
                 throw new CpeSdk\CpeException("Unknown input asset 'type'! Abording ...",
-                                              self::UNKOWN_INPUT_TYPE);
+                                                self::UNKOWN_INPUT_TYPE);
             }
 
             // Upload resulting file
@@ -178,7 +178,7 @@ 
         // Open '$outputFilesPath' to read it and send all files to S3 bucket
         if (!$handle = opendir($this->outputFilesPath)) {
             throw new CpeSdk\CpeException("Can't open tmp path '$this->outputFilesPath'!",
-                                          self::TMP_PATH_OPEN_FAIL);
+                                            self::TMP_PATH_OPEN_FAIL);
         }
 
         // Upload all resulting files sitting in $outputFilesPath to S3
@@ -205,15 +205,15 @@ 
             unlink("$this->outputFilesPath/$entry");
 
             $this->cpeLogger->logOut("INFO", basename(__FILE__),
-                                     $s3Output['msg'],
-                                     $this->logKey);
+                                        $s3Output['msg'],
+                                        $this->logKey);
         }
     }
 
     private function getOutputPath($output)
     {
         $outputFilesPath = self::TMP_FOLDER
-                         . $this->name."/".$this->logKey;
+                            . $this->name."/".$this->logKey;
 
         $output->{'key'} = $output->{'path'}."/".$output->{'file'};
 
@@ -226,8 +226,8 @@ 
         {
             if ($this->debug)
                 $this->cpeLogger->logOut("INFO", basename(__FILE__),
-                                         "Creating TMP output folder '".$outputFilesPath."'",
-                                         $this->logKey);
+                                            "Creating TMP output folder '".$outputFilesPath."'",
+                                            $this->logKey);
 
             if (!mkdir($outputFilesPath, 0750, true))
                 throw new CpeSdk\CpeException(
@@ -266,7 +266,7 @@ 
             ))
         {
             throw new CpeSdk\CpeException("Can't convert that input asset 'type' (".$this->input->{'input_asset'}->{'type'}.") into this output asset 'type' (".$output->{'type'}.")! Abording.",
-                                          self::CONVERSION_TYPE_ERROR);
+                                            self::CONVERSION_TYPE_ERROR);
         }
     }
 }
@@ -350,7 +350,7 @@ 
 
 $cpeLogger = new SA\CpeSdk\CpeLogger($name, $logPath);
 $cpeLogger->logOut("INFO", basename(__FILE__),
-                   "\033[1mStarting activity\033[0m: $name");
+                    "\033[1mStarting activity\033[0m: $name");
 
 // We instanciate the Activity 'ValidateAsset' and give it a name for Snf
 $activityPoller = new TranscodeAssetActivity(

Spacing +1 added lines, -1 removed lines

@@ -281,7 +281,7 @@
 // Usage
 function usage()
 {
-    echo("Usage: php ". basename(__FILE__) . " -A <Snf ARN> [-C <client class path>] [-N <activity name>] [-h] [-d] [-l <log path>]\n");
+    echo("Usage: php ".basename(__FILE__)." -A <Snf ARN> [-C <client class path>] [-N <activity name>] [-h] [-d] [-l <log path>]\n");
     echo("-h: Print this help\n");
     echo("-d: Debug mode\n");
     echo("-l <log_path>: Location where logs will be dumped in (folder).\n");

Braces +28 added lines, -19 removed lines

@@ -85,8 +85,9 @@ 
             // Upload resulting file
             $this->uploadResultFiles($task, $output);
 
-            if ($this->client)
-                $this->client->onTranscodeDone($this->token, $result);
+            if ($this->client) {
+                            $this->client->onTranscodeDone($this->token, $result);
+            }
         }
 
         return json_encode($result);
@@ -102,8 +103,9 @@ 
         
         # If we have metadata, we expect the output of ffprobe
         $metadata = null;
-        if (isset($this->input->{'input_metadata'}))
-            $metadata = $this->input->{'input_metadata'};
+        if (isset($this->input->{'input_metadata'})) {
+                    $metadata = $this->input->{'input_metadata'};
+        }
         
         // Perform transcoding
         $result = $imageTranscoder->transcode_asset(
@@ -140,8 +142,9 @@ 
 
         # If we have metadata, we expect the output of ffprobe
         $metadata = null;
-        if (isset($this->input->{'input_metadata'}))
-            $metadata = $this->input->{'input_metadata'};
+        if (isset($this->input->{'input_metadata'})) {
+                    $metadata = $this->input->{'input_metadata'};
+        }
 
         // Perform transcoding
         $result = $videoTranscoder->transcode_asset(
@@ -224,16 +227,18 @@ 
 
         if (!file_exists($outputFilesPath))
         {
-            if ($this->debug)
-                $this->cpeLogger->logOut("INFO", basename(__FILE__),
+            if ($this->debug) {
+                            $this->cpeLogger->logOut("INFO", basename(__FILE__),
                                          "Creating TMP output folder '".$outputFilesPath."'",
                                          $this->logKey);
+            }
 
-            if (!mkdir($outputFilesPath, 0750, true))
-                throw new CpeSdk\CpeException(
+            if (!mkdir($outputFilesPath, 0750, true)) {
+                            throw new CpeSdk\CpeException(
                     "Unable to create temporary folder '$outputFilesPath' !",
                     self::TMP_FOLDER_FAIL
                 );
+            }
         }
 
         return ($outputFilesPath);
@@ -302,15 +307,18 @@ 
     global $name;
 
     // Handle input parameters
-    if (!($options = getopt("N:A:l:C:hd")))
-        usage();
+    if (!($options = getopt("N:A:l:C:hd"))) {
+            usage();
+    }
 
-    if (isset($options['h']))
-        usage();
+    if (isset($options['h'])) {
+            usage();
+    }
 
     // Debug
-    if (isset($options['d']))
-        $debug = true;
+    if (isset($options['d'])) {
+            $debug = true;
+    }
 
     if (isset($options['A']) && $options['A']) {
         $arn = $options['A'];
@@ -329,9 +337,10 @@ 
         $name = $options['N'];
     }
 
-    if (isset($options['l']))
-        $logPath = $options['l'];
-}
+    if (isset($options['l'])) {
+            $logPath = $options['l'];
+    }
+    }
 
 
 

src/activities/ValidateAssetActivity.php

Indentation +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
 
 $cpeLogger = new SA\CpeSdk\CpeLogger($name, $logPath);
 $cpeLogger->logOut("INFO", basename(__FILE__),
-                   "\033[1mStarting activity\033[0m: $name");
+                    "\033[1mStarting activity\033[0m: $name");
 
 // We instanciate the Activity 'ValidateAsset' and give it a name for Snf
 $activityPoller = new ValidateAssetActivity(

Spacing +3 added lines, -3 removed lines

@@ -53,8 +53,8 @@ 
         static $limit = 1024; // 500 bytes, it's only a test
         
         $len = strlen($this->curl_data) + strlen($chunk);
-        if ($len >= $limit ) {
-            $this->curl_data .= substr($chunk, 0, $limit-strlen($this->curl_data));
+        if ($len >= $limit) {
+            $this->curl_data .= substr($chunk, 0, $limit - strlen($this->curl_data));
             return -1;
         }
         
@@ -169,7 +169,7 @@ 
 // Usage
 function usage()
 {
-    echo("Usage: php ". basename(__FILE__) . " -A <Snf ARN> [-C <client class path>] [-N <activity name>] [-h] [-d] [-l <log path>]\n");
+    echo("Usage: php ".basename(__FILE__)." -A <Snf ARN> [-C <client class path>] [-N <activity name>] [-h] [-d] [-l <log path>]\n");
     echo("-h: Print this help\n");
     echo("-d: Debug mode\n");
     echo("-l <log_path>: Location where logs will be dumped in (folder).\n");

Braces +20 added lines, -15 removed lines

@@ -36,8 +36,9 @@ 
     public function __construct($client = null, $params, $debug, $cpeLogger)
     {
         # Check if preper env vars are setup
-        if (!($region = getenv("AWS_DEFAULT_REGION")))
-            throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+        if (!($region = getenv("AWS_DEFAULT_REGION"))) {
+                    throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+        }
         
         parent::__construct($client, $params, $debug, $cpeLogger);
         
@@ -86,8 +87,7 @@ 
             curl_exec($ch);
             curl_close($ch);
             $chunk = $this->curl_data;
-        }
-        else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
+        } else if (isset($this->input->{'input_asset'}->{'bucket'}) &&
                  isset($this->input->{'input_asset'}->{'file'})) {
             // Fetch first 1 KiB of the file for Magic number validation
             $obj = $this->s3->getObject([
@@ -106,13 +106,14 @@ 
             'file -b --mime-type '.escapeshellarg($tmpFile))['out']);
         $type = substr($mime, 0, strpos($mime, '/'));
 
-        if ($this->debug)
-            $this->cpeLogger->logOut(
+        if ($this->debug) {
+                    $this->cpeLogger->logOut(
                 "DEBUG",
                 basename(__FILE__),
                 "File meta information gathered. Mime: $mime | Type: $type",
                 $this->logKey
         );
+        }
 
         // Load the right transcoder base on input_type
         // Get asset detailed info
@@ -190,15 +191,18 @@ 
     global $name;
     
     // Handle input parameters
-    if (!($options = getopt("N:A:l:C:hd")))
-        usage();
+    if (!($options = getopt("N:A:l:C:hd"))) {
+            usage();
+    }
     
-    if (isset($options['h']))
-        usage();
+    if (isset($options['h'])) {
+            usage();
+    }
 
     // Debug
-    if (isset($options['d']))
-        $debug = true;
+    if (isset($options['d'])) {
+            $debug = true;
+    }
 
     if (isset($options['A']) && $options['A']) {
         $arn = $options['A'];
@@ -217,9 +221,10 @@ 
         $name = $options['N'];
     }
     
-    if (isset($options['l']))
-        $logPath = $options['l'];
-}
+    if (isset($options['l'])) {
+            $logPath = $options['l'];
+    }
+    }
 
 
 /*

src/scripts/putInS3.php

Spacing +8 added lines, -8 removed lines

@@ -4,11 +4,11 @@ 
  * Script used to put a file in AWS S3
  **/
 
-require __DIR__ . "/../../vendor/autoload.php";
+require __DIR__."/../../vendor/autoload.php";
 
 function usage()
 {
-    echo("Usage: php ". basename(__FILE__) . " [-h] [--rrs::] [--encrypt::] --bucket <s3 bucket> --file <filename> --from <filepath>\n");
+    echo("Usage: php ".basename(__FILE__)." [-h] [--rrs::] [--encrypt::] --bucket <s3 bucket> --file <filename> --from <filepath>\n");
     echo("--help, -h: Print this help\n");
     echo("--bucket <s3 bucket>: Name of the S3 bucket\n");
     echo("--file <filename>: Name of the file to create in bucket. You can override local filename.\n");
@@ -31,7 +31,7 @@ 
         usage();
     }
 
-    $options['bucket'] = rtrim( $options['bucket'], "/");
+    $options['bucket'] = rtrim($options['bucket'], "/");
 }
 
 $options = getopt("h", [
@@ -71,15 +71,15 @@ 
     $s3->putObject($params); 
     
     // Print JSON error output
-    print json_encode([ "status" => "SUCCESS",
-            "msg" => "[".__FILE__."] Upload '" . $options['from'] . "' to '" . $options['bucket'] . "/" . $options['file']  . "' successful !" ]);
+    print json_encode(["status" => "SUCCESS",
+            "msg" => "[".__FILE__."] Upload '".$options['from']."' to '".$options['bucket']."/".$options['file']."' successful !"]);
 } 
 catch (Exception $e) {
-    $err = "Unable to put file '" . $options['from']  . "' into S3: '" . $options['bucket'] . "/" . $options['file']  . "'! " . $e->getMessage();
+    $err = "Unable to put file '".$options['from']."' into S3: '".$options['bucket']."/".$options['file']."'! ".$e->getMessage();
     
     // Print JSON error output
-    print json_encode([ "status" => "ERROR",
-            "msg" => "[".__FILE__."] $err" ]);
+    print json_encode(["status" => "ERROR",
+            "msg" => "[".__FILE__."] $err"]);
 
     die("[".__FILE__."] $err");
 }

Braces +13 added lines, -10 removed lines

@@ -21,8 +21,9 @@ 
 function check_input_parameters(&$options)
 {
     if (!count($options) || isset($options['h']) ||
-        isset($options['help']))
-        usage();
+        isset($options['help'])) {
+            usage();
+    }
     
     if (!isset($options['bucket']) || !isset($options['file']) ||
         !isset($options['from']))
@@ -46,8 +47,9 @@ 
 
 try {
     # Check if preper env vars are setup
-    if (!($region = getenv("AWS_DEFAULT_REGION")))
-        throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+    if (!($region = getenv("AWS_DEFAULT_REGION"))) {
+            throw new CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+    }
         
     // Get S3 client
     $s3 = new \Aws\S3\S3Client([
@@ -62,10 +64,12 @@ 
     );
 
     // StorageClass and Encryption ?
-    if (isset($options['rrs']))
-        $params['StorageClass'] = 'REDUCED_REDUNDANCY';
-    if (isset($options['encrypt']))
-        $params['ServerSideEncryption'] = 'AES256';
+    if (isset($options['rrs'])) {
+            $params['StorageClass'] = 'REDUCED_REDUNDANCY';
+    }
+    if (isset($options['encrypt'])) {
+            $params['ServerSideEncryption'] = 'AES256';
+    }
     
     // Upload and Save file to S3
     $s3->putObject($params); 
@@ -73,8 +77,7 @@ 
     // Print JSON error output
     print json_encode([ "status" => "SUCCESS",
             "msg" => "[".__FILE__."] Upload '" . $options['from'] . "' to '" . $options['bucket'] . "/" . $options['file']  . "' successful !" ]);
-} 
-catch (Exception $e) {
+} catch (Exception $e) {
     $err = "Unable to put file '" . $options['from']  . "' into S3: '" . $options['bucket'] . "/" . $options['file']  . "'! " . $e->getMessage();
     
     // Print JSON error output

src/scripts/getFromS3.php

Indentation +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     filesize($options['to']))
 {
     $out = [ "status" => "SUCCESS",
-             "msg" => "[".__FILE__."] Using local copy: '" . $options['to']  . "'" ];
+                "msg" => "[".__FILE__."] Using local copy: '" . $options['to']  . "'" ];
     print json_encode($out)."\n";
     exit(0);
 }
@@ -60,6 +60,6 @@ 
 ));
 
 $out = [ "status" => "SUCCESS",
-         "msg" => "[".__FILE__."] Download '" . $options['bucket'] . "/" . $options['file'] . "' successful !" ];
+            "msg" => "[".__FILE__."] Download '" . $options['bucket'] . "/" . $options['file'] . "' successful !" ];
 
 print json_encode($out)."\n";

Spacing +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@ 
  * Script used to get a file in AWS S3
  **/
 
-require __DIR__ . "/../../vendor/autoload.php";
+require __DIR__."/../../vendor/autoload.php";
 
 function usage()
 {
-    echo("Usage: php ". basename(__FILE__) . " [-h] [--force] --bucket <s3 bucket> --file <filename> --to <filepath>\n");
+    echo("Usage: php ".basename(__FILE__)." [-h] [--force] --bucket <s3 bucket> --file <filename> --to <filepath>\n");
     echo("--help, -h: Print this help\n");
     echo("--bucket <s3 bucket>: Name of the S3 bucket\n");
     echo("--file <filename>: Name of the file in the S3 bucket\n");
@@ -36,8 +36,8 @@ 
     file_exists($options['to']) &&
     filesize($options['to']))
 {
-    $out = [ "status" => "SUCCESS",
-             "msg" => "[".__FILE__."] Using local copy: '" . $options['to']  . "'" ];
+    $out = ["status" => "SUCCESS",
+             "msg" => "[".__FILE__."] Using local copy: '".$options['to']."'"];
     print json_encode($out)."\n";
     exit(0);
 }
@@ -59,7 +59,7 @@ 
     'SaveAs' => $options['to']
 ));
 
-$out = [ "status" => "SUCCESS",
-         "msg" => "[".__FILE__."] Download '" . $options['bucket'] . "/" . $options['file'] . "' successful !" ];
+$out = ["status" => "SUCCESS",
+         "msg" => "[".__FILE__."] Download '".$options['bucket']."/".$options['file']."' successful !"];
 
 print json_encode($out)."\n";

Braces +9 added lines, -6 removed lines

@@ -20,13 +20,15 @@ 
 function check_input_parameters($options)
 {
     if (!count($options) || isset($options['h']) ||
-        isset($options['help']))
-        usage();
+        isset($options['help'])) {
+            usage();
+    }
 
     if (!isset($options['bucket']) || !isset($options['file']) ||
-        !isset($options['to']))
-        throw new \SA\CpeSdk\CpeException("Missing mandatory parameter!");
-}
+        !isset($options['to'])) {
+            throw new \SA\CpeSdk\CpeException("Missing mandatory parameter!");
+    }
+    }
 
 $options = getopt("h", array("bucket:", "file:", "to:", "force::", "help::"));
 check_input_parameters($options);
@@ -43,8 +45,9 @@ 
 }
 
 # Check if preper env vars are setup
-if (!($region = getenv("AWS_DEFAULT_REGION")))
+if (!($region = getenv("AWS_DEFAULT_REGION"))) {
     throw new \SA\CpeSdk\CpeException("Set 'AWS_DEFAULT_REGION' environment variable!");
+}
 
 // Get S3 client
 $s3 = new \Aws\S3\S3Client([