Changeset 699

Timestamp:

Aug 8, 2019 10:38:24 PM (5 years ago)

Author:

anonymous

Message:

Add support for PHP >=5.6 <=7.3. Add MySQL polyfill.

Location:

trunk

Files:

• bin/init_codebase_tables.cli.php (modified) (1 diff)
• composer.json (modified) (1 diff)
• docs/version.txt (modified) (1 diff)
• lib/App.inc.php (modified) (2 diffs)
• polyfill (added)
• polyfill/functions.inc.php (added)
• polyfill/mysql.inc.php (added)

trunk/bin/init_codebase_tables.cli.php

@@ -172 +172 @@
             // DBSessionHandler!
 
-            // We need to hack the app to allow sessions to run in a CLI.
-            $app->stop();
-            $app->cli = false;
-            $app->setParam(array('enable_session' => true));
-            $app->start();
+            if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+                // We need to hack the app to allow sessions to run in a CLI.
+                $app->stop();
+                $app->cli = false;
+                $app->setParam(array('enable_session' => true));
+                $app->start();
+            }
 
             if (!isset($opt['c'])) {

trunk/composer.json

@@ -13 +13 @@
     ],
     "require": {
-        "php": "^5.3.7"
+        "php": ">=5.6 <=7.3"
     },
     "require-dev": {

trunk/docs/version.txt

@@ -1 @@
-2.2.5
+2.3.0

trunk/lib/App.inc.php

@@ -455 +455 @@
             // Only create a legacy mysql_* DB object if it is explicitly requested.
             if (true === $this->getParam('enable_db')) {
+                require_once dirname(__FILE__) . '/../polyfill/mysql.inc.php';
                 require_once dirname(__FILE__) . '/DB.inc.php';
                 $this->db =& DB::getInstance();
@@ -648 +649 @@
         $this->running = false;
         $num_queries = 0;
-        if (is_a($this->db, 'DB') && true === $this->getParam('enable_db')) {
-            $num_queries = $this->db->numQueries();
+        if ($this->db instanceof \DB && true === $this->getParam('enable_db')) {
+            $num_queries += $this->db->numQueries();
+            if ($num_queries > 0 && true === $this->getParam('enable_db_pdo')) {
+                // If the app wants to use PDO, warn if any legacy db queries are made.
+                $this->logMsg(sprintf('%s queries using legacy DB functions', $num_queries), LOG_WARNING, __FILE__, __LINE__);
+            }
             $this->db->close();
+        }
+        if ($this->pdo instanceof \Strangecode\Codebase\PDO && (true === $this->getParam('enable_db') || true === $this->getParam('enable_db_pdo'))) {
+            $num_queries += $this->pdo->numQueries();
+            $this->pdo->close();
         }
         $mem_current = memory_get_usage();