Browse Source

Merge pull request #2140 from TechEmpower/master

Merging master changes into round-14
Nate 9 years ago
parent
commit
9b5ed44d08

+ 1 - 1
frameworks/PHP/cygnite-php-framework/apps/configs/application.php

@@ -73,7 +73,7 @@ return array(
     * Example :
     * environment => 'development/production'
     */
-    'environment' => 'production', //Errors are turned on in development environment
+    'environment' => 'production',//Errors are turned on in development environment
 
     /*
     *--------------------------------------------------------------------------

+ 1 - 1
frameworks/PHP/cygnite-php-framework/boot/initialize.php

@@ -32,7 +32,7 @@ if (php_sapi_name() === 'cli-server' && is_file($filename)) {
 */
 $app = \Cygnite\Foundation\Application::instance();
 
-$app->importHelpers();
+//$app->importHelpers();
 /*
 |--------------------------------------------------------------------------
 | Attach Exception handler to Event Listener

+ 2 - 1
frameworks/PHP/cygnite-php-framework/composer.json

@@ -19,7 +19,8 @@
             "apps/models",
             "apps/components" ,
             "apps/extensions"
-        ]
+        ],
+		"files": ["vendor/cygnite/framework/src/Cygnite/Helpers/Support.php"]
     },
     "config": {
         "preferred-install": "dist"