detect and report database errors

Author: alexweissman

userfrosting/initialize.php

@@ -139,6 +139,7 @@ class_alias("UserFrosting\MySqlSiteSettings",   "UserFrosting\SiteSettings");
     ]
 ];
 
+// Load site settings
 $app->site = new \UserFrosting\SiteSettings($setting_values, $setting_descriptions);
 
 // Store to DB if not consistent
@@ -188,7 +189,7 @@ class_alias("UserFrosting\MySqlSiteSettings",   "UserFrosting\SiteSettings");
 
 // Custom error-handler: send a generic message to the client, but put the specific error info in the error log.
 // A Slim application uses its built-in error handler if its debug setting is true; otherwise, it uses the custom error handler.
-$app->error(function (\Exception $e) use ($app) {
+$app->error(function (\Exception $e) use ($app) {    
     if ($app->alerts && is_object($app->alerts) && $app->translator)
         $app->alerts->addMessageTranslated("danger", "SERVER_ERROR");
     error_log("Error in " . $e->getFile() . " on line " . $e->getLine() . ": " . $e->getMessage());

userfrosting/models/DatabaseInvalidException.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace UserFrosting;
+
+/**
+ * Invalid Database Exception.
+ */
+class DatabaseInvalidException extends \Exception {
+    /**
+     * Public constructor.
+     */
+    public function __construct($message, $code, $previous)
+    {
+        $message = 'The database is in an invalid state: ' . $message;
+        parent::__construct($message, 500, $previous);
+    }
+}

userfrosting/models/mysql/MySqlDatabase.php

@@ -20,10 +20,15 @@ public static function connection(){
         $db_host = static::$app->config('db')['db_host'];
         $db_name = static::$app->config('db')['db_name'];
 
-        $db = new \PDO("mysql:host=$db_host;dbname=$db_name;charset=utf8", static::$app->config('db')['db_user'], static::$app->config('db')['db_pass']);
-        $db->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
-        $db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);       // Let this function throw a PDO exception if it cannot connect.
-        return $db;    
+        try {
+            $db = new \PDO("mysql:host=$db_host;dbname=$db_name;charset=utf8", static::$app->config('db')['db_user'], static::$app->config('db')['db_pass']);
+            $db->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
+            $db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);       // Let this function throw a PDO exception if it cannot connect.
+            return $db;
+        } catch (\PDOException $e){
+            echo "We can't seem to connect to the database!  Please check your database credentials in config-userfrosting.php.";
+            //throw new DatabaseInvalidException($e->getMessage(), $e->getStatus(), $e->getPrevious());
+        }
     }
 
     /**

userfrosting/vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitd055b96a2ee195553d40749aab9168c6::getLoader();
+return ComposerAutoloaderInit153b8801bb6221bd4c1eaa8fb1197815::getLoader();

userfrosting/vendor/composer/autoload_classmap.php

@@ -30,6 +30,7 @@
     'UserFrosting\\AuthorizationException' => $baseDir . '/auth/AuthorizationException.php',
     'UserFrosting\\BaseController' => $baseDir . '/controllers/BaseController.php',
     'UserFrosting\\DatabaseInterface' => $baseDir . '/models/DatabaseInterface.php',
+    'UserFrosting\\DatabaseInvalidException' => $baseDir . '/models/DatabaseInvalidException.php',
     'UserFrosting\\DatabaseObjectInterface' => $baseDir . '/models/DatabaseInterface.php',
     'UserFrosting\\DatabaseTable' => $baseDir . '/models/DatabaseTable.php',
     'UserFrosting\\GroupController' => $baseDir . '/controllers/GroupController.php',

userfrosting/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitd055b96a2ee195553d40749aab9168c6
+class ComposerAutoloaderInit153b8801bb6221bd4c1eaa8fb1197815
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitd055b96a2ee195553d40749aab9168c6', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit153b8801bb6221bd4c1eaa8fb1197815', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitd055b96a2ee195553d40749aab9168c6', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit153b8801bb6221bd4c1eaa8fb1197815', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@ public static function getLoader()
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequired055b96a2ee195553d40749aab9168c6($file);
+            composerRequire153b8801bb6221bd4c1eaa8fb1197815($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequired055b96a2ee195553d40749aab9168c6($file)
+function composerRequire153b8801bb6221bd4c1eaa8fb1197815($file)
 {
     require $file;
 }