Skip to content
Browse files

Merge pull request #79 from xt99/master

typos fixes
  • Loading branch information...
2 parents 8f029d0 + 9e520b0 commit df412edab2e62b29c0625d167ac85ad590f1c88b @hijarian hijarian committed Jun 9, 2014
View
9 backend/config/main.php
@@ -1,17 +1,16 @@
<?php
/**
- * This is where the ultimate config for frontend entry point is being constructed.
+ * This is where the ultimate config for backend entry point is being constructed.
* Four parts are used in it:
* 1. Global config defined in `common/config/main.php`
* Note that this config itself is assembled the same way from three parts.
- * 2. Base overrides for frontend entry point.
- * 3. Possible current environment-specific overrides for frontend entry point
- * 4. Possible local overrides for frontend entry point.
+ * 2. Base overrides for backend entry point.
+ * 3. Possible current environment-specific overrides for backend entry point
+ * 4. Possible local overrides for backend entry point.
*/
return CMap::mergeArray(
(require ROOT_DIR . '/common/config/main.php'),
(require __DIR__ . '/overrides/base.php'),
(file_exists(__DIR__ . '/overrides/environment.php') ? require(__DIR__ . '/overrides/environment.php') : array()),
(file_exists(__DIR__ . '/overrides/local.php') ? require(__DIR__ . '/overrides/local.php') : array())
);
-
View
6 backend/www/index.php
@@ -7,7 +7,7 @@
*/
# Loading project default init code for all entry points.
-require __DIR__.'/../../common/bootstrap.php';
+require __DIR__ . '/../../common/bootstrap.php';
# Setting up the frontend-specific aliases
Yii::setPathOfAlias('backend', ROOT_DIR .'/backend');
@@ -18,11 +18,11 @@
Yii::setPathOfAlias('bootstrap', ROOT_DIR . '/vendor/clevertech/yii-booster/src');
# We use our custom-made WebApplication component as base class for backend app.
-require_once ROOT_DIR.'/backend/components/BackendWebApplication.php';
+require_once ROOT_DIR . '/backend/components/BackendWebApplication.php';
# For obvious reasons, backend entry point is constructed of specialised WebApplication and config
Yii::createApplication(
'BackendWebApplication',
- ROOT_DIR.'/backend/config/main.php'
+ ROOT_DIR . '/backend/config/main.php'
)->run();
View
2 common/bootstrap.php
@@ -31,7 +31,7 @@
date_default_timezone_set('UTC');
# Set the internal character encoding
-mb_internal_encoding("UTF-8");
+mb_internal_encoding('UTF-8');
# We're in XXI century, so let's use modern locale already
setlocale(
View
4 common/check_prod_mode.php
@@ -4,7 +4,7 @@
* where we should compile all configs, combine assets,
* disable error output, switch logging modes and do all other fun stuff.
*
- * NOTE that we use ROOT_DIR here so this file has to be required after the `init.php`
+ * NOTE that we use ROOT_DIR here so this file has to be required after the `bootstrap.php`
* or within it.
*
* This script intentionally returns a boolean.
@@ -19,4 +19,4 @@
file_exists(ROOT_DIR . '/PRODUCTION_MODE') or
(bool)@$_ENV['PRODUCTION_MODE'] or
(bool)@$_SERVER['PRODUCTION_MODE']
-);
+);
View
4 common/config/environments/prod.php
@@ -1,8 +1,6 @@
<?php
/**
- * Overrides for all entry points on local development workstations.
- * Note that this is NOT your personal overrides like the passwords.
- * Such changes should end in `/common/overrides/local.php`
+ * Specific config overrides common to all entry points at production server.
*/
return [
'params' => ['env.code' => 'prod']
View
2 console/commands/EnvironmentCommand.php
@@ -57,7 +57,7 @@ public function getHelp()
Please note that environment configuration is not your local development settings like the connection settings
for DBMS at your workstation. It's the config which will be put into the VCS repo and is intended mainly
to differentiate between the production setup where massive micro-optimization and no debug is expected
- and development setup where the situation is quite the opposite.
+ and development setup where the situation is quite the opposite.\n
EOD;
}
View
2 console/config/main.php
@@ -5,7 +5,7 @@
* 1. Global config defined in `common/config/main.php`
* Note that this config itself is assembled the same way from three parts.
* 2. Base overrides for console entry point.
- * 3. Possible current environment-specific overrides for console entry point
+ * 3. Possible current environment-specific overrides for console entry point.
* 4. Possible local overrides for console entry point.
*/
return CMap::mergeArray(
View
2 console/config/overrides/local.example.php
@@ -1,6 +1,8 @@
<?php
/**
* Your personal overrides for console entry point.
+ *
+ * Copy this example file in the same directory but renaming it to just `local.php`
*/
return [
// Normally you have absolutely no reason to override anything in console entry point just for yourself.
View
4 console/yiic.php
@@ -13,9 +13,9 @@
/** @var ConsoleApplication $app */
$app = Yii::createApplication(
'ConsoleApplication',
- ROOT_DIR.'/console/config/main.php'
+ ROOT_DIR . '/console/config/main.php'
);
-$app->commandRunner->addCommands(YII_PATH.'/cli/commands');
+$app->commandRunner->addCommands(YII_PATH . '/cli/commands');
$app->commandRunner->addCommands(@getenv('YII_CONSOLE_COMMANDS'));
$app->run();
View
6 frontend/www/index.php
@@ -7,18 +7,18 @@
*/
# Loading project default init code for all entry points.
-require __DIR__.'/../../common/bootstrap.php';
+require __DIR__ . '/../../common/bootstrap.php';
# Setting up the frontend-specific aliases
Yii::setPathOfAlias('frontend', ROOT_DIR .'/frontend');
Yii::setPathOfAlias('www', ROOT_DIR . '/frontend/www');
# We use our custom-made WebApplication component as base class for frontend app.
-require_once ROOT_DIR.'/frontend/components/FrontendWebApplication.php';
+require_once ROOT_DIR . '/frontend/components/FrontendWebApplication.php';
# For obvious reasons, backend entry point is constructed of specialised WebApplication and config
Yii::createApplication(
'FrontendWebApplication',
- ROOT_DIR.'/frontend/config/main.php'
+ ROOT_DIR . '/frontend/config/main.php'
)->run();

0 comments on commit df412ed

Please sign in to comment.
Something went wrong with that request. Please try again.