HuasoFoundries / phpPgAdmin6

src/classes/Highlight.php

Spacing +20 added lines, -23 removed lines

@@ -90,7 +90,7 @@ 
         public function __construct()
         {
 
-            $keyword_replace = function ($keywords, $text, $ncs = false) {
+            $keyword_replace = function($keywords, $text, $ncs = false) {
                 $cm = $ncs ? 'i' : '';
                 foreach ($keywords as $keyword) {
                     $search[]  = "/(\\b$keyword\\b)/" . $cm;
@@ -103,7 +103,7 @@ 
                 return preg_replace($search, $replace, $text);
             };
 
-            $preproc_replace = function ($preproc, $text) {
+            $preproc_replace = function($preproc, $text) {
                 foreach ($preproc as $proc) {
                     $search[]  = "/(\\s*#\s*$proc\\b)/";
                     $replace[] = '<span class="keyword">\\0</span>';
@@ -112,11 +112,11 @@ 
                 return preg_replace($search, $replace, $text);
             };
 
-            $sch_syntax_helper = function ($text) {
+            $sch_syntax_helper = function($text) {
                 return $text;
             };
 
-            $syntax_highlight_helper = function ($text, $language) use ($keyword_replace, $preproc_replace) {
+            $syntax_highlight_helper = function($text, $language) use ($keyword_replace, $preproc_replace) {
                 $preproc        = [];
                 $preproc['C++'] = [
                     'if',
@@ -1921,66 +1921,64 @@ 
                     'PL/I'   => true,
                     'SQL'    => true,
                 ];
-                $ncs              = false;
+                $ncs = false;
                 if (array_key_exists($language, $case_insensitive)) {
                     $ncs = true;
                 }
 
                 $text = array_key_exists($language, $preproc) ?
-                    $preproc_replace($preproc[$language], $text) :
-                    $text;
+                    $preproc_replace($preproc[$language], $text) : $text;
                 $text = array_key_exists($language, $keywords) ?
-                    $keyword_replace($keywords[$language], $text, $ncs) :
-                    $text;
+                    $keyword_replace($keywords[$language], $text, $ncs) : $text;
 
                 return $text;
             };
 
-            $rtrim1 = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $rtrim1 = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper(substr($span, 0, -1), $lang);
             };
 
-            $rtrim1_htmlesc = function ($span, $lang, $ch) {
+            $rtrim1_htmlesc = function($span, $lang, $ch) {
                 return htmlspecialchars(substr($span, 0, -1));
             };
 
-            $sch_rtrim1 = function ($span, $lang, $ch) use ($sch_syntax_helper) {
+            $sch_rtrim1 = function($span, $lang, $ch) use ($sch_syntax_helper) {
                 return $sch_syntax_helper(substr($span, 0, -1));
             };
 
-            $rtrim2 = function ($span, $lang, $ch) {
+            $rtrim2 = function($span, $lang, $ch) {
                 return substr($span, 0, -2);
             };
 
-            $syn_proc = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $syn_proc = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper($span, $lang);
             };
 
-            $dash_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $dash_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper('-' . $span, $lang);
             };
 
-            $slash_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $slash_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper('/' . $span, $lang);
             };
 
-            $slash_putback_rtrim1 = function ($span, $lang, $ch) use ($rtrim1) {
+            $slash_putback_rtrim1 = function($span, $lang, $ch) use ($rtrim1) {
                 return $rtrim1('/' . $span, $lang, $ch);
             };
 
-            $lparen_putback = function ($span, $lang, $ch) use ($syntax_highlight_helper) {
+            $lparen_putback = function($span, $lang, $ch) use ($syntax_highlight_helper) {
                 return $syntax_highlight_helper('(' . $span, $lang);
             };
 
-            $lparen_putback_rtrim1 = function ($span, $lang, $ch) use ($rtrim1) {
+            $lparen_putback_rtrim1 = function($span, $lang, $ch) use ($rtrim1) {
                 return $rtrim1('(' . $span, $lang, $ch);
             };
 
-            $prepend_xml_opentag = function ($span, $lang, $ch) {
+            $prepend_xml_opentag = function($span, $lang, $ch) {
                 return '<span class="xml_tag">&lt;' . $span;
             };
 
-            $proc_void = function ($span, $lang, $ch) {
+            $proc_void = function($span, $lang, $ch) {
                 return $span;
             };
 
@@ -2442,8 +2440,7 @@ 
 
                 $oldstate = $state;
                 $state    = array_key_exists($ch, $this->states[$language][$state]) ?
-                    $this->states[$language][$state][$ch] :
-                    $this->states[$language][$state][0];
+                    $this->states[$language][$state][$ch] : $this->states[$language][$state][0];
 
                 $span .= $ch;
 

src/database/Postgres83.php

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
             $status = -1; // ini
             if ($rs->recordCount() and ($rs->fields['vacrelid'] == $toid)) {
                 // table exists in pg_autovacuum, UPDATE
-                $sql    = sprintf("UPDATE \"pg_catalog\".\"pg_autovacuum\" SET
+                $sql = sprintf("UPDATE \"pg_catalog\".\"pg_autovacuum\" SET
 						enabled = '%s',
 						vac_base_thresh = %s,
 						vac_scale_factor = %s,

src/database/ADOdbBase.php

Spacing +1 added lines, -1 removed lines

@@ -394,7 +394,7 @@
         // Pick out array entries by carefully parsing.  This is necessary in order
         // to cope with double quotes and commas, etc.
         $elements  = [];
-        $i         = $j         = 0;
+        $i         = $j = 0;
         $in_quotes = false;
         while ($i < strlen($arr)) {
             // If current char is a double quote and it's not escaped, then

src/database/Postgres.php

Spacing +1 added lines, -1 removed lines

@@ -2075,7 +2075,7 @@
         // Pick out individual ACE's by carefully parsing.  This is necessary in order
         // to cope with usernames and stuff that contain commas
         $aces      = [];
-        $i         = $j         = 0;
+        $i         = $j = 0;
         $in_quotes = false;
         while ($i < strlen($acl)) {
             // If current char is a double quote and it's not escaped, then

src/controllers/TypesController.php

Spacing +1 added lines, -1 removed lines

@@ -248,7 +248,7 @@
         $this->printTitle($lang['strproperties'], 'pg.type');
         $this->printMsg($msg);
 
-        $attPre = function (&$rowdata) use ($data) {
+        $attPre = function(&$rowdata) use ($data) {
             $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
         };
 

src/database/Postgres81.php

Spacing +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
             $status = -1; // ini
             if ($rs->recordCount() and ($rs->fields['vacrelid'] == $toid)) {
                 // table exists in pg_autovacuum, UPDATE
-                $sql    = sprintf("UPDATE \"pg_catalog\".\"pg_autovacuum\" SET
+                $sql = sprintf("UPDATE \"pg_catalog\".\"pg_autovacuum\" SET
 						enabled = '%s',
 						vac_base_thresh = %s,
 						vac_scale_factor = %s,

src/controllers/TblpropertiesController.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
         $lang = $this->lang;
         $data = $misc->getDatabaseAccessor();
 
-        $attPre = function (&$rowdata, $actions) use ($data) {
+        $attPre = function(&$rowdata, $actions) use ($data) {
             $rowdata->fields['+type'] = $data->formatType($rowdata->fields['type'], $rowdata->fields['atttypmod']);
             $attname                  = $rowdata->fields['attname'];
             $table                    = $_REQUEST['table'];
@@ -111,7 +111,7 @@ 
             return $actions;
         };
 
-        $cstrRender = function ($s, $p) use ($misc, $data) {
+        $cstrRender = function($s, $p) use ($misc, $data) {
             $str = '';
             foreach ($p['keys'] as $k => $c) {
                 if (is_null($p['keys'][$k]['consrc'])) {

src/lib.inc.php

Spacing +10 added lines, -10 removed lines

@@ -103,12 +103,12 @@ 
 $container['requestobj']  = $container['request'];
 $container['responseobj'] = $container['response'];
 
-$container['utils'] = function ($c) {
+$container['utils'] = function($c) {
     $utils = new \PHPPgAdmin\ContainerUtils($c);
     return $utils;
 };
 
-$container['conf'] = function ($c) use ($conf) {
+$container['conf'] = function($c) use ($conf) {
 
     //\Kint::dump($conf);
     // Plugins are removed
@@ -117,7 +117,7 @@ 
     return $conf;
 };
 
-$container['lang'] = function ($c) {
+$container['lang'] = function($c) {
     include_once BASE_PATH . '/src/translations.php';
 
     $c['appLangFiles'] = $appLangFiles;
@@ -127,12 +127,12 @@ 
     return $lang;
 };
 
-$container['plugin_manager'] = function ($c) {
+$container['plugin_manager'] = function($c) {
     $plugin_manager = new \PHPPgAdmin\PluginManager($c);
     return $plugin_manager;
 };
 
-$container['serializer'] = function ($c) {
+$container['serializer'] = function($c) {
     $serializerbuilder = \JMS\Serializer\SerializerBuilder::create();
     $serializer        = $serializerbuilder
         ->setCacheDir(BASE_PATH . '/temp/jms')
@@ -142,7 +142,7 @@ 
 };
 
 // Create Misc class references
-$container['misc'] = function ($c) {
+$container['misc'] = function($c) {
     $misc = new \PHPPgAdmin\Misc($c);
 
     $conf = $c->get('conf');
@@ -240,7 +240,7 @@ 
 };
 
 // Register Twig View helper
-$container['view'] = function ($c) {
+$container['view'] = function($c) {
     $conf = $c->get('conf');
     $misc = $c->misc;
 
@@ -276,8 +276,8 @@ 
     return $view;
 };
 
-$container['haltHandler'] = function ($c) {
-    return function ($request, $response, $exits, $status = 500) use ($c) {
+$container['haltHandler'] = function($c) {
+    return function($request, $response, $exits, $status = 500) use ($c) {
         $title = 'PHPPgAdmin Error';
 
         $html = '<p>The application could not run because of the following error:</p>';
@@ -307,7 +307,7 @@ 
 
 // Set the requestobj and responseobj properties of the container
 // as the value of $request and $response, which already contain the route
-$app->add(function ($request, $response, $next) {
+$app->add(function($request, $response, $next) {
     $this['requestobj']  = $request;
     $this['responseobj'] = $response;
 

index.php

Spacing +9 added lines, -9 removed lines

@@ -5,13 +5,13 @@ 
  */
 require_once './src/lib.inc.php';
 
-$app->get('/status', function ($request, $response, $args) {
+$app->get('/status', function($request, $response, $args) {
     return $response
         ->withHeader('Content-type', 'application/json')
         ->withJson(['version' => $this->version]);
 });
 
-$app->post('/redirect[/{subject}]', function ($request, $response, $args) {
+$app->post('/redirect[/{subject}]', function($request, $response, $args) {
     $body         = $response->getBody();
     $query_string = $request->getUri()->getQuery();
     $misc         = $this->misc;
@@ -56,33 +56,33 @@ 
     }
 });
 
-$app->get('/redirect[/{subject}]', function ($request, $response, $args) {
+$app->get('/redirect[/{subject}]', function($request, $response, $args) {
     $subject        = (isset($args['subject'])) ? $args['subject'] : 'root';
     $destinationurl = $this->utils->getDestinationWithLastTab($subject);
     return $response->withStatus(302)->withHeader('Location', $destinationurl);
 });
 
-$app->get('/src/views/browser', function ($request, $response, $args) {
+$app->get('/src/views/browser', function($request, $response, $args) {
     $controller = new \PHPPgAdmin\Controller\BrowserController($this, true);
     return $controller->render();
 });
 
-$app->get('/src/views/login', function ($request, $response, $args) {
+$app->get('/src/views/login', function($request, $response, $args) {
     $controller = new \PHPPgAdmin\Controller\LoginController($this, true);
     return $controller->render();
 });
 
-$app->get('/src/views/servers', function ($request, $response, $args) {
+$app->get('/src/views/servers', function($request, $response, $args) {
     $controller = new \PHPPgAdmin\Controller\ServersController($this, true);
     return $controller->render();
 });
 
-$app->get('/src/views/intro', function ($request, $response, $args) {
+$app->get('/src/views/intro', function($request, $response, $args) {
     $controller = new \PHPPgAdmin\Controller\IntroController($this, true);
     return $controller->render();
 });
 
-$app->map(['GET', 'POST'], '/src/views/{subject}', function ($request, $response, $args) {
+$app->map(['GET', 'POST'], '/src/views/{subject}', function($request, $response, $args) {
     if ($this->misc->getServerId() === null) {
         return $response->withStatus(302)->withHeader('Location', SUBFOLDER . '/src/views/servers');
     }
@@ -100,7 +100,7 @@ 
     return $controller->render();
 });
 
-$app->get('/[{subject}]', function ($request, $response, $args) {
+$app->get('/[{subject}]', function($request, $response, $args) {
     $subject      = (isset($args['subject'])) ? $args['subject'] : 'intro';
     $_server_info = $this->misc->getServerInfo();
     $query_string = $request->getUri()->getQuery();