Merge branch 'develop' into patch-4

htdocs/debugbar/class/DataCollector/DolConfigCollector.php

@@ -11,6 +11,7 @@ class DolConfigCollector extends ConfigCollector
 	/**
 	 *	Return widget settings
 	 *
+	 *  @return array      Array
 	 */
 	public function getWidgets()
 	{
@@ -29,6 +30,7 @@ class DolConfigCollector extends ConfigCollector
 	/**
 	 *	Return collected data
 	 *
+	 *  @return    array   Array
 	 */
 	public function collect()
 	{
@@ -40,6 +42,7 @@ class DolConfigCollector extends ConfigCollector
 	/**
 	 * Returns an array with config data
 	 *
+	 * @return array       Array of config
 	 */
 	protected function getConfig()
 	{
@@ -67,6 +70,7 @@ class DolConfigCollector extends ConfigCollector
 	/**
 	 * Convert an object to array
 	 *
+	 * @return array   Array
 	 */
 	protected function object_to_array($obj)
 	{

htdocs/debugbar/class/DataCollector/DolLogsCollector.php

@@ -38,6 +38,7 @@ class DolLogsCollector extends MessagesCollector
 	/**
 	 *	Return widget settings
 	 *
+	 *  @return array  Array
 	 */
 	public function getWidgets()
 	{
@@ -63,6 +64,7 @@ class DolLogsCollector extends MessagesCollector
 	/**
 	 *	Return collected data
 	 *
+	 *  @return array  Array
 	 */
 	public function collect()
 	{

htdocs/debugbar/class/DataCollector/DolMemoryCollector.php

@@ -11,6 +11,7 @@ class DolMemoryCollector extends MemoryCollector
 	/**
 	 *	Return widget settings
 	 *
+	 *  @return void
 	 */
 	public function getWidgets()
 	{

htdocs/debugbar/class/DataCollector/DolMessagesCollector.php

@@ -11,6 +11,7 @@ class DolMessagesCollector extends MessagesCollector
 	/**
 	 *	Return widget settings
 	 *
+	 *  @return array  Array
 	 */
 	public function getWidgets()
 	{

htdocs/debugbar/class/DataCollector/DolQueryCollector.php

@@ -20,7 +20,6 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 
 	/**
 	 * Constructor
-	 *
 	 */
 	public function __construct()
 	{
@@ -73,6 +72,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 	/**
 	 *	Return collector name
 	 *
+	 *  @param string  Name
 	 */
 	public function getName()
 	{
@@ -82,6 +82,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 	/**
 	 *	Return widget settings
 	 *
+	 *  @param array      Array
 	 */
 	public function getWidgets()
 	{
@@ -106,6 +107,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 	/**
 	 *	Return assets
 	 *
+	 *  @param array   Array
 	 */
 	public function getAssets()
 	{

htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php

@@ -11,6 +11,7 @@ class DolRequestDataCollector extends RequestDataCollector
 	/**
 	 *	Return widget settings
 	 *
+	 *  @return void
 	 */
 	public function getWidgets()
 	{
@@ -25,4 +26,4 @@ class DolRequestDataCollector extends RequestDataCollector
 			)
 		);
 	}
-}
+}

htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php

@@ -11,6 +11,7 @@ class DolTimeDataCollector extends TimeDataCollector
 	/**
 	 *	Return widget settings
 	 *
+	 *  @return array  Array
 	 */
 	public function getWidgets()
 	{

htdocs/debugbar/class/DataCollector/DolibarrCollector.php

@@ -32,6 +32,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 	/**
 	 *	Return database info as an HTML string
 	 *
+	 *  @return string         HTML string
 	 */
 	protected function getDatabaseInfo()
 	{

htdocs/debugbar/class/autoloader.php

@@ -15,4 +15,4 @@ spl_autoload_register(function ($class) {
     	return false;
     }
     return true;
-});
+});

htdocs/product/card.php

@@ -1039,7 +1039,7 @@ else
             // Nature
             print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
             $statutarray=array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-            print $form->selectarray('finished', $statutarray, GETPOST('finished','alpha'), 1);
+            print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
             print '</td></tr>';
 
             // Weight
@@ -1424,7 +1424,7 @@ else
                 // Nature
                 print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';
                 $statutarray=array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-                print $form->selectarray('finished' ,$statutarray, $object->finished);
+                print $form->selectarray('finished', $statutarray, $object->finished);
                 print '</td></tr>';
               
                 // Weight