aboutsummaryrefslogtreecommitdiff
path: root/p
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2022-06-19 20:08:42 +0200
committerGravatar GitHub <noreply@github.com> 2022-06-19 20:08:42 +0200
commitf365a9aeb44c33a1c817ae19a6027aa0fbffd706 (patch)
tree6f93f55d5c71eda6672168a7f1250ad1d784c5ef /p
parent238e55b2fd7f08b5ce866b712c43c1a8fa03a657 (diff)
Update all test dependencies (#4419)
* Update all test dependencies * Remove old false-positive * Minor update lock files * Increase PHPStan memory for Fedora https://github.com/FreshRSS/FreshRSS/pull/4400#issuecomment-1159514197 * Require PHP8+ for tests Due to small changes of signature in `ob_implicit_flush` and `simplexml_load_string`, cf. https://github.com/FreshRSS/FreshRSS/pull/4123 * Missing lint in CSS files
Diffstat (limited to 'p')
-rw-r--r--p/api/fever.php2
-rw-r--r--p/scripts/statsWithChartjs.js8
-rw-r--r--p/themes/BlueLagoon/BlueLagoon.css2
-rw-r--r--p/themes/BlueLagoon/BlueLagoon.rtl.css2
4 files changed, 7 insertions, 7 deletions
diff --git a/p/api/fever.php b/p/api/fever.php
index 1dcb7220e..d7d4ca603 100644
--- a/p/api/fever.php
+++ b/p/api/fever.php
@@ -155,7 +155,7 @@ class FeverAPI
$username = @file_get_contents(DATA_PATH . '/fever/.key-' . sha1(FreshRSS_Context::$system_conf->salt) . '-' . $feverKey . '.txt', false);
if ($username != false) {
$username = trim($username);
- FreshRSS_Context::initUser($username);
+ FreshRSS_Context::$user_conf = FreshRSS_Context::initUser($username); // Assignment to help PHPStan
if (FreshRSS_Context::$user_conf != null && $feverKey === FreshRSS_Context::$user_conf->feverKey && FreshRSS_Context::$user_conf->enabled) {
Minz_Translate::init(FreshRSS_Context::$user_conf->language);
$this->entryDAO = FreshRSS_Factory::createEntryDao();
diff --git a/p/scripts/statsWithChartjs.js b/p/scripts/statsWithChartjs.js
index 5656fe944..3398ee89c 100644
--- a/p/scripts/statsWithChartjs.js
+++ b/p/scripts/statsWithChartjs.js
@@ -47,10 +47,10 @@ function jsonChartBar(label, data, xAxisLabels = '') {
data: {
labels: xAxisLabels,
datasets: [{
- label: label,
+ label,
backgroundColor: '#0062BD',
borderColor: '#0062BD',
- data: data,
+ data,
barPercentage: 1.0,
categoryPercentage: 1.0,
order: 2,
@@ -80,7 +80,7 @@ function jsonChartDoughnut(labels, data) {
return {
type: 'doughnut',
data: {
- labels: labels,
+ labels,
datasets: [{
backgroundColor: [
'#0b84a5', // petrol
@@ -97,7 +97,7 @@ function jsonChartDoughnut(labels, data) {
'#ffa056', // orange
'#8dddd0', // turkis
],
- data: data,
+ data,
}],
},
options: {
diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index 6db76e18a..ba68bd1e9 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -596,7 +596,7 @@ a.btn {
}
.tree-folder-items > .item.active > a {
- color: #0090ff
+ color: #0090ff;
}
/*=== Scrollbar */
diff --git a/p/themes/BlueLagoon/BlueLagoon.rtl.css b/p/themes/BlueLagoon/BlueLagoon.rtl.css
index 2703dc41f..4af142cee 100644
--- a/p/themes/BlueLagoon/BlueLagoon.rtl.css
+++ b/p/themes/BlueLagoon/BlueLagoon.rtl.css
@@ -596,7 +596,7 @@ a.btn {
}
.tree-folder-items > .item.active > a {
- color: #0090ff
+ color: #0090ff;
}
/*=== Scrollbar */