mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-09-25 19:09:08 +02:00
Merge branch 'ent-9948-Varios-problemas-con-elementos-de-CV-en-php8' into 'develop'
fixed several bugs See merge request artica/pandorafms!5311
This commit is contained in:
commit
86491e3a78
@ -121,7 +121,7 @@ final class BarsGraph extends Item
|
|||||||
*
|
*
|
||||||
* @return mixed String representing the grid color (not empty) or null.
|
* @return mixed String representing the grid color (not empty) or null.
|
||||||
*/
|
*/
|
||||||
private function extractGridColor(array $data): string
|
private static function extractGridColor(array $data): string
|
||||||
{
|
{
|
||||||
return static::notEmptyStringOr(
|
return static::notEmptyStringOr(
|
||||||
static::issetInArray($data, ['gridColor', 'border_color']),
|
static::issetInArray($data, ['gridColor', 'border_color']),
|
||||||
@ -138,7 +138,7 @@ final class BarsGraph extends Item
|
|||||||
* @return string One of 'white', 'black' or 'transparent'.
|
* @return string One of 'white', 'black' or 'transparent'.
|
||||||
* 'white' by default.
|
* 'white' by default.
|
||||||
*/
|
*/
|
||||||
private function extractBackgroundColor(array $data): string
|
private static function extractBackgroundColor(array $data): string
|
||||||
{
|
{
|
||||||
$backgroundColor = static::notEmptyStringOr(
|
$backgroundColor = static::notEmptyStringOr(
|
||||||
static::issetInArray($data, ['backgroundColor', 'image']),
|
static::issetInArray($data, ['backgroundColor', 'image']),
|
||||||
@ -163,7 +163,7 @@ final class BarsGraph extends Item
|
|||||||
*
|
*
|
||||||
* @return string One of 'vertical' or 'horizontal'. 'vertical' by default.
|
* @return string One of 'vertical' or 'horizontal'. 'vertical' by default.
|
||||||
*/
|
*/
|
||||||
private function extractTypeGraph(array $data): string
|
private static function extractTypeGraph(array $data): string
|
||||||
{
|
{
|
||||||
$typeGraph = static::notEmptyStringOr(
|
$typeGraph = static::notEmptyStringOr(
|
||||||
static::issetInArray($data, ['typeGraph', 'type_graph']),
|
static::issetInArray($data, ['typeGraph', 'type_graph']),
|
||||||
|
@ -77,7 +77,7 @@ final class EventsHistory extends Item
|
|||||||
*
|
*
|
||||||
* @return mixed String representing the grid color (not empty) or null.
|
* @return mixed String representing the grid color (not empty) or null.
|
||||||
*/
|
*/
|
||||||
private function extractLegendColor(array $data): string
|
private static function extractLegendColor(array $data): string
|
||||||
{
|
{
|
||||||
return static::notEmptyStringOr(
|
return static::notEmptyStringOr(
|
||||||
static::issetInArray($data, ['legendColor', 'border_color']),
|
static::issetInArray($data, ['legendColor', 'border_color']),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user