AdoRecordSet implements countable

Author: ffflabs

.gitignore

@@ -24,4 +24,5 @@ temp/sessions/*
 
 config.inc.php
 config.yml
-tests/_output
+tests/_output
+debug.*.php

src/classes/ADORecordSet.php

@@ -18,6 +18,10 @@
  *
  * @package PHPPgAdmin
  */
-class ADORecordSet extends \ADORecordSet
+class ADORecordSet extends \ADORecordSet implements \Countable
 {
+    public function count()
+    {
+        return $this->recordCount();
+    }
 }

src/classes/ContainerUtils.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * PHPPgAdmin v6.0.0-RC9
+ * PHPPgAdmin v6.0.0-RC8
  */
 
 namespace PHPPgAdmin;
@@ -82,24 +82,43 @@ public function __construct()
         $this->container = $container;
     }
 
-    public static function createContainer()
+    public static function createContainer($conf)
     {
         if (!self::$instance) {
             self::$instance = new self();
         }
 
-        $display_sizes = $conf['display_sizes'] ?? false;
+        // Complete missing conf keys
+        self::$instance->container['conf'] = function ($c) use ($conf) {
+            $display_sizes = $conf['display_sizes'] ?? false;
 
-        $conf['display_sizes'] = [
+            $conf['display_sizes'] = [
                 'schemas' => (bool) $display_sizes,
                 'tables'  => (bool) $display_sizes,
             ];
-        if (is_array($display_sizes)) {
-            $conf['display_sizes'] = [
+            if (is_array($display_sizes)) {
+                $conf['display_sizes'] = [
                     'schemas' => $display_sizes['schemas'] ?? in_array('schemas', $display_sizes, true),
                     'tables'  => $display_sizes['tables'] ?? in_array('tables', $display_sizes, true),
                 ];
-        }
+            }
+
+            // Plugins are removed
+            $conf['plugins'] = [];
+            if (!isset($conf['theme'])) {
+                $conf['theme'] = 'default';
+            }
+            foreach ($conf['servers'] as &$server) {
+                if (!isset($server['port'])) {
+                    $server['port'] = 5432;
+                }
+                if (!isset($server['sslmode'])) {
+                    $server['sslmode'] = 'unspecified';
+                }
+            }
+
+            return $conf;
+        };
 
         return [self::$instance->container, self::$instance->app];
     }

src/lib.inc.php

@@ -15,6 +15,7 @@
     die('Your temp folder must have write permissions (use chmod 777 temp -R on linux)');
 }
 require_once BASE_PATH . '/vendor/autoload.php';
+
 // Check to see if the configuration file exists, if not, explain
 if (file_exists(BASE_PATH . '/config.inc.php')) {
     $conf = [];
@@ -54,7 +55,7 @@
 }
 
 // Fetch App and DI Container
-list($container, $app) = \PHPPgAdmin\ContainerUtils::createContainer();
+list($container, $app) = \PHPPgAdmin\ContainerUtils::createContainer($conf);
 
 if ($container instanceof \Psr\Container\ContainerInterface) {
     if (PHP_SAPI == 'cli-server') {
@@ -82,27 +83,6 @@
     return new \Slim\Flash\Messages();
 };
 
-// Complete missing conf keys
-$container['conf'] = function ($c) use ($conf) {
-
-    //\Kint::dump($conf);
-    // Plugins are removed
-    $conf['plugins'] = [];
-    if (!isset($conf['theme'])) {
-        $conf['theme'] = 'default';
-    }
-    foreach ($conf['servers'] as &$server) {
-        if (!isset($server['port'])) {
-            $server['port'] = 5432;
-        }
-        if (!isset($server['sslmode'])) {
-            $server['sslmode'] = 'unspecified';
-        }
-    }
-
-    return $conf;
-};
-
 $container['lang'] = function ($c) {
     $translations = new \PHPPgAdmin\Translations($c);