Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/HuasoFoundries/phpPgAdmin6.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorffflabs <amenadiel@gmail.com>2020-03-05 18:17:33 +0300
committerffflabs <amenadiel@gmail.com>2020-03-05 18:17:33 +0300
commitc0b1b83ba5b053202670448466c87afeaf51a7f7 (patch)
treea7fdcc4106a831d8dad6372747bf54ee00b86b48
parent3a7b3d8e74ea671f1abd84fba8286afaa72d482c (diff)
static typing broke stuff
-rw-r--r--assets/vendor/jquery/images/ui-icons_444444_256x240.pngbin0 -> 3266 bytes
-rw-r--r--src/controllers/SqleditController.php42
-rw-r--r--src/decorators/Decorator.php6
-rw-r--r--src/traits/HelperTrait.php16
4 files changed, 32 insertions, 32 deletions
diff --git a/assets/vendor/jquery/images/ui-icons_444444_256x240.png b/assets/vendor/jquery/images/ui-icons_444444_256x240.png
new file mode 100644
index 00000000..df4e3737
--- /dev/null
+++ b/assets/vendor/jquery/images/ui-icons_444444_256x240.png
Binary files differ
diff --git a/src/controllers/SqleditController.php b/src/controllers/SqleditController.php
index d3afc3ab..3d6f8554 100644
--- a/src/controllers/SqleditController.php
+++ b/src/controllers/SqleditController.php
@@ -28,13 +28,13 @@ class SqleditController extends BaseController
{
switch ($this->action) {
case 'find':
- $title = $this->lang['strfind'];
+ $title = $this->lang['strfind'];
$body_text = $this->doFind();
break;
case 'sql':
default:
- $title = $this->lang['strsql'];
+ $title = $this->lang['strsql'];
$body_text = $this->doDefault();
break;
@@ -64,9 +64,9 @@ class SqleditController extends BaseController
$this->coalesceArr($_REQUEST, 'search_path', \implode(',', $data->getSearchPath()));
$search_path = \htmlspecialchars($_REQUEST['search_path']);
- $sqlquery = \htmlspecialchars($_SESSION['sqlquery']);
+ $sqlquery = \htmlspecialchars($_SESSION['sqlquery']);
- $default_html = $this->printTabs($this->misc->getNavTabs('popup'), 'sql', false);
+ $default_html = $this->printTabs('popup', 'sql', false);
$default_html .= '<form action="' . self::SUBFOLDER . '/src/views/sql" method="post" enctype="multipart/form-data" class="sqlform" id="sqlform" target="detail">';
$default_html .= \PHP_EOL;
@@ -140,13 +140,13 @@ class SqleditController extends BaseController
$this->coalesceArr($_REQUEST, 'filter', '');
- $default_html = $this->printTabs($this->misc->getNavTabs('popup'), 'find', false);
+ $default_html = $this->printTabs('popup', 'find', false);
$default_html .= '<form action="database" method="post" target="detail">' . \PHP_EOL;
$default_html .= $this->printConnection('find', false);
$default_html .= '<p><input class="focusme" name="term" id="term" value="' . \htmlspecialchars($_REQUEST['term']) . "\" size=\"32\" maxlength=\"{$data->_maxNameLen}\" />" . \PHP_EOL;
- $filters = $this->_getFilters();
+ $filters = $this->_getFilters();
$advanced_filters = $this->_getAdvancedFilters();
if (isset($filters[$_REQUEST['filter']])) {
@@ -185,29 +185,29 @@ class SqleditController extends BaseController
private function _getFilters()
{
return [
- 'SCHEMA' => ['langkey' => 'strschemas', 'selected' => ''],
- 'TABLE' => ['langkey' => 'strtables', 'selected' => ''],
- 'VIEW' => ['langkey' => 'strviews', 'selected' => ''],
- 'SEQUENCE' => ['langkey' => 'strsequences', 'selected' => ''],
- 'COLUMN' => ['langkey' => 'strcolumns', 'selected' => ''],
- 'RULE' => ['langkey' => 'strrules', 'selected' => ''],
- 'INDEX' => ['langkey' => 'strindexes', 'selected' => ''],
- 'TRIGGER' => ['langkey' => 'strtriggers', 'selected' => ''],
+ 'SCHEMA' => ['langkey' => 'strschemas', 'selected' => ''],
+ 'TABLE' => ['langkey' => 'strtables', 'selected' => ''],
+ 'VIEW' => ['langkey' => 'strviews', 'selected' => ''],
+ 'SEQUENCE' => ['langkey' => 'strsequences', 'selected' => ''],
+ 'COLUMN' => ['langkey' => 'strcolumns', 'selected' => ''],
+ 'RULE' => ['langkey' => 'strrules', 'selected' => ''],
+ 'INDEX' => ['langkey' => 'strindexes', 'selected' => ''],
+ 'TRIGGER' => ['langkey' => 'strtriggers', 'selected' => ''],
'CONSTRAINT' => ['langkey' => 'strconstraints', 'selected' => ''],
- 'FUNCTION' => ['langkey' => 'strfunctions', 'selected' => ''],
- 'DOMAIN' => ['langkey' => 'strdomains', 'selected' => ''],
+ 'FUNCTION' => ['langkey' => 'strfunctions', 'selected' => ''],
+ 'DOMAIN' => ['langkey' => 'strdomains', 'selected' => ''],
];
}
private function _getAdvancedFilters()
{
return [
- 'AGGREGATE' => ['langkey' => 'straggregates', 'selected' => ''],
- 'TYPE' => ['langkey' => 'strtypes', 'selected' => ''],
- 'OPERATOR' => ['langkey' => 'stroperators', 'selected' => ''],
- 'OPCLASS' => ['langkey' => 'stropclasses', 'selected' => ''],
+ 'AGGREGATE' => ['langkey' => 'straggregates', 'selected' => ''],
+ 'TYPE' => ['langkey' => 'strtypes', 'selected' => ''],
+ 'OPERATOR' => ['langkey' => 'stroperators', 'selected' => ''],
+ 'OPCLASS' => ['langkey' => 'stropclasses', 'selected' => ''],
'CONVERSION' => ['langkey' => 'strconversions', 'selected' => ''],
- 'LANGUAGE' => ['langkey' => 'strlanguages', 'selected' => ''],
+ 'LANGUAGE' => ['langkey' => 'strlanguages', 'selected' => ''],
];
}
}
diff --git a/src/decorators/Decorator.php b/src/decorators/Decorator.php
index a395be8c..0955a2d7 100644
--- a/src/decorators/Decorator.php
+++ b/src/decorators/Decorator.php
@@ -128,7 +128,7 @@ class Decorator
/**
* @param array|null $vars
*/
- public static function actionurl(string $base, ? array $vars = null/* ... */)
+ public static function actionurl($base, ? array $vars = null/* ... */)
{
// If more than one array of vars is given,
// use an ArrayMergeDecorator to have them merged
@@ -146,7 +146,7 @@ class Decorator
/**
* @param array|null $vars
*/
- public static function redirecturl(string $base, ? array $vars = null/* ... */)
+ public static function redirecturl($base, ? array $vars = null/* ... */)
{
// If more than one array of vars is given,
// use an ArrayMergeDecorator to have them merged
@@ -164,7 +164,7 @@ class Decorator
/**
* @param array|null $vars
*/
- public static function url(string $base, ? array $vars = null/* ... */)
+ public static function url($base, ? array $vars = null/* ... */)
{
// If more than one array of vars is given,
// use an ArrayMergeDecorator to have them merged
diff --git a/src/traits/HelperTrait.php b/src/traits/HelperTrait.php
index b71520d5..c761571a 100644
--- a/src/traits/HelperTrait.php
+++ b/src/traits/HelperTrait.php
@@ -203,29 +203,29 @@ trait HelperTrait
*
* @param array ...$args
*/
- public function prtrace(array...$args): void
+ public function prtrace(...$args): void
{
- self::staticTrace($args);
+ self::staticTrace(...$args);
}
/**
- * { function_description }.
+ * Just a proxy for prtrace.
*
* @param array ...$args The arguments
*/
- public function dump(array...$args): void
+ public function dump(...$args): void
{
- self::staticTrace($args);
+ self::staticTrace(...$args);
}
- /**
+ /**Claveunica.,219
* Dumps and die.
*
* @param array ...$args The arguments
*/
- public function dumpAndDie(array...$args): void
+ public function dumpAndDie(...$args): void
{
- self::staticTrace($args);
+ self::staticTrace(...$args);
exit();
}