More quotes rewritten

diff --git a/inc/classes.php b/inc/classes.php
index 9d1af75d4a9dd09d19e76f921dd86c46e0220754..6be9fab0ce71529da3c62763cf4717be74cf8cbf 100644 (file)
--- a/inc/classes.php
+++ b/inc/classes.php
@@ -23,16 +23,16 @@
 
 // Lower framework classes
 $lowerClasses = array(
-       0 => 'exceptions', // Exceptions
-       1 => 'interfaces', // Interfaces
-       2 => 'main',       // General main classes
-       3 => 'middleware'  // The middleware
+       'exceptions', // Exceptions
+       'interfaces', // Interfaces
+       'main',       // General main classes
+       'middleware'  // The middleware
 );
 
 // Load all classes
 foreach ($lowerClasses as $className) {
        // Try to load the framework classes
-       ClassLoader::getInstance()->scanClassPath(sprintf("inc/classes/%s/", $className));
+       ClassLoader::getInstance()->scanClassPath('inc/classes/' . $className . '/');
 } // END - foreach
 
 // Clean up the global namespace

diff --git a/inc/classes/middleware/database/class_DatabaseConnection.php b/inc/classes/middleware/database/class_DatabaseConnection.php
index f94e20e4d7587863083a872de58349d483b0084d..20a1e14df7c2a2fd981b11616a462b6191ea7e9e 100644 (file)
--- a/inc/classes/middleware/database/class_DatabaseConnection.php
+++ b/inc/classes/middleware/database/class_DatabaseConnection.php
@@ -108,10 +108,10 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
        }
 
        /**
-        * Runs a "select" statement on the database layer with given table name
+        * Runs a 'select' statement on the database layer with given table name
         * and criteria. If this doesn't fail the result will be returned
         *
-        * @param       $tableName                      Name of the "table" we shall query
+        * @param       $tableName                      Name of the 'table' we shall query
         * @param       $criteriaInstance       An instance of a Criteria class
         * @return      $result                         The result as an array
         */
@@ -120,7 +120,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
                $this->dbLayer->connectToDatabase();
 
                // Get result from query
-               $result = $this->dbLayer->querySelect("array", $tableName, $criteriaInstance);
+               $result = $this->dbLayer->querySelect('array', $tableName, $criteriaInstance);
 
                // Return the result
                return $result;
@@ -137,7 +137,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
        }
 
        /**
-        * "Inserts" a data set instance into a local file database folder
+        * 'Inserts' a data set instance into a local file database folder
         *
         * @param       $dataSetInstance        A storeable data set
         * @return      void
@@ -151,7 +151,7 @@ class DatabaseConnection extends BaseMiddleware implements DatabaseConnector, Re
        }
 
        /**
-        * "Updates" a data set instance with a database layer
+        * 'Updates' a data set instance with a database layer
         *
         * @param       $dataSetInstance        A storeable data set
         * @return      void

diff --git a/inc/classes/middleware/debug/class_DebugMiddleware.php b/inc/classes/middleware/debug/class_DebugMiddleware.php
index 8d25477eca28c459171c86131b3fe43e2e92ee95..743972c807a18f21442b9f880c48f257f24299ac 100644 (file)
--- a/inc/classes/middleware/debug/class_DebugMiddleware.php
+++ b/inc/classes/middleware/debug/class_DebugMiddleware.php
@@ -100,7 +100,7 @@ class DebugMiddleware extends BaseMiddleware implements Registerable {
         * browser or debug lines for a log file, etc. to the registered debug
         * output instance.
         *
-        * @param       $outStream      Data we shall "stream" out to the world
+        * @param       $outStream      Data we shall 'stream' out to the world
         * @return      void
         */
        public final function output ($outStream) {

diff --git a/inc/database.php b/inc/database.php
index 544a2a55dc3f51f4b487336b620d4953c8b05b0f..b9f40fa65476b01527c70577a9b79893124a9035 100644 (file)
--- a/inc/database.php
+++ b/inc/database.php
@@ -29,15 +29,15 @@ $layerInstance = null;
 $cfg = FrameworkConfiguration::getInstance();
 
 // Generate FQFN for the database layer
-$INC = sprintf("%sinc/database/lib-%s.php",
+$fqfn = sprintf("%sinc/database/lib-%s.php",
        $cfg->readConfig('base_path'),
        $cfg->readConfig('db_type')
 );
 
 // Load the database layer include
-if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
+if ((file_exists($fqfn)) && (is_file($fqfn)) && (is_readable($fqfn))) {
        // Load the layer
-       require_once($INC);
+       require_once($fqfn);
 } else {
        // Layer is missing!
        ApplicationEntryPoint::app_die(sprintf("[Main:] Database layer is missing! (%s) -> R.I.P.",
@@ -46,7 +46,7 @@ if ((file_exists($INC)) && (is_file($INC)) && (is_readable($INC))) {
 }
 
 // Clean it up
-unset($INC);
+unset($fqfn);
 
 // Prepare database instance
 $db = DatabaseConnection::createDatabaseConnection(DebugMiddleware::getInstance(), $layerInstance);

diff --git a/inc/includes.php b/inc/includes.php
index 61e8bb971e5f0cce769619492a337cd0e9bcff84..20128dbb0776595cae72ce0fbada5d5bde649aee 100644 (file)
--- a/inc/includes.php
+++ b/inc/includes.php
@@ -26,7 +26,7 @@
 $cfg = FrameworkConfiguration::getInstance();
 
 // Include the class loader function
-require(sprintf("%sinc/loader/class_ClassLoader.php", $cfg->readConfig('base_path')));
+require($cfg->readConfig('base_path') . 'inc/loader/class_ClassLoader.php');
 
 // Shall we include additional configs where you can configure some things? Then
 // Load matching config
@@ -67,7 +67,7 @@ spl_autoload_register('ClassLoader::autoLoad');
 /**
  * Is the devel package included?
  */
-if (is_dir(sprintf("%sdevel", $cfg->readConfig('base_path')))) {
+if (is_dir($cfg->readConfig('base_path') . "devel")) {
        /**
         * Load all development includes
         */

diff --git a/inc/selector.php b/inc/selector.php
index 96ed550565c366e5b7bcb965e8b06162236617f9..33a4fa966e7a05e6d33ef2aeaca489539a3cb902 100644 (file)
--- a/inc/selector.php
+++ b/inc/selector.php
@@ -27,7 +27,7 @@ $cfg = FrameworkConfiguration::getInstance();
 
 // Try to load these includes in the given order
 $configAppIncludes = array(
-       sprintf("class_%s", $cfg->readConfig('app_helper_class')), // The ApplicationHelper class
+       'class_' . $cfg->readConfig('app_helper_class'), // The ApplicationHelper class
        'config',               // The application's own configuration
        'data',                 // Application data
        'init',                 // The application initializer