Merge with 3.5

bin/console

@@ -27,6 +27,8 @@ $Core = require_once dirname(__FILE__) . '/../lib/bootstrap.php';
 
 $result_code = 1;
 
+$result_code = 1;
+
 try
 {
   \bootstrap::register_autoloads();
@@ -81,11 +83,11 @@ try
   $app->add(new module_console_fieldsMerge('fields:merge'));
 
 
-  $result_code = $app->run();
+  $result_code = $app->run() === 0 ? : 1;
 }
 catch (Exception $e)
 {
-  echo "an error occured";var_dump($e->getMessage());
+  echo sprintf("an error occured : %s", $e->getMessage());
 }
 
 exit($result_code);

lib/classes/binaryAdapter/video/toimage/ffmpeg.class.php

@@ -87,9 +87,13 @@ class binaryAdapter_video_toimage_ffmpeg extends binaryAdapter_video_processorAb
     if ($this->debug)
       $this->log("Commande executee : $cmd \n");
 
-    if (!file_exists($tmpFile))
+    if ( ! file_exists($tmpFile))
+    {
       throw new Exception('Unable to extract image');
+    }
 
+    if (file_exists($this->registry->get('GV_RootPath') . 'www/skins/icons/play.png'))
+    {
       $cmd = $this->registry->get('GV_pathcomposite')
         . ' -gravity SouthEast -quiet -compose over "'
         . $this->registry->get('GV_RootPath') . 'www/skins/icons/play.png"'
@@ -98,6 +102,12 @@ class binaryAdapter_video_toimage_ffmpeg extends binaryAdapter_video_processorAb
 
       $this->shell_cmd($cmd);
       unlink($tmpFile);
+    }
+    else
+    {
+      rename($tmpFile, $dest);
+    }
+
     rmdir($tmpDir);
 
     return $this;

lib/classes/module/console/schedulerState.class.php

@@ -70,7 +70,7 @@ class module_console_schedulerState extends Command
       return 1;
     }
 
-    return;
+    return 0;
   }
 
 }

lib/classes/module/console/schedulerStop.class.php

@@ -58,7 +58,7 @@ class module_console_schedulerStop extends Command
       return 1;
     }
 
-    return;
+    return 0;
   }
 
 }

lib/classes/module/console/systemUpgrade.class.php

@@ -111,7 +111,7 @@ class module_console_systemUpgrade extends Command
     }
     $output->write('Finished !', true);
 
-    return;
+    return 0;
   }
 
 }