Dolibarr / dolibarr

htdocs/user/param_ihm.php

Spacing +3 added lines, -3 removed lines

@@ -384,7 +384,7 @@ 
 	print '<td>';
 	$s = picto_from_langcode(getDolGlobalString('MAIN_LANG_DEFAULT'));
 	print $s ? $s.' ' : '';
-	print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT')));
+	print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_".getDolGlobalString('MAIN_LANG_DEFAULT')));
 	print '</td>';
 	print '<td class="nowrap" width="20%"><input class="oddeven" name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(!empty($object->conf->MAIN_LANG_DEFAULT) ? " checked" : "");
 	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
@@ -437,7 +437,7 @@ 
 
 	// Max size of short lists
 	print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeShortList").'</td>';
-	print '<td>' . getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').'</td>';
+	print '<td>'.getDolGlobalString('MAIN_SIZE_SHORTLIST_LIMIT').'</td>';
 	print '<td class="nowrap" width="20%"><input class="oddeven" name="check_MAIN_SIZE_SHORTLIST_LIMIT" id="check_MAIN_SIZE_SHORTLIST_LIMIT" type="checkbox" '.(!empty($object->conf->MAIN_SIZE_SHORTLIST_LIMIT) ? " checked" : "");
 	print empty($dolibarr_main_demo) ? '' : ' disabled="disabled"'; // Disabled for demo
 	print '> <label for="check_MAIN_SIZE_SHORTLIST_LIMIT">'.$langs->trans("UsePersonalValue").'</label></td>';
@@ -506,7 +506,7 @@ 
 	print '<td>';
 	$s = picto_from_langcode(getDolGlobalString('MAIN_LANG_DEFAULT'));
 	print($s ? $s.' ' : '');
-	print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_" . getDolGlobalString('MAIN_LANG_DEFAULT')));
+	print(getDolGlobalString('MAIN_LANG_DEFAULT') == 'auto' ? $form->textwithpicto($langs->trans("Automatic"), $langs->trans("AutoDetectLang")) : $langs->trans("Language_".getDolGlobalString('MAIN_LANG_DEFAULT')));
 	print '</td>';
 	print '<td class="nowrap"><input class="oddeven" type="checkbox" disabled '.(!empty($object->conf->MAIN_LANG_DEFAULT) ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
 	print '<td>';

htdocs/core/modules/DolibarrModules.class.php

Spacing +37 added lines, -37 removed lines

@@ -143,7 +143,7 @@ 
 
 	const KEY_ID = 0;
 	const KEY_LABEL = 1;
-	const KEY_TYPE = 2;	// deprecated
+	const KEY_TYPE = 2; // deprecated
 	const KEY_DEFAULT = 3;
 	const KEY_FIRST_LEVEL = 4;
 	const KEY_SECOND_LEVEL = 5;
@@ -723,7 +723,7 @@ 
 				$moduleNameInConf = 'supplier_proposal';
 			}
 
-			unset($conf->modules[$moduleNameInConf]);	// Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
+			unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
 
 			return 1;
 		} else {
@@ -819,7 +819,7 @@ 
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile) {     // Mostly for external modules
-			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024);	// Max size loaded 1Mb
+			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
 
 			if ((float) DOL_VERSION >= 6.0) {  // @phpstan-ignore-line
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -1583,7 +1583,7 @@ 
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1606,9 +1606,9 @@ 
 	public function insert_cronjobs()
 	{
 		// phpcs:enable
-		include_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
-		include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
-		include_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 		global $conf, $user;
 
@@ -1619,7 +1619,7 @@ 
 		$err = 0;
 
 		if (is_array($this->cronjobs)) {
-			dol_syslog(get_class($this) . "::insert_cronjobs", LOG_DEBUG);
+			dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
 
 			foreach ($this->cronjobs as $key => $value) {
 				$now = dol_now();
@@ -1646,7 +1646,7 @@ 
 				$test = isset($value['test']) ? $value['test'] : ''; // Line must be enabled or not (so visible or not)
 
 				// Search if cron entry already present
-				$sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "cronjob";
+				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
 				//$sql .= " WHERE module_name = '" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "'";
 				$sql .= " WHERE label = '".$this->db->escape($label)."'";
 				/* unique key is on label,entity so no need for this test
@@ -1666,7 +1666,7 @@ 
 					$sql .= " AND params = '" . $this->db->escape($params) . "'";
 				}
 				*/
-				$sql .= " AND entity = " . ((int) $entity); // Must be exact entity
+				$sql .= " AND entity = ".((int) $entity); // Must be exact entity
 
 				$result = $this->db->query($sql);
 				if (!$result) {
@@ -1992,9 +1992,9 @@ 
 
 				// If the module is active
 				foreach ($this->rights as $key => $value) {
-					$r_id = $this->rights[$key][self::KEY_ID];	// permission id in llx_rights_def (not unique because primary key is couple id-entity)
+					$r_id = $this->rights[$key][self::KEY_ID]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
 					$r_label = $this->rights[$key][self::KEY_LABEL];
-					$r_type	= $this->rights[$key][self::KEY_TYPE] ?? 'w';	// TODO deprecated
+					$r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w'; // TODO deprecated
 					$r_default = $this->rights[$key][self::KEY_DEFAULT] ?? 0;
 					$r_perms = $this->rights[$key][self::KEY_FIRST_LEVEL] ?? '';
 					$r_subperms = $this->rights[$key][self::KEY_SECOND_LEVEL] ?? '';
@@ -2018,7 +2018,7 @@ 
 					}
 
 					// condition to show or hide a user right (default: 1) (eg isModEnabled('anothermodule') or ($conf->global->MAIN_FEATURES_LEVEL > 0) or etc..)
-					$r_enabled	= $this->rights[$key][self::KEY_ENABLED] ?? '1';
+					$r_enabled = $this->rights[$key][self::KEY_ENABLED] ?? '1';
 
 					// Search if perm already present
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
@@ -2035,7 +2035,7 @@ 
 							$sql .= ", libelle";
 							$sql .= ", module";
 							$sql .= ", module_origin";
-							$sql .= ", type";	// TODO deprecated
+							$sql .= ", type"; // TODO deprecated
 							$sql .= ", bydefault";
 							$sql .= ", perms";
 							$sql .= ", subperms";
@@ -2046,7 +2046,7 @@ 
 							$sql .= ", '".$this->db->escape($r_label)."'";
 							$sql .= ", '".$this->db->escape($r_module)."'";
 							$sql .= ", '".$this->db->escape($r_module_origin)."'";
-							$sql .= ", '".$this->db->escape($r_type)."'";	// TODO deprecated
+							$sql .= ", '".$this->db->escape($r_type)."'"; // TODO deprecated
 							$sql .= ", ".((int) $r_default);
 							$sql .= ", '".$this->db->escape($r_perms)."'";
 							$sql .= ", '".$this->db->escape($r_subperms)."'";
@@ -2268,7 +2268,7 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
 		$sql .= " WHERE module = '".$this->db->escape($module)."'";
-		$sql .= " AND menu_handler = 'all'";	// We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
+		$sql .= " AND menu_handler = 'all'"; // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
 		$sql .= " AND entity IN (0, ".$conf->entity.")";
 
 		dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
@@ -2652,36 +2652,36 @@ 
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
+			$versionTitle = $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
 				$versionTitle .= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
-			$return .=  '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
-			$return .=  $this->getVersion(1);
-			$return .=  '</span>';
+			$return .= '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
+			$return .= $this->getVersion(1);
+			$return .= '</span>';
 		}
 
-		$return .=  '</div>
+		$return .= '</div>
 	    <div class="info-box-content info-box-text-module'.(!getDolGlobalString($const_name) ? '' : ' info-box-module-enabled'.($versiontrans ? ' info-box-content-warning' : '')).'">
 	    <span class="info-box-title">'.$this->getName().'</span>
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
-		$return .=  '<div class="valignmiddle inline-block info-box-more">';
+		$return .= '<div class="valignmiddle inline-block info-box-more">';
 		//if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
-		$return .=  '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-		$return .=  '</div><br>';
-
-		$return .=  '<div class="valignmiddle inline-block info-box-actions">';
-		$return .=  '<div class="valignmiddle inline-block info-box-setup">';
-		$return .=  $codetoconfig;
-		$return .=  '</div>';
-		$return .=  '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
-		$return .=  $codeenabledisable;
-		$return .=  '</div>';
-		$return .=  '</div>';
-
-		$return .=  '
+		$return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+		$return .= '</div><br>';
+
+		$return .= '<div class="valignmiddle inline-block info-box-actions">';
+		$return .= '<div class="valignmiddle inline-block info-box-setup">';
+		$return .= $codetoconfig;
+		$return .= '</div>';
+		$return .= '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
+		$return .= $codeenabledisable;
+		$return .= '</div>';
+		$return .= '</div>';
+
+		$return .= '
 	    </div><!-- /.info-box-content -->
 	    </div><!-- /.info-box -->
 	    </div>';
@@ -2701,7 +2701,7 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
-			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
 				// Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
 				$this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);
@@ -2738,7 +2738,7 @@ 
 		if (empty($conf->cache['noncompliantmodules'])) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-			$result = getURLContent(self::URL_FOR_BLACKLISTED_MODULES, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$result = getURLContent(self::URL_FOR_BLACKLISTED_MODULES, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($result['content']) && $result['http_code'] == 200) {
 				$langs->load("errors");
 

htdocs/includes/webklex/php-imap/vendor/illuminate/collections/Traits/EnumeratesValues.php

Indentation +1065 added lines, -1065 removed lines

@@ -48,1069 +48,1069 @@
  */
 trait EnumeratesValues
 {
-    /**
-     * Indicates that the object's string representation should be escaped when __toString is invoked.
-     *
-     * @var bool
-     */
-    protected $escapeWhenCastingToString = false;
-
-    /**
-     * The methods that can be proxied.
-     *
-     * @var string[]
-     */
-    protected static $proxies = [
-        'average',
-        'avg',
-        'contains',
-        'doesntContain',
-        'each',
-        'every',
-        'filter',
-        'first',
-        'flatMap',
-        'groupBy',
-        'keyBy',
-        'map',
-        'max',
-        'min',
-        'partition',
-        'reject',
-        'skipUntil',
-        'skipWhile',
-        'some',
-        'sortBy',
-        'sortByDesc',
-        'sum',
-        'takeUntil',
-        'takeWhile',
-        'unique',
-        'until',
-    ];
-
-    /**
-     * Create a new collection instance if the value isn't one already.
-     *
-     * @param  mixed  $items
-     * @return static
-     */
-    public static function make($items = [])
-    {
-        return new static($items);
-    }
-
-    /**
-     * Wrap the given value in a collection if applicable.
-     *
-     * @param  mixed  $value
-     * @return static
-     */
-    public static function wrap($value)
-    {
-        return $value instanceof Enumerable
-            ? new static($value)
-            : new static(Arr::wrap($value));
-    }
-
-    /**
-     * Get the underlying items from the given collection if applicable.
-     *
-     * @param  array|static  $value
-     * @return array
-     */
-    public static function unwrap($value)
-    {
-        return $value instanceof Enumerable ? $value->all() : $value;
-    }
-
-    /**
-     * Create a new instance with no items.
-     *
-     * @return static
-     */
-    public static function empty()
-    {
-        return new static([]);
-    }
-
-    /**
-     * Create a new collection by invoking the callback a given amount of times.
-     *
-     * @param  int  $number
-     * @param  callable|null  $callback
-     * @return static
-     */
-    public static function times($number, callable $callback = null)
-    {
-        if ($number < 1) {
-            return new static;
-        }
-
-        return static::range(1, $number)
-            ->when($callback)
-            ->map($callback);
-    }
-
-    /**
-     * Alias for the "avg" method.
-     *
-     * @param  callable|string|null  $callback
-     * @return mixed
-     */
-    public function average($callback = null)
-    {
-        return $this->avg($callback);
-    }
-
-    /**
-     * Alias for the "contains" method.
-     *
-     * @param  mixed  $key
-     * @param  mixed  $operator
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function some($key, $operator = null, $value = null)
-    {
-        return $this->contains(...func_get_args());
-    }
-
-    /**
-     * Determine if an item exists, using strict comparison.
-     *
-     * @param  mixed  $key
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function containsStrict($key, $value = null)
-    {
-        if (func_num_args() === 2) {
-            return $this->contains(function ($item) use ($key, $value) {
-                return data_get($item, $key) === $value;
-            });
-        }
-
-        if ($this->useAsCallable($key)) {
-            return ! is_null($this->first($key));
-        }
-
-        foreach ($this as $item) {
-            if ($item === $key) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Dump the items and end the script.
-     *
-     * @param  mixed  ...$args
-     * @return void
-     */
-    public function dd(...$args)
-    {
-        $this->dump(...$args);
-
-        exit(1);
-    }
-
-    /**
-     * Dump the items.
-     *
-     * @return $this
-     */
-    public function dump()
-    {
-        (new Collection(func_get_args()))
-            ->push($this->all())
-            ->each(function ($item) {
-                VarDumper::dump($item);
-            });
-
-        return $this;
-    }
-
-    /**
-     * Execute a callback over each item.
-     *
-     * @param  callable  $callback
-     * @return $this
-     */
-    public function each(callable $callback)
-    {
-        foreach ($this as $key => $item) {
-            if ($callback($item, $key) === false) {
-                break;
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Execute a callback over each nested chunk of items.
-     *
-     * @param  callable  $callback
-     * @return static
-     */
-    public function eachSpread(callable $callback)
-    {
-        return $this->each(function ($chunk, $key) use ($callback) {
-            $chunk[] = $key;
-
-            return $callback(...$chunk);
-        });
-    }
-
-    /**
-     * Determine if all items pass the given truth test.
-     *
-     * @param  string|callable  $key
-     * @param  mixed  $operator
-     * @param  mixed  $value
-     * @return bool
-     */
-    public function every($key, $operator = null, $value = null)
-    {
-        if (func_num_args() === 1) {
-            $callback = $this->valueRetriever($key);
-
-            foreach ($this as $k => $v) {
-                if (! $callback($v, $k)) {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        return $this->every($this->operatorForWhere(...func_get_args()));
-    }
-
-    /**
-     * Get the first item by the given key value pair.
-     *
-     * @param  string  $key
-     * @param  mixed  $operator
-     * @param  mixed  $value
-     * @return mixed
-     */
-    public function firstWhere($key, $operator = null, $value = null)
-    {
-        return $this->first($this->operatorForWhere(...func_get_args()));
-    }
-
-    /**
-     * Determine if the collection is not empty.
-     *
-     * @return bool
-     */
-    public function isNotEmpty()
-    {
-        return ! $this->isEmpty();
-    }
-
-    /**
-     * Run a map over each nested chunk of items.
-     *
-     * @param  callable  $callback
-     * @return static
-     */
-    public function mapSpread(callable $callback)
-    {
-        return $this->map(function ($chunk, $key) use ($callback) {
-            $chunk[] = $key;
-
-            return $callback(...$chunk);
-        });
-    }
-
-    /**
-     * Run a grouping map over the items.
-     *
-     * The callback should return an associative array with a single key/value pair.
-     *
-     * @param  callable  $callback
-     * @return static
-     */
-    public function mapToGroups(callable $callback)
-    {
-        $groups = $this->mapToDictionary($callback);
-
-        return $groups->map([$this, 'make']);
-    }
-
-    /**
-     * Map a collection and flatten the result by a single level.
-     *
-     * @param  callable  $callback
-     * @return static
-     */
-    public function flatMap(callable $callback)
-    {
-        return $this->map($callback)->collapse();
-    }
-
-    /**
-     * Map the values into a new class.
-     *
-     * @param  string  $class
-     * @return static
-     */
-    public function mapInto($class)
-    {
-        return $this->map(function ($value, $key) use ($class) {
-            return new $class($value, $key);
-        });
-    }
-
-    /**
-     * Get the min value of a given key.
-     *
-     * @param  callable|string|null  $callback
-     * @return mixed
-     */
-    public function min($callback = null)
-    {
-        $callback = $this->valueRetriever($callback);
-
-        return $this->map(function ($value) use ($callback) {
-            return $callback($value);
-        })->filter(function ($value) {
-            return ! is_null($value);
-        })->reduce(function ($result, $value) {
-            return is_null($result) || $value < $result ? $value : $result;
-        });
-    }
-
-    /**
-     * Get the max value of a given key.
-     *
-     * @param  callable|string|null  $callback
-     * @return mixed
-     */
-    public function max($callback = null)
-    {
-        $callback = $this->valueRetriever($callback);
-
-        return $this->filter(function ($value) {
-            return ! is_null($value);
-        })->reduce(function ($result, $item) use ($callback) {
-            $value = $callback($item);
-
-            return is_null($result) || $value > $result ? $value : $result;
-        });
-    }
-
-    /**
-     * "Paginate" the collection by slicing it into a smaller collection.
-     *
-     * @param  int  $page
-     * @param  int  $perPage
-     * @return static
-     */
-    public function forPage($page, $perPage)
-    {
-        $offset = max(0, ($page - 1) * $perPage);
-
-        return $this->slice($offset, $perPage);
-    }
-
-    /**
-     * Partition the collection into two arrays using the given callback or key.
-     *
-     * @param  callable|string  $key
-     * @param  mixed  $operator
-     * @param  mixed  $value
-     * @return static
-     */
-    public function partition($key, $operator = null, $value = null)
-    {
-        $passed = [];
-        $failed = [];
-
-        $callback = func_num_args() === 1
-                ? $this->valueRetriever($key)
-                : $this->operatorForWhere(...func_get_args());
-
-        foreach ($this as $key => $item) {
-            if ($callback($item, $key)) {
-                $passed[$key] = $item;
-            } else {
-                $failed[$key] = $item;
-            }
-        }
-
-        return new static([new static($passed), new static($failed)]);
-    }
-
-    /**
-     * Get the sum of the given values.
-     *
-     * @param  callable|string|null  $callback
-     * @return mixed
-     */
-    public function sum($callback = null)
-    {
-        $callback = is_null($callback)
-            ? $this->identity()
-            : $this->valueRetriever($callback);
-
-        return $this->reduce(function ($result, $item) use ($callback) {
-            return $result + $callback($item);
-        }, 0);
-    }
-
-    /**
-     * Apply the callback if the value is truthy.
-     *
-     * @param  bool|mixed  $value
-     * @param  callable|null  $callback
-     * @param  callable|null  $default
-     * @return static|mixed
-     */
-    public function when($value, callable $callback = null, callable $default = null)
-    {
-        if (! $callback) {
-            return new HigherOrderWhenProxy($this, $value);
-        }
-
-        if ($value) {
-            return $callback($this, $value);
-        } elseif ($default) {
-            return $default($this, $value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Apply the callback if the collection is empty.
-     *
-     * @param  callable  $callback
-     * @param  callable|null  $default
-     * @return static|mixed
-     */
-    public function whenEmpty(callable $callback, callable $default = null)
-    {
-        return $this->when($this->isEmpty(), $callback, $default);
-    }
-
-    /**
-     * Apply the callback if the collection is not empty.
-     *
-     * @param  callable  $callback
-     * @param  callable|null  $default
-     * @return static|mixed
-     */
-    public function whenNotEmpty(callable $callback, callable $default = null)
-    {
-        return $this->when($this->isNotEmpty(), $callback, $default);
-    }
-
-    /**
-     * Apply the callback if the value is falsy.
-     *
-     * @param  bool  $value
-     * @param  callable  $callback
-     * @param  callable|null  $default
-     * @return static|mixed
-     */
-    public function unless($value, callable $callback, callable $default = null)
-    {
-        return $this->when(! $value, $callback, $default);
-    }
-
-    /**
-     * Apply the callback unless the collection is empty.
-     *
-     * @param  callable  $callback
-     * @param  callable|null  $default
-     * @return static|mixed
-     */
-    public function unlessEmpty(callable $callback, callable $default = null)
-    {
-        return $this->whenNotEmpty($callback, $default);
-    }
-
-    /**
-     * Apply the callback unless the collection is not empty.
-     *
-     * @param  callable  $callback
-     * @param  callable|null  $default
-     * @return static|mixed
-     */
-    public function unlessNotEmpty(callable $callback, callable $default = null)
-    {
-        return $this->whenEmpty($callback, $default);
-    }
-
-    /**
-     * Filter items by the given key value pair.
-     *
-     * @param  string  $key
-     * @param  mixed  $operator
-     * @param  mixed  $value
-     * @return static
-     */
-    public function where($key, $operator = null, $value = null)
-    {
-        return $this->filter($this->operatorForWhere(...func_get_args()));
-    }
-
-    /**
-     * Filter items where the value for the given key is null.
-     *
-     * @param  string|null  $key
-     * @return static
-     */
-    public function whereNull($key = null)
-    {
-        return $this->whereStrict($key, null);
-    }
-
-    /**
-     * Filter items where the value for the given key is not null.
-     *
-     * @param  string|null  $key
-     * @return static
-     */
-    public function whereNotNull($key = null)
-    {
-        return $this->where($key, '!==', null);
-    }
-
-    /**
-     * Filter items by the given key value pair using strict comparison.
-     *
-     * @param  string  $key
-     * @param  mixed  $value
-     * @return static
-     */
-    public function whereStrict($key, $value)
-    {
-        return $this->where($key, '===', $value);
-    }
-
-    /**
-     * Filter items by the given key value pair.
-     *
-     * @param  string  $key
-     * @param  mixed  $values
-     * @param  bool  $strict
-     * @return static
-     */
-    public function whereIn($key, $values, $strict = false)
-    {
-        $values = $this->getArrayableItems($values);
-
-        return $this->filter(function ($item) use ($key, $values, $strict) {
-            return in_array(data_get($item, $key), $values, $strict);
-        });
-    }
-
-    /**
-     * Filter items by the given key value pair using strict comparison.
-     *
-     * @param  string  $key
-     * @param  mixed  $values
-     * @return static
-     */
-    public function whereInStrict($key, $values)
-    {
-        return $this->whereIn($key, $values, true);
-    }
-
-    /**
-     * Filter items such that the value of the given key is between the given values.
-     *
-     * @param  string  $key
-     * @param  array  $values
-     * @return static
-     */
-    public function whereBetween($key, $values)
-    {
-        return $this->where($key, '>=', reset($values))->where($key, '<=', end($values));
-    }
-
-    /**
-     * Filter items such that the value of the given key is not between the given values.
-     *
-     * @param  string  $key
-     * @param  array  $values
-     * @return static
-     */
-    public function whereNotBetween($key, $values)
-    {
-        return $this->filter(function ($item) use ($key, $values) {
-            return data_get($item, $key) < reset($values) || data_get($item, $key) > end($values);
-        });
-    }
-
-    /**
-     * Filter items by the given key value pair.
-     *
-     * @param  string  $key
-     * @param  mixed  $values
-     * @param  bool  $strict
-     * @return static
-     */
-    public function whereNotIn($key, $values, $strict = false)
-    {
-        $values = $this->getArrayableItems($values);
-
-        return $this->reject(function ($item) use ($key, $values, $strict) {
-            return in_array(data_get($item, $key), $values, $strict);
-        });
-    }
-
-    /**
-     * Filter items by the given key value pair using strict comparison.
-     *
-     * @param  string  $key
-     * @param  mixed  $values
-     * @return static
-     */
-    public function whereNotInStrict($key, $values)
-    {
-        return $this->whereNotIn($key, $values, true);
-    }
-
-    /**
-     * Filter the items, removing any items that don't match the given type(s).
-     *
-     * @param  string|string[]  $type
-     * @return static
-     */
-    public function whereInstanceOf($type)
-    {
-        return $this->filter(function ($value) use ($type) {
-            if (is_array($type)) {
-                foreach ($type as $classType) {
-                    if ($value instanceof $classType) {
-                        return true;
-                    }
-                }
-
-                return false;
-            }
-
-            return $value instanceof $type;
-        });
-    }
-
-    /**
-     * Pass the collection to the given callback and return the result.
-     *
-     * @param  callable  $callback
-     * @return mixed
-     */
-    public function pipe(callable $callback)
-    {
-        return $callback($this);
-    }
-
-    /**
-     * Pass the collection into a new class.
-     *
-     * @param  string  $class
-     * @return mixed
-     */
-    public function pipeInto($class)
-    {
-        return new $class($this);
-    }
-
-    /**
-     * Pass the collection through a series of callable pipes and return the result.
-     *
-     * @param  array<callable>  $pipes
-     * @return mixed
-     */
-    public function pipeThrough($pipes)
-    {
-        return static::make($pipes)->reduce(
-            function ($carry, $pipe) {
-                return $pipe($carry);
-            },
-            $this
-        );
-    }
-
-    /**
-     * Pass the collection to the given callback and then return it.
-     *
-     * @param  callable  $callback
-     * @return $this
-     */
-    public function tap(callable $callback)
-    {
-        $callback(clone $this);
-
-        return $this;
-    }
-
-    /**
-     * Reduce the collection to a single value.
-     *
-     * @param  callable  $callback
-     * @param  mixed  $initial
-     * @return mixed
-     */
-    public function reduce(callable $callback, $initial = null)
-    {
-        $result = $initial;
-
-        foreach ($this as $key => $value) {
-            $result = $callback($result, $value, $key);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Reduce the collection to multiple aggregate values.
-     *
-     * @param  callable  $callback
-     * @param  mixed  ...$initial
-     * @return array
-     *
-     * @deprecated Use "reduceSpread" instead
-     *
-     * @throws \UnexpectedValueException
-     */
-    public function reduceMany(callable $callback, ...$initial)
-    {
-        return $this->reduceSpread($callback, ...$initial);
-    }
-
-    /**
-     * Reduce the collection to multiple aggregate values.
-     *
-     * @param  callable  $callback
-     * @param  mixed  ...$initial
-     * @return array
-     *
-     * @throws \UnexpectedValueException
-     */
-    public function reduceSpread(callable $callback, ...$initial)
-    {
-        $result = $initial;
-
-        foreach ($this as $key => $value) {
-            $result = call_user_func_array($callback, array_merge($result, [$value, $key]));
-
-            if (! is_array($result)) {
-                throw new UnexpectedValueException(sprintf(
-                    "%s::reduceMany expects reducer to return an array, but got a '%s' instead.",
-                    class_basename(static::class), gettype($result)
-                ));
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Reduce an associative collection to a single value.
-     *
-     * @param  callable  $callback
-     * @param  mixed  $initial
-     * @return mixed
-     */
-    public function reduceWithKeys(callable $callback, $initial = null)
-    {
-        return $this->reduce($callback, $initial);
-    }
-
-    /**
-     * Create a collection of all elements that do not pass a given truth test.
-     *
-     * @param  callable|mixed  $callback
-     * @return static
-     */
-    public function reject($callback = true)
-    {
-        $useAsCallable = $this->useAsCallable($callback);
-
-        return $this->filter(function ($value, $key) use ($callback, $useAsCallable) {
-            return $useAsCallable
-                ? ! $callback($value, $key)
-                : $value != $callback;
-        });
-    }
-
-    /**
-     * Return only unique items from the collection array using strict comparison.
-     *
-     * @param  string|callable|null  $key
-     * @return static
-     */
-    public function uniqueStrict($key = null)
-    {
-        return $this->unique($key, true);
-    }
-
-    /**
-     * Collect the values into a collection.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function collect()
-    {
-        return new Collection($this->all());
-    }
-
-    /**
-     * Get the collection of items as a plain array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        return $this->map(function ($value) {
-            return $value instanceof Arrayable ? $value->toArray() : $value;
-        })->all();
-    }
-
-    /**
-     * Convert the object into something JSON serializable.
-     *
-     * @return array
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        return array_map(function ($value) {
-            if ($value instanceof JsonSerializable) {
-                return $value->jsonSerialize();
-            } elseif ($value instanceof Jsonable) {
-                return json_decode($value->toJson(), true);
-            } elseif ($value instanceof Arrayable) {
-                return $value->toArray();
-            }
-
-            return $value;
-        }, $this->all());
-    }
-
-    /**
-     * Get the collection of items as JSON.
-     *
-     * @param  int  $options
-     * @return string
-     */
-    public function toJson($options = 0)
-    {
-        return json_encode($this->jsonSerialize(), $options);
-    }
-
-    /**
-     * Get a CachingIterator instance.
-     *
-     * @param  int  $flags
-     * @return \CachingIterator
-     */
-    public function getCachingIterator($flags = CachingIterator::CALL_TOSTRING)
-    {
-        return new CachingIterator($this->getIterator(), $flags);
-    }
-
-    /**
-     * Convert the collection to its string representation.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->escapeWhenCastingToString
-                    ? e($this->toJson())
-                    : $this->toJson();
-    }
-
-    /**
-     * Indicate that the model's string representation should be escaped when __toString is invoked.
-     *
-     * @param  bool  $escape
-     * @return $this
-     */
-    public function escapeWhenCastingToString($escape = true)
-    {
-        $this->escapeWhenCastingToString = $escape;
-
-        return $this;
-    }
-
-    /**
-     * Add a method to the list of proxied methods.
-     *
-     * @param  string  $method
-     * @return void
-     */
-    public static function proxy($method)
-    {
-        static::$proxies[] = $method;
-    }
-
-    /**
-     * Dynamically access collection proxies.
-     *
-     * @param  string  $key
-     * @return mixed
-     *
-     * @throws \Exception
-     */
-    public function __get($key)
-    {
-        if (! in_array($key, static::$proxies)) {
-            throw new Exception("Property [{$key}] does not exist on this collection instance.");
-        }
-
-        return new HigherOrderCollectionProxy($this, $key);
-    }
-
-    /**
-     * Results array of items from Collection or Arrayable.
-     *
-     * @param  mixed  $items
-     * @return array
-     */
-    protected function getArrayableItems($items)
-    {
-        if (is_array($items)) {
-            return $items;
-        } elseif ($items instanceof Enumerable) {
-            return $items->all();
-        } elseif ($items instanceof Arrayable) {
-            return $items->toArray();
-        } elseif ($items instanceof Jsonable) {
-            return json_decode($items->toJson(), true);
-        } elseif ($items instanceof JsonSerializable) {
-            return (array) $items->jsonSerialize();
-        } elseif ($items instanceof Traversable) {
-            return iterator_to_array($items);
-        } elseif ($items instanceof UnitEnum) {
-            return [$items];
-        }
-
-        return (array) $items;
-    }
-
-    /**
-     * Get an operator checker callback.
-     *
-     * @param  string  $key
-     * @param  string|null  $operator
-     * @param  mixed  $value
-     * @return \Closure
-     */
-    protected function operatorForWhere($key, $operator = null, $value = null)
-    {
-        if (func_num_args() === 1) {
-            $value = true;
-
-            $operator = '=';
-        }
-
-        if (func_num_args() === 2) {
-            $value = $operator;
-
-            $operator = '=';
-        }
-
-        return function ($item) use ($key, $operator, $value) {
-            $retrieved = data_get($item, $key);
-
-            $strings = array_filter([$retrieved, $value], function ($value) {
-                return is_string($value) || (is_object($value) && method_exists($value, '__toString'));
-            });
-
-            if (count($strings) < 2 && count(array_filter([$retrieved, $value], 'is_object')) == 1) {
-                return in_array($operator, ['!=', '<>', '!==']);
-            }
-
-            switch ($operator) {
-                default:
-                case '=':
-                case '==':  return $retrieved == $value;
-                case '!=':
-                case '<>':  return $retrieved != $value;
-                case '<':   return $retrieved < $value;
-                case '>':   return $retrieved > $value;
-                case '<=':  return $retrieved <= $value;
-                case '>=':  return $retrieved >= $value;
-                case '===': return $retrieved === $value;
-                case '!==': return $retrieved !== $value;
-            }
-        };
-    }
-
-    /**
-     * Determine if the given value is callable, but not a string.
-     *
-     * @param  mixed  $value
-     * @return bool
-     */
-    protected function useAsCallable($value)
-    {
-        return ! is_string($value) && is_callable($value);
-    }
-
-    /**
-     * Get a value retrieving callback.
-     *
-     * @param  callable|string|null  $value
-     * @return callable
-     */
-    protected function valueRetriever($value)
-    {
-        if ($this->useAsCallable($value)) {
-            return $value;
-        }
-
-        return function ($item) use ($value) {
-            return data_get($item, $value);
-        };
-    }
-
-    /**
-     * Make a function to check an item's equality.
-     *
-     * @param  mixed  $value
-     * @return \Closure
-     */
-    protected function equality($value)
-    {
-        return function ($item) use ($value) {
-            return $item === $value;
-        };
-    }
-
-    /**
-     * Make a function using another function, by negating its result.
-     *
-     * @param  \Closure  $callback
-     * @return \Closure
-     */
-    protected function negate(Closure $callback)
-    {
-        return function (...$params) use ($callback) {
-            return ! $callback(...$params);
-        };
-    }
-
-    /**
-     * Make a function that returns what's passed to it.
-     *
-     * @return \Closure
-     */
-    protected function identity()
-    {
-        return function ($value) {
-            return $value;
-        };
-    }
+	/**
+	 * Indicates that the object's string representation should be escaped when __toString is invoked.
+	 *
+	 * @var bool
+	 */
+	protected $escapeWhenCastingToString = false;
+
+	/**
+	 * The methods that can be proxied.
+	 *
+	 * @var string[]
+	 */
+	protected static $proxies = [
+		'average',
+		'avg',
+		'contains',
+		'doesntContain',
+		'each',
+		'every',
+		'filter',
+		'first',
+		'flatMap',
+		'groupBy',
+		'keyBy',
+		'map',
+		'max',
+		'min',
+		'partition',
+		'reject',
+		'skipUntil',
+		'skipWhile',
+		'some',
+		'sortBy',
+		'sortByDesc',
+		'sum',
+		'takeUntil',
+		'takeWhile',
+		'unique',
+		'until',
+	];
+
+	/**
+	 * Create a new collection instance if the value isn't one already.
+	 *
+	 * @param  mixed  $items
+	 * @return static
+	 */
+	public static function make($items = [])
+	{
+		return new static($items);
+	}
+
+	/**
+	 * Wrap the given value in a collection if applicable.
+	 *
+	 * @param  mixed  $value
+	 * @return static
+	 */
+	public static function wrap($value)
+	{
+		return $value instanceof Enumerable
+			? new static($value)
+			: new static(Arr::wrap($value));
+	}
+
+	/**
+	 * Get the underlying items from the given collection if applicable.
+	 *
+	 * @param  array|static  $value
+	 * @return array
+	 */
+	public static function unwrap($value)
+	{
+		return $value instanceof Enumerable ? $value->all() : $value;
+	}
+
+	/**
+	 * Create a new instance with no items.
+	 *
+	 * @return static
+	 */
+	public static function empty()
+	{
+		return new static([]);
+	}
+
+	/**
+	 * Create a new collection by invoking the callback a given amount of times.
+	 *
+	 * @param  int  $number
+	 * @param  callable|null  $callback
+	 * @return static
+	 */
+	public static function times($number, callable $callback = null)
+	{
+		if ($number < 1) {
+			return new static;
+		}
+
+		return static::range(1, $number)
+			->when($callback)
+			->map($callback);
+	}
+
+	/**
+	 * Alias for the "avg" method.
+	 *
+	 * @param  callable|string|null  $callback
+	 * @return mixed
+	 */
+	public function average($callback = null)
+	{
+		return $this->avg($callback);
+	}
+
+	/**
+	 * Alias for the "contains" method.
+	 *
+	 * @param  mixed  $key
+	 * @param  mixed  $operator
+	 * @param  mixed  $value
+	 * @return bool
+	 */
+	public function some($key, $operator = null, $value = null)
+	{
+		return $this->contains(...func_get_args());
+	}
+
+	/**
+	 * Determine if an item exists, using strict comparison.
+	 *
+	 * @param  mixed  $key
+	 * @param  mixed  $value
+	 * @return bool
+	 */
+	public function containsStrict($key, $value = null)
+	{
+		if (func_num_args() === 2) {
+			return $this->contains(function ($item) use ($key, $value) {
+				return data_get($item, $key) === $value;
+			});
+		}
+
+		if ($this->useAsCallable($key)) {
+			return ! is_null($this->first($key));
+		}
+
+		foreach ($this as $item) {
+			if ($item === $key) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Dump the items and end the script.
+	 *
+	 * @param  mixed  ...$args
+	 * @return void
+	 */
+	public function dd(...$args)
+	{
+		$this->dump(...$args);
+
+		exit(1);
+	}
+
+	/**
+	 * Dump the items.
+	 *
+	 * @return $this
+	 */
+	public function dump()
+	{
+		(new Collection(func_get_args()))
+			->push($this->all())
+			->each(function ($item) {
+				VarDumper::dump($item);
+			});
+
+		return $this;
+	}
+
+	/**
+	 * Execute a callback over each item.
+	 *
+	 * @param  callable  $callback
+	 * @return $this
+	 */
+	public function each(callable $callback)
+	{
+		foreach ($this as $key => $item) {
+			if ($callback($item, $key) === false) {
+				break;
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Execute a callback over each nested chunk of items.
+	 *
+	 * @param  callable  $callback
+	 * @return static
+	 */
+	public function eachSpread(callable $callback)
+	{
+		return $this->each(function ($chunk, $key) use ($callback) {
+			$chunk[] = $key;
+
+			return $callback(...$chunk);
+		});
+	}
+
+	/**
+	 * Determine if all items pass the given truth test.
+	 *
+	 * @param  string|callable  $key
+	 * @param  mixed  $operator
+	 * @param  mixed  $value
+	 * @return bool
+	 */
+	public function every($key, $operator = null, $value = null)
+	{
+		if (func_num_args() === 1) {
+			$callback = $this->valueRetriever($key);
+
+			foreach ($this as $k => $v) {
+				if (! $callback($v, $k)) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		return $this->every($this->operatorForWhere(...func_get_args()));
+	}
+
+	/**
+	 * Get the first item by the given key value pair.
+	 *
+	 * @param  string  $key
+	 * @param  mixed  $operator
+	 * @param  mixed  $value
+	 * @return mixed
+	 */
+	public function firstWhere($key, $operator = null, $value = null)
+	{
+		return $this->first($this->operatorForWhere(...func_get_args()));
+	}
+
+	/**
+	 * Determine if the collection is not empty.
+	 *
+	 * @return bool
+	 */
+	public function isNotEmpty()
+	{
+		return ! $this->isEmpty();
+	}
+
+	/**
+	 * Run a map over each nested chunk of items.
+	 *
+	 * @param  callable  $callback
+	 * @return static
+	 */
+	public function mapSpread(callable $callback)
+	{
+		return $this->map(function ($chunk, $key) use ($callback) {
+			$chunk[] = $key;
+
+			return $callback(...$chunk);
+		});
+	}
+
+	/**
+	 * Run a grouping map over the items.
+	 *
+	 * The callback should return an associative array with a single key/value pair.
+	 *
+	 * @param  callable  $callback
+	 * @return static
+	 */
+	public function mapToGroups(callable $callback)
+	{
+		$groups = $this->mapToDictionary($callback);
+
+		return $groups->map([$this, 'make']);
+	}
+
+	/**
+	 * Map a collection and flatten the result by a single level.
+	 *
+	 * @param  callable  $callback
+	 * @return static
+	 */
+	public function flatMap(callable $callback)
+	{
+		return $this->map($callback)->collapse();
+	}
+
+	/**
+	 * Map the values into a new class.
+	 *
+	 * @param  string  $class
+	 * @return static
+	 */
+	public function mapInto($class)
+	{
+		return $this->map(function ($value, $key) use ($class) {
+			return new $class($value, $key);
+		});
+	}
+
+	/**
+	 * Get the min value of a given key.
+	 *
+	 * @param  callable|string|null  $callback
+	 * @return mixed
+	 */
+	public function min($callback = null)
+	{
+		$callback = $this->valueRetriever($callback);
+
+		return $this->map(function ($value) use ($callback) {
+			return $callback($value);
+		})->filter(function ($value) {
+			return ! is_null($value);
+		})->reduce(function ($result, $value) {
+			return is_null($result) || $value < $result ? $value : $result;
+		});
+	}
+
+	/**
+	 * Get the max value of a given key.
+	 *
+	 * @param  callable|string|null  $callback
+	 * @return mixed
+	 */
+	public function max($callback = null)
+	{
+		$callback = $this->valueRetriever($callback);
+
+		return $this->filter(function ($value) {
+			return ! is_null($value);
+		})->reduce(function ($result, $item) use ($callback) {
+			$value = $callback($item);
+
+			return is_null($result) || $value > $result ? $value : $result;
+		});
+	}
+
+	/**
+	 * "Paginate" the collection by slicing it into a smaller collection.
+	 *
+	 * @param  int  $page
+	 * @param  int  $perPage
+	 * @return static
+	 */
+	public function forPage($page, $perPage)
+	{
+		$offset = max(0, ($page - 1) * $perPage);
+
+		return $this->slice($offset, $perPage);
+	}
+
+	/**
+	 * Partition the collection into two arrays using the given callback or key.
+	 *
+	 * @param  callable|string  $key
+	 * @param  mixed  $operator
+	 * @param  mixed  $value
+	 * @return static
+	 */
+	public function partition($key, $operator = null, $value = null)
+	{
+		$passed = [];
+		$failed = [];
+
+		$callback = func_num_args() === 1
+				? $this->valueRetriever($key)
+				: $this->operatorForWhere(...func_get_args());
+
+		foreach ($this as $key => $item) {
+			if ($callback($item, $key)) {
+				$passed[$key] = $item;
+			} else {
+				$failed[$key] = $item;
+			}
+		}
+
+		return new static([new static($passed), new static($failed)]);
+	}
+
+	/**
+	 * Get the sum of the given values.
+	 *
+	 * @param  callable|string|null  $callback
+	 * @return mixed
+	 */
+	public function sum($callback = null)
+	{
+		$callback = is_null($callback)
+			? $this->identity()
+			: $this->valueRetriever($callback);
+
+		return $this->reduce(function ($result, $item) use ($callback) {
+			return $result + $callback($item);
+		}, 0);
+	}
+
+	/**
+	 * Apply the callback if the value is truthy.
+	 *
+	 * @param  bool|mixed  $value
+	 * @param  callable|null  $callback
+	 * @param  callable|null  $default
+	 * @return static|mixed
+	 */
+	public function when($value, callable $callback = null, callable $default = null)
+	{
+		if (! $callback) {
+			return new HigherOrderWhenProxy($this, $value);
+		}
+
+		if ($value) {
+			return $callback($this, $value);
+		} elseif ($default) {
+			return $default($this, $value);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Apply the callback if the collection is empty.
+	 *
+	 * @param  callable  $callback
+	 * @param  callable|null  $default
+	 * @return static|mixed
+	 */
+	public function whenEmpty(callable $callback, callable $default = null)
+	{
+		return $this->when($this->isEmpty(), $callback, $default);
+	}
+
+	/**
+	 * Apply the callback if the collection is not empty.
+	 *
+	 * @param  callable  $callback
+	 * @param  callable|null  $default
+	 * @return static|mixed
+	 */
+	public function whenNotEmpty(callable $callback, callable $default = null)
+	{
+		return $this->when($this->isNotEmpty(), $callback, $default);
+	}
+
+	/**
+	 * Apply the callback if the value is falsy.
+	 *
+	 * @param  bool  $value
+	 * @param  callable  $callback
+	 * @param  callable|null  $default
+	 * @return static|mixed
+	 */
+	public function unless($value, callable $callback, callable $default = null)
+	{
+		return $this->when(! $value, $callback, $default);
+	}
+
+	/**
+	 * Apply the callback unless the collection is empty.
+	 *
+	 * @param  callable  $callback
+	 * @param  callable|null  $default
+	 * @return static|mixed
+	 */
+	public function unlessEmpty(callable $callback, callable $default = null)
+	{
+		return $this->whenNotEmpty($callback, $default);
+	}
+
+	/**
+	 * Apply the callback unless the collection is not empty.
+	 *
+	 * @param  callable  $callback
+	 * @param  callable|null  $default
+	 * @return static|mixed
+	 */
+	public function unlessNotEmpty(callable $callback, callable $default = null)
+	{
+		return $this->whenEmpty($callback, $default);
+	}
+
+	/**
+	 * Filter items by the given key value pair.
+	 *
+	 * @param  string  $key
+	 * @param  mixed  $operator
+	 * @param  mixed  $value
+	 * @return static
+	 */
+	public function where($key, $operator = null, $value = null)
+	{
+		return $this->filter($this->operatorForWhere(...func_get_args()));
+	}
+
+	/**
+	 * Filter items where the value for the given key is null.
+	 *
+	 * @param  string|null  $key
+	 * @return static
+	 */
+	public function whereNull($key = null)
+	{
+		return $this->whereStrict($key, null);
+	}
+
+	/**
+	 * Filter items where the value for the given key is not null.
+	 *
+	 * @param  string|null  $key
+	 * @return static
+	 */
+	public function whereNotNull($key = null)
+	{
+		return $this->where($key, '!==', null);
+	}
+
+	/**
+	 * Filter items by the given key value pair using strict comparison.
+	 *
+	 * @param  string  $key
+	 * @param  mixed  $value
+	 * @return static
+	 */
+	public function whereStrict($key, $value)
+	{
+		return $this->where($key, '===', $value);
+	}
+
+	/**
+	 * Filter items by the given key value pair.
+	 *
+	 * @param  string  $key
+	 * @param  mixed  $values
+	 * @param  bool  $strict
+	 * @return static
+	 */
+	public function whereIn($key, $values, $strict = false)
+	{
+		$values = $this->getArrayableItems($values);
+
+		return $this->filter(function ($item) use ($key, $values, $strict) {
+			return in_array(data_get($item, $key), $values, $strict);
+		});
+	}
+
+	/**
+	 * Filter items by the given key value pair using strict comparison.
+	 *
+	 * @param  string  $key
+	 * @param  mixed  $values
+	 * @return static
+	 */
+	public function whereInStrict($key, $values)
+	{
+		return $this->whereIn($key, $values, true);
+	}
+
+	/**
+	 * Filter items such that the value of the given key is between the given values.
+	 *
+	 * @param  string  $key
+	 * @param  array  $values
+	 * @return static
+	 */
+	public function whereBetween($key, $values)
+	{
+		return $this->where($key, '>=', reset($values))->where($key, '<=', end($values));
+	}
+
+	/**
+	 * Filter items such that the value of the given key is not between the given values.
+	 *
+	 * @param  string  $key
+	 * @param  array  $values
+	 * @return static
+	 */
+	public function whereNotBetween($key, $values)
+	{
+		return $this->filter(function ($item) use ($key, $values) {
+			return data_get($item, $key) < reset($values) || data_get($item, $key) > end($values);
+		});
+	}
+
+	/**
+	 * Filter items by the given key value pair.
+	 *
+	 * @param  string  $key
+	 * @param  mixed  $values
+	 * @param  bool  $strict
+	 * @return static
+	 */
+	public function whereNotIn($key, $values, $strict = false)
+	{
+		$values = $this->getArrayableItems($values);
+
+		return $this->reject(function ($item) use ($key, $values, $strict) {
+			return in_array(data_get($item, $key), $values, $strict);
+		});
+	}
+
+	/**
+	 * Filter items by the given key value pair using strict comparison.
+	 *
+	 * @param  string  $key
+	 * @param  mixed  $values
+	 * @return static
+	 */
+	public function whereNotInStrict($key, $values)
+	{
+		return $this->whereNotIn($key, $values, true);
+	}
+
+	/**
+	 * Filter the items, removing any items that don't match the given type(s).
+	 *
+	 * @param  string|string[]  $type
+	 * @return static
+	 */
+	public function whereInstanceOf($type)
+	{
+		return $this->filter(function ($value) use ($type) {
+			if (is_array($type)) {
+				foreach ($type as $classType) {
+					if ($value instanceof $classType) {
+						return true;
+					}
+				}
+
+				return false;
+			}
+
+			return $value instanceof $type;
+		});
+	}
+
+	/**
+	 * Pass the collection to the given callback and return the result.
+	 *
+	 * @param  callable  $callback
+	 * @return mixed
+	 */
+	public function pipe(callable $callback)
+	{
+		return $callback($this);
+	}
+
+	/**
+	 * Pass the collection into a new class.
+	 *
+	 * @param  string  $class
+	 * @return mixed
+	 */
+	public function pipeInto($class)
+	{
+		return new $class($this);
+	}
+
+	/**
+	 * Pass the collection through a series of callable pipes and return the result.
+	 *
+	 * @param  array<callable>  $pipes
+	 * @return mixed
+	 */
+	public function pipeThrough($pipes)
+	{
+		return static::make($pipes)->reduce(
+			function ($carry, $pipe) {
+				return $pipe($carry);
+			},
+			$this
+		);
+	}
+
+	/**
+	 * Pass the collection to the given callback and then return it.
+	 *
+	 * @param  callable  $callback
+	 * @return $this
+	 */
+	public function tap(callable $callback)
+	{
+		$callback(clone $this);
+
+		return $this;
+	}
+
+	/**
+	 * Reduce the collection to a single value.
+	 *
+	 * @param  callable  $callback
+	 * @param  mixed  $initial
+	 * @return mixed
+	 */
+	public function reduce(callable $callback, $initial = null)
+	{
+		$result = $initial;
+
+		foreach ($this as $key => $value) {
+			$result = $callback($result, $value, $key);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Reduce the collection to multiple aggregate values.
+	 *
+	 * @param  callable  $callback
+	 * @param  mixed  ...$initial
+	 * @return array
+	 *
+	 * @deprecated Use "reduceSpread" instead
+	 *
+	 * @throws \UnexpectedValueException
+	 */
+	public function reduceMany(callable $callback, ...$initial)
+	{
+		return $this->reduceSpread($callback, ...$initial);
+	}
+
+	/**
+	 * Reduce the collection to multiple aggregate values.
+	 *
+	 * @param  callable  $callback
+	 * @param  mixed  ...$initial
+	 * @return array
+	 *
+	 * @throws \UnexpectedValueException
+	 */
+	public function reduceSpread(callable $callback, ...$initial)
+	{
+		$result = $initial;
+
+		foreach ($this as $key => $value) {
+			$result = call_user_func_array($callback, array_merge($result, [$value, $key]));
+
+			if (! is_array($result)) {
+				throw new UnexpectedValueException(sprintf(
+					"%s::reduceMany expects reducer to return an array, but got a '%s' instead.",
+					class_basename(static::class), gettype($result)
+				));
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Reduce an associative collection to a single value.
+	 *
+	 * @param  callable  $callback
+	 * @param  mixed  $initial
+	 * @return mixed
+	 */
+	public function reduceWithKeys(callable $callback, $initial = null)
+	{
+		return $this->reduce($callback, $initial);
+	}
+
+	/**
+	 * Create a collection of all elements that do not pass a given truth test.
+	 *
+	 * @param  callable|mixed  $callback
+	 * @return static
+	 */
+	public function reject($callback = true)
+	{
+		$useAsCallable = $this->useAsCallable($callback);
+
+		return $this->filter(function ($value, $key) use ($callback, $useAsCallable) {
+			return $useAsCallable
+				? ! $callback($value, $key)
+				: $value != $callback;
+		});
+	}
+
+	/**
+	 * Return only unique items from the collection array using strict comparison.
+	 *
+	 * @param  string|callable|null  $key
+	 * @return static
+	 */
+	public function uniqueStrict($key = null)
+	{
+		return $this->unique($key, true);
+	}
+
+	/**
+	 * Collect the values into a collection.
+	 *
+	 * @return \Illuminate\Support\Collection
+	 */
+	public function collect()
+	{
+		return new Collection($this->all());
+	}
+
+	/**
+	 * Get the collection of items as a plain array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		return $this->map(function ($value) {
+			return $value instanceof Arrayable ? $value->toArray() : $value;
+		})->all();
+	}
+
+	/**
+	 * Convert the object into something JSON serializable.
+	 *
+	 * @return array
+	 */
+	#[\ReturnTypeWillChange]
+	public function jsonSerialize()
+	{
+		return array_map(function ($value) {
+			if ($value instanceof JsonSerializable) {
+				return $value->jsonSerialize();
+			} elseif ($value instanceof Jsonable) {
+				return json_decode($value->toJson(), true);
+			} elseif ($value instanceof Arrayable) {
+				return $value->toArray();
+			}
+
+			return $value;
+		}, $this->all());
+	}
+
+	/**
+	 * Get the collection of items as JSON.
+	 *
+	 * @param  int  $options
+	 * @return string
+	 */
+	public function toJson($options = 0)
+	{
+		return json_encode($this->jsonSerialize(), $options);
+	}
+
+	/**
+	 * Get a CachingIterator instance.
+	 *
+	 * @param  int  $flags
+	 * @return \CachingIterator
+	 */
+	public function getCachingIterator($flags = CachingIterator::CALL_TOSTRING)
+	{
+		return new CachingIterator($this->getIterator(), $flags);
+	}
+
+	/**
+	 * Convert the collection to its string representation.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->escapeWhenCastingToString
+					? e($this->toJson())
+					: $this->toJson();
+	}
+
+	/**
+	 * Indicate that the model's string representation should be escaped when __toString is invoked.
+	 *
+	 * @param  bool  $escape
+	 * @return $this
+	 */
+	public function escapeWhenCastingToString($escape = true)
+	{
+		$this->escapeWhenCastingToString = $escape;
+
+		return $this;
+	}
+
+	/**
+	 * Add a method to the list of proxied methods.
+	 *
+	 * @param  string  $method
+	 * @return void
+	 */
+	public static function proxy($method)
+	{
+		static::$proxies[] = $method;
+	}
+
+	/**
+	 * Dynamically access collection proxies.
+	 *
+	 * @param  string  $key
+	 * @return mixed
+	 *
+	 * @throws \Exception
+	 */
+	public function __get($key)
+	{
+		if (! in_array($key, static::$proxies)) {
+			throw new Exception("Property [{$key}] does not exist on this collection instance.");
+		}
+
+		return new HigherOrderCollectionProxy($this, $key);
+	}
+
+	/**
+	 * Results array of items from Collection or Arrayable.
+	 *
+	 * @param  mixed  $items
+	 * @return array
+	 */
+	protected function getArrayableItems($items)
+	{
+		if (is_array($items)) {
+			return $items;
+		} elseif ($items instanceof Enumerable) {
+			return $items->all();
+		} elseif ($items instanceof Arrayable) {
+			return $items->toArray();
+		} elseif ($items instanceof Jsonable) {
+			return json_decode($items->toJson(), true);
+		} elseif ($items instanceof JsonSerializable) {
+			return (array) $items->jsonSerialize();
+		} elseif ($items instanceof Traversable) {
+			return iterator_to_array($items);
+		} elseif ($items instanceof UnitEnum) {
+			return [$items];
+		}
+
+		return (array) $items;
+	}
+
+	/**
+	 * Get an operator checker callback.
+	 *
+	 * @param  string  $key
+	 * @param  string|null  $operator
+	 * @param  mixed  $value
+	 * @return \Closure
+	 */
+	protected function operatorForWhere($key, $operator = null, $value = null)
+	{
+		if (func_num_args() === 1) {
+			$value = true;
+
+			$operator = '=';
+		}
+
+		if (func_num_args() === 2) {
+			$value = $operator;
+
+			$operator = '=';
+		}
+
+		return function ($item) use ($key, $operator, $value) {
+			$retrieved = data_get($item, $key);
+
+			$strings = array_filter([$retrieved, $value], function ($value) {
+				return is_string($value) || (is_object($value) && method_exists($value, '__toString'));
+			});
+
+			if (count($strings) < 2 && count(array_filter([$retrieved, $value], 'is_object')) == 1) {
+				return in_array($operator, ['!=', '<>', '!==']);
+			}
+
+			switch ($operator) {
+				default:
+				case '=':
+				case '==':  return $retrieved == $value;
+				case '!=':
+				case '<>':  return $retrieved != $value;
+				case '<':   return $retrieved < $value;
+				case '>':   return $retrieved > $value;
+				case '<=':  return $retrieved <= $value;
+				case '>=':  return $retrieved >= $value;
+				case '===': return $retrieved === $value;
+				case '!==': return $retrieved !== $value;
+			}
+		};
+	}
+
+	/**
+	 * Determine if the given value is callable, but not a string.
+	 *
+	 * @param  mixed  $value
+	 * @return bool
+	 */
+	protected function useAsCallable($value)
+	{
+		return ! is_string($value) && is_callable($value);
+	}
+
+	/**
+	 * Get a value retrieving callback.
+	 *
+	 * @param  callable|string|null  $value
+	 * @return callable
+	 */
+	protected function valueRetriever($value)
+	{
+		if ($this->useAsCallable($value)) {
+			return $value;
+		}
+
+		return function ($item) use ($value) {
+			return data_get($item, $value);
+		};
+	}
+
+	/**
+	 * Make a function to check an item's equality.
+	 *
+	 * @param  mixed  $value
+	 * @return \Closure
+	 */
+	protected function equality($value)
+	{
+		return function ($item) use ($value) {
+			return $item === $value;
+		};
+	}
+
+	/**
+	 * Make a function using another function, by negating its result.
+	 *
+	 * @param  \Closure  $callback
+	 * @return \Closure
+	 */
+	protected function negate(Closure $callback)
+	{
+		return function (...$params) use ($callback) {
+			return ! $callback(...$params);
+		};
+	}
+
+	/**
+	 * Make a function that returns what's passed to it.
+	 *
+	 * @return \Closure
+	 */
+	protected function identity()
+	{
+		return function ($value) {
+			return $value;
+		};
+	}
 }

Spacing +37 added lines, -37 removed lines

@@ -186,13 +186,13 @@ 
     public function containsStrict($key, $value = null)
     {
         if (func_num_args() === 2) {
-            return $this->contains(function ($item) use ($key, $value) {
+            return $this->contains(function($item) use ($key, $value) {
                 return data_get($item, $key) === $value;
             });
         }
 
         if ($this->useAsCallable($key)) {
-            return ! is_null($this->first($key));
+            return !is_null($this->first($key));
         }
 
         foreach ($this as $item) {
@@ -226,7 +226,7 @@ 
     {
         (new Collection(func_get_args()))
             ->push($this->all())
-            ->each(function ($item) {
+            ->each(function($item) {
                 VarDumper::dump($item);
             });
 
@@ -258,7 +258,7 @@ 
      */
     public function eachSpread(callable $callback)
     {
-        return $this->each(function ($chunk, $key) use ($callback) {
+        return $this->each(function($chunk, $key) use ($callback) {
             $chunk[] = $key;
 
             return $callback(...$chunk);
@@ -279,7 +279,7 @@ 
             $callback = $this->valueRetriever($key);
 
             foreach ($this as $k => $v) {
-                if (! $callback($v, $k)) {
+                if (!$callback($v, $k)) {
                     return false;
                 }
             }
@@ -310,7 +310,7 @@ 
      */
     public function isNotEmpty()
     {
-        return ! $this->isEmpty();
+        return !$this->isEmpty();
     }
 
     /**
@@ -321,7 +321,7 @@ 
      */
     public function mapSpread(callable $callback)
     {
-        return $this->map(function ($chunk, $key) use ($callback) {
+        return $this->map(function($chunk, $key) use ($callback) {
             $chunk[] = $key;
 
             return $callback(...$chunk);
@@ -362,7 +362,7 @@ 
      */
     public function mapInto($class)
     {
-        return $this->map(function ($value, $key) use ($class) {
+        return $this->map(function($value, $key) use ($class) {
             return new $class($value, $key);
         });
     }
@@ -377,11 +377,11 @@ 
     {
         $callback = $this->valueRetriever($callback);
 
-        return $this->map(function ($value) use ($callback) {
+        return $this->map(function($value) use ($callback) {
             return $callback($value);
-        })->filter(function ($value) {
-            return ! is_null($value);
-        })->reduce(function ($result, $value) {
+        })->filter(function($value) {
+            return !is_null($value);
+        })->reduce(function($result, $value) {
             return is_null($result) || $value < $result ? $value : $result;
         });
     }
@@ -396,9 +396,9 @@ 
     {
         $callback = $this->valueRetriever($callback);
 
-        return $this->filter(function ($value) {
-            return ! is_null($value);
-        })->reduce(function ($result, $item) use ($callback) {
+        return $this->filter(function($value) {
+            return !is_null($value);
+        })->reduce(function($result, $item) use ($callback) {
             $value = $callback($item);
 
             return is_null($result) || $value > $result ? $value : $result;
@@ -459,7 +459,7 @@ 
             ? $this->identity()
             : $this->valueRetriever($callback);
 
-        return $this->reduce(function ($result, $item) use ($callback) {
+        return $this->reduce(function($result, $item) use ($callback) {
             return $result + $callback($item);
         }, 0);
     }
@@ -474,7 +474,7 @@ 
      */
     public function when($value, callable $callback = null, callable $default = null)
     {
-        if (! $callback) {
+        if (!$callback) {
             return new HigherOrderWhenProxy($this, $value);
         }
 
@@ -521,7 +521,7 @@ 
      */
     public function unless($value, callable $callback, callable $default = null)
     {
-        return $this->when(! $value, $callback, $default);
+        return $this->when(!$value, $callback, $default);
     }
 
     /**
@@ -607,7 +607,7 @@ 
     {
         $values = $this->getArrayableItems($values);
 
-        return $this->filter(function ($item) use ($key, $values, $strict) {
+        return $this->filter(function($item) use ($key, $values, $strict) {
             return in_array(data_get($item, $key), $values, $strict);
         });
     }
@@ -645,7 +645,7 @@ 
      */
     public function whereNotBetween($key, $values)
     {
-        return $this->filter(function ($item) use ($key, $values) {
+        return $this->filter(function($item) use ($key, $values) {
             return data_get($item, $key) < reset($values) || data_get($item, $key) > end($values);
         });
     }
@@ -662,7 +662,7 @@ 
     {
         $values = $this->getArrayableItems($values);
 
-        return $this->reject(function ($item) use ($key, $values, $strict) {
+        return $this->reject(function($item) use ($key, $values, $strict) {
             return in_array(data_get($item, $key), $values, $strict);
         });
     }
@@ -687,7 +687,7 @@ 
      */
     public function whereInstanceOf($type)
     {
-        return $this->filter(function ($value) use ($type) {
+        return $this->filter(function($value) use ($type) {
             if (is_array($type)) {
                 foreach ($type as $classType) {
                     if ($value instanceof $classType) {
@@ -733,7 +733,7 @@ 
     public function pipeThrough($pipes)
     {
         return static::make($pipes)->reduce(
-            function ($carry, $pipe) {
+            function($carry, $pipe) {
                 return $pipe($carry);
             },
             $this
@@ -803,7 +803,7 @@ 
         foreach ($this as $key => $value) {
             $result = call_user_func_array($callback, array_merge($result, [$value, $key]));
 
-            if (! is_array($result)) {
+            if (!is_array($result)) {
                 throw new UnexpectedValueException(sprintf(
                     "%s::reduceMany expects reducer to return an array, but got a '%s' instead.",
                     class_basename(static::class), gettype($result)
@@ -836,9 +836,9 @@ 
     {
         $useAsCallable = $this->useAsCallable($callback);
 
-        return $this->filter(function ($value, $key) use ($callback, $useAsCallable) {
+        return $this->filter(function($value, $key) use ($callback, $useAsCallable) {
             return $useAsCallable
-                ? ! $callback($value, $key)
+                ? !$callback($value, $key)
                 : $value != $callback;
         });
     }
@@ -871,7 +871,7 @@ 
      */
     public function toArray()
     {
-        return $this->map(function ($value) {
+        return $this->map(function($value) {
             return $value instanceof Arrayable ? $value->toArray() : $value;
         })->all();
     }
@@ -884,7 +884,7 @@ 
     #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
-        return array_map(function ($value) {
+        return array_map(function($value) {
             if ($value instanceof JsonSerializable) {
                 return $value->jsonSerialize();
             } elseif ($value instanceof Jsonable) {
@@ -965,7 +965,7 @@ 
      */
     public function __get($key)
     {
-        if (! in_array($key, static::$proxies)) {
+        if (!in_array($key, static::$proxies)) {
             throw new Exception("Property [{$key}] does not exist on this collection instance.");
         }
 
@@ -1021,10 +1021,10 @@ 
             $operator = '=';
         }
 
-        return function ($item) use ($key, $operator, $value) {
+        return function($item) use ($key, $operator, $value) {
             $retrieved = data_get($item, $key);
 
-            $strings = array_filter([$retrieved, $value], function ($value) {
+            $strings = array_filter([$retrieved, $value], function($value) {
                 return is_string($value) || (is_object($value) && method_exists($value, '__toString'));
             });
 
@@ -1056,7 +1056,7 @@ 
      */
     protected function useAsCallable($value)
     {
-        return ! is_string($value) && is_callable($value);
+        return !is_string($value) && is_callable($value);
     }
 
     /**
@@ -1071,7 +1071,7 @@ 
             return $value;
         }
 
-        return function ($item) use ($value) {
+        return function($item) use ($value) {
             return data_get($item, $value);
         };
     }
@@ -1084,7 +1084,7 @@ 
      */
     protected function equality($value)
     {
-        return function ($item) use ($value) {
+        return function($item) use ($value) {
             return $item === $value;
         };
     }
@@ -1097,8 +1097,8 @@ 
      */
     protected function negate(Closure $callback)
     {
-        return function (...$params) use ($callback) {
-            return ! $callback(...$params);
+        return function(...$params) use ($callback) {
+            return !$callback(...$params);
         };
     }
 
@@ -1109,7 +1109,7 @@ 
      */
     protected function identity()
     {
-        return function ($value) {
+        return function($value) {
             return $value;
         };
     }

htdocs/fichinter/card.php

Spacing +10 added lines, -10 removed lines

@@ -49,8 +49,8 @@ 
 	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
 	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 }
-if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').".php")) {
-	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').'.php';
+if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".getDolGlobalString('FICHEINTER_ADDON').".php")) {
+	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".getDolGlobalString('FICHEINTER_ADDON').'.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -68,7 +68,7 @@ 
 
 $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
-$ref_client	= GETPOST('ref_client', 'alpha');
+$ref_client = GETPOST('ref_client', 'alpha');
 $socid = GETPOSTINT('socid');
 $contratid = GETPOSTINT('contratid');
 $action		= GETPOST('action', 'alpha');
@@ -230,7 +230,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -255,7 +255,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -280,7 +280,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -376,7 +376,7 @@ 
 
 					$classname = ucfirst($subelement);
 					$srcobject = new $classname($db);
-					'@phan-var-force Commande|Propal|Contrat $srcobject';  // Can be other class, but CommonObject is too generic
+					'@phan-var-force Commande|Propal|Contrat $srcobject'; // Can be other class, but CommonObject is too generic
 					/** @var Commande|Propal|Contrat $srcobject */
 
 					dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
@@ -1136,7 +1136,7 @@ 
 	} else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="create">';		// We go back to create action
+		print '<input type="hidden" name="action" value="create">'; // We go back to create action
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 		print dol_get_fiche_head([]);
@@ -1831,9 +1831,9 @@ 
 				// Sign
 				if ($object->statut > Fichinter::STATUS_DRAFT) {
 					if ($object->signed_status != Fichinter::$SIGNED_STATUSES['STATUS_SIGNED_ALL']) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=sign&token=' . newToken() . '">' . $langs->trans("InterventionSign") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sign&token='.newToken().'">'.$langs->trans("InterventionSign").'</a></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=unsign&token=' . newToken() . '">' . $langs->trans("InterventionUnsign") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unsign&token='.newToken().'">'.$langs->trans("InterventionUnsign").'</a></div>';
 					}
 				}
 

htdocs/compta/tva/clients.php

Spacing +3 added lines, -3 removed lines

@@ -269,7 +269,7 @@ 
 			$company_static->name = $x_coll[$my_coll_thirdpartyid]['company_name'][$id];
 			$company_static->name_alias = $x_coll[$my_coll_thirdpartyid]['company_alias'][$id];
 			$company_static->email = $x_coll[$my_coll_thirdpartyid]['company_email'][$id];
-			$company_static->tva_intra = isset($x_coll[$my_coll_thirdpartyid]['tva_intra'][$id]) ? $x_coll[$my_coll_thirdpartyid]['tva_intra'][$id] : '0';  // @phan-suppress-current-line PhanTypeInvalidDimOffset
+			$company_static->tva_intra = isset($x_coll[$my_coll_thirdpartyid]['tva_intra'][$id]) ? $x_coll[$my_coll_thirdpartyid]['tva_intra'][$id] : '0'; // @phan-suppress-current-line PhanTypeInvalidDimOffset
 			$company_static->client = $x_coll[$my_coll_thirdpartyid]['company_client'][$id];
 			$company_static->fournisseur = $x_coll[$my_coll_thirdpartyid]['company_fournisseur'][$id];
 			$company_static->status = $x_coll[$my_coll_thirdpartyid]['company_status'][$id];
@@ -285,8 +285,8 @@ 
 				'pid'       => $x_coll[$my_coll_thirdpartyid]['pid'][$id],
 				'pref'      => isset($x_coll[$my_coll_thirdpartyid]['pref'][$id]) ? $x_coll[$my_coll_thirdpartyid]['pref'][$id] : '',
 				'ptype'     => $x_coll[$my_coll_thirdpartyid]['ptype'][$id],
-				'pstatus'   => isset($x_paye[$my_coll_thirdpartyid]['pstatus'][$id]) ? $x_paye[$my_coll_thirdpartyid]['pstatus'][$id] : '',  // @phan-suppress-current-line PhanTypeInvalidDimOffset
-				'pstatusbuy' => isset($x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id]) ? $x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id] : '',  // @phan-suppress-current-line PhanTypeInvalidDimOffset
+				'pstatus'   => isset($x_paye[$my_coll_thirdpartyid]['pstatus'][$id]) ? $x_paye[$my_coll_thirdpartyid]['pstatus'][$id] : '', // @phan-suppress-current-line PhanTypeInvalidDimOffset
+				'pstatusbuy' => isset($x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id]) ? $x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id] : '', // @phan-suppress-current-line PhanTypeInvalidDimOffset
 
 				'payment_id' => $x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
 				'payment_ref' => isset($x_coll[$my_coll_thirdpartyid]['payment_ref'][$id]) ? $x_coll[$my_coll_thirdpartyid]['payment_ref'][$id] : '',

htdocs/compta/paiement.php

Spacing +7 added lines, -7 removed lines

@@ -677,15 +677,15 @@ 
 						$multicurrency_alreadypayed = price2num($multicurrency_payment + $multicurrency_creditnotes + $multicurrency_deposits, 'MT');
 						$multicurrency_remaintopay = price2num($invoice->multicurrency_total_ttc - $multicurrency_payment - $multicurrency_creditnotes - $multicurrency_deposits, 'MT');
 						// Multicurrency full amount tooltip
-						$tooltiponmulticurrencyfullamount = $langs->trans('AmountHT') . ": " . price($objp->multicurrency_total_ht, 0, $langs, 0, -1, -1, $objp->multicurrency_code) . "<br>";
-						$tooltiponmulticurrencyfullamount .= $langs->trans('AmountVAT') . ": " . price($objp->multicurrency_total_tva, 0, $langs, 0, -1, -1, $objp->multicurrency_code) . "<br>";
-						$tooltiponmulticurrencyfullamount .= $langs->trans('AmountTTC') . ": " . price($objp->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $objp->multicurrency_code) . "<br>";
+						$tooltiponmulticurrencyfullamount = $langs->trans('AmountHT').": ".price($objp->multicurrency_total_ht, 0, $langs, 0, -1, -1, $objp->multicurrency_code)."<br>";
+						$tooltiponmulticurrencyfullamount .= $langs->trans('AmountVAT').": ".price($objp->multicurrency_total_tva, 0, $langs, 0, -1, -1, $objp->multicurrency_code)."<br>";
+						$tooltiponmulticurrencyfullamount .= $langs->trans('AmountTTC').": ".price($objp->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $objp->multicurrency_code)."<br>";
 					}
 
 					// Full amount tooltip
-					$tooltiponfullamount = $langs->trans('AmountHT') . ": " . price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . "<br>";
-					$tooltiponfullamount .= $langs->trans('AmountVAT') . ": " . price($objp->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . "<br>";
-					$tooltiponfullamount .= $langs->trans('AmountTTC') . ": " . price($objp->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . "<br>";
+					$tooltiponfullamount = $langs->trans('AmountHT').": ".price($objp->total_ht, 0, $langs, 0, -1, -1, $conf->currency)."<br>";
+					$tooltiponfullamount .= $langs->trans('AmountVAT').": ".price($objp->total_tva, 0, $langs, 0, -1, -1, $conf->currency)."<br>";
+					$tooltiponfullamount .= $langs->trans('AmountTTC').": ".price($objp->total_ttc, 0, $langs, 0, -1, -1, $conf->currency)."<br>";
 
 					print '<tr class="oddeven'.(($invoice->id == $facid) ? ' highlight' : '').'">';
 
@@ -722,7 +722,7 @@ 
 					if (isModEnabled('multicurrency')) {
 						print '<td class="right">';
 						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
-							print '<span class="amount classfortooltip" title="'.$tooltiponmulticurrencyfullamount.'">' . price($sign * $objp->multicurrency_total_ttc);
+							print '<span class="amount classfortooltip" title="'.$tooltiponmulticurrencyfullamount.'">'.price($sign * $objp->multicurrency_total_ttc);
 						}
 						print '</span></td>';
 

htdocs/compta/localtax/clients.php

Spacing +2 added lines, -2 removed lines

@@ -209,8 +209,8 @@
 print '<div class="div-table-responsive">';
 print '<table class="liste noborder centpercent">';
 
-$x_coll_sum = 0;  // Initialize value
-$x_paye_sum = 0;  // Initialize value
+$x_coll_sum = 0; // Initialize value
+$x_paye_sum = 0; // Initialize value
 
 // IRPF that the customer has retained me
 if ($calc == 0 || $calc == 2) {