pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump phpstan/phpstan from 1.10.50 to 1.10.67 (#3009)

Browse Source
This commit is contained in:
Adam Warner
2024-04-21 15:39:54 +01:00
committed by GitHub
parent 5f7be30238 ec32e489eb
commit dd012ad52c
6 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+5 -9
View File
@@ -8,16 +8,16 @@
"packages": [
{
"name": "phpstan/phpstan",
"version": "1.10.50",
"version": "1.10.67",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "06a98513ac72c03e8366b5a0cb00750b487032e4"
"reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4",
"reference": "06a98513ac72c03e8366b5a0cb00750b487032e4",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/16ddbe776f10da6a95ebd25de7c1dbed397dc493",
"reference": "16ddbe776f10da6a95ebd25de7c1dbed397dc493",
"shasum": ""
},
"require": {
@@ -60,13 +60,9 @@
{
"url": "https://github.com/phpstan",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
}
],
"time": "2023-12-13T10:59:42+00:00"
"time": "2024-04-16T07:22:02+00:00"
}
],
"packages-dev": [],
scripts/pi-hole/php/func.php
+8 -8
View File
@@ -208,7 +208,7 @@ function getCustomDNSEntries()
continue;
}
$data = new \stdClass();
$data = new stdClass();
$data->ip = $explodedLine[0];
$data->domain = $explodedLine[1];
$data->domains = array_slice($explodedLine, 0, -1);
@@ -286,7 +286,7 @@ function addCustomDNSEntry($ip = '', $domain = '', $reload = '', $json = true, $
}
return returnSuccess('', $json);
} catch (\Exception $ex) {
} catch (Exception $ex) {
return returnError($ex->getMessage(), $json);
}
}
@@ -325,7 +325,7 @@ function deleteCustomDNSEntry()
pihole_execute('-a removecustomdns '.$ip.' '.$domain);
return returnSuccess();
} catch (\Exception $ex) {
} catch (Exception $ex) {
return returnError($ex->getMessage());
}
}
@@ -342,7 +342,7 @@ function deleteAllCustomDNSEntries($reload = '')
foreach ($existingEntries as $entry) {
pihole_execute('-a removecustomdns '.$entry->ip.' '.$entry->domain.' '.$reload);
}
} catch (\Exception $ex) {
} catch (Exception $ex) {
return returnError($ex->getMessage());
}
@@ -386,7 +386,7 @@ function getCustomCNAMEEntries()
continue;
}
$data = new \stdClass();
$data = new stdClass();
$data->domains = array_slice($explodedLine, 0, -1);
$data->domain = implode(',', $data->domains);
$data->target = $explodedLine[count($explodedLine) - 1];
@@ -468,7 +468,7 @@ function addCustomCNAMEEntry($domain = '', $target = '', $reload = '', $json = t
}
return returnSuccess('', $json);
} catch (\Exception $ex) {
} catch (Exception $ex) {
return returnError($ex->getMessage(), $json);
}
}
@@ -507,7 +507,7 @@ function deleteCustomCNAMEEntry()
pihole_execute('-a removecustomcname '.$domain.' '.$target);
return returnSuccess();
} catch (\Exception $ex) {
} catch (Exception $ex) {
return returnError($ex->getMessage());
}
}
@@ -524,7 +524,7 @@ function deleteAllCustomCNAMEEntries($reload = '')
foreach ($existingEntries as $entry) {
pihole_execute('-a removecustomcname '.$entry->domain.' '.$entry->target.' '.$reload);
}
} catch (\Exception $ex) {
} catch (Exception $ex) {
return returnError($ex->getMessage());
}
scripts/pi-hole/php/groups.php
+19 -19
View File
@@ -51,7 +51,7 @@ if ($_POST['action'] == 'get_groups') {
header('Content-type: application/json');
echo json_encode(array('data' => $data));
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'add_group') {
@@ -93,7 +93,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'edit_group') {
@@ -134,7 +134,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'delete_group') {
@@ -167,7 +167,7 @@ if ($_POST['action'] == 'get_groups') {
}
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'get_clients') {
@@ -247,7 +247,7 @@ if ($_POST['action'] == 'get_groups') {
header('Content-type: application/json');
echo json_encode(array('data' => $data));
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'get_unconfigured_clients') {
@@ -329,7 +329,7 @@ if ($_POST['action'] == 'get_groups') {
header('Content-type: application/json');
echo json_encode($ips);
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'add_client') {
@@ -372,7 +372,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'edit_client') {
@@ -443,7 +443,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'delete_client') {
@@ -481,7 +481,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'get_domains') {
@@ -525,7 +525,7 @@ if ($_POST['action'] == 'get_groups') {
header('Content-type: application/json');
echo json_encode(array('data' => $data));
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'add_domain' || $_POST['action'] == 'replace_domain') {
@@ -693,7 +693,7 @@ if ($_POST['action'] == 'get_groups') {
}
$reload = true;
JSON_success($msg);
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'edit_domain') {
@@ -778,7 +778,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'delete_domain') {
@@ -817,7 +817,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'delete_domain_string') {
@@ -869,7 +869,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'get_adlists') {
@@ -897,7 +897,7 @@ if ($_POST['action'] == 'get_groups') {
header('Content-type: application/json');
echo json_encode(array('data' => $data));
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'add_adlist') {
@@ -978,7 +978,7 @@ if ($_POST['action'] == 'get_groups') {
$msg = $added_list.'<br><b>Total: '.$total.' adlist(s) processed.</b>';
JSON_success($msg);
}
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'edit_adlist') {
@@ -1059,7 +1059,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'delete_adlist') {
@@ -1100,7 +1100,7 @@ if ($_POST['action'] == 'get_groups') {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} elseif ($_POST['action'] == 'add_audit') {
@@ -1157,7 +1157,7 @@ if ($_POST['action'] == 'get_groups') {
// Reloading isn't necessary for audit domains (no effect on blocking)
$reload = false;
JSON_success($msg);
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} else {
scripts/pi-hole/php/message.php
+1 -1
View File
@@ -50,7 +50,7 @@ if ($_POST['action'] == 'delete_message' && isset($_POST['id'])) {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} else {
scripts/pi-hole/php/network.php
+1 -1
View File
@@ -57,7 +57,7 @@ if ($_POST['action'] == 'delete_network_entry' && isset($_POST['id'])) {
$reload = true;
JSON_success();
} catch (\Exception $ex) {
} catch (Exception $ex) {
JSON_error($ex->getMessage());
}
} else {
settings.php
+5 -5
View File
@@ -457,11 +457,11 @@ if ($FTLpid !== 0) {
$DHCPIPv6 = false;
$DHCP_rapid_commit = false;
}
if (isset($setupVars['PIHOLE_DOMAIN'])) {
$piHoleDomain = $setupVars['PIHOLE_DOMAIN'];
} else {
$piHoleDomain = 'lan';
}
if (isset($setupVars['PIHOLE_DOMAIN'])) {
$piHoleDomain = $setupVars['PIHOLE_DOMAIN'];
} else {
$piHoleDomain = 'lan';
}
?>
<form role="form" method="post">
<div class="row">