Skip to content

Commit 876bed5

Browse files
dmitriyhadmitriyha
committed
open sourcing namespace conversion
1 parent 46d5ab0 commit 876bed5

File tree

8 files changed

+166
-167
lines changed

8 files changed

+166
-167
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/nbproject/*

‎Module.php‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1-
<?php
2-
3-
namespace libs8000\consoleutils;
4-
5-
/**
6-
* libs8000 module definition class
7-
*/
8-
class Module extends \yii\base\Module
9-
{
10-
/**
11-
* @inheritdoc
12-
*/
13-
public $controllerNamespace = 'libs8000\consoleutils\controllers';
14-
15-
/**
16-
* @inheritdoc
17-
*/
18-
public function init()
19-
{
20-
parent::init();
21-
22-
// custom initialization code goes here
23-
}
24-
}
1+
<?php
2+
namespace dmitriyha\Yii2AdvancedTemplateInit;
3+
4+
/**
5+
* module definition class
6+
*/
7+
class Module extends \yii\base\Module
8+
{
9+
/**
10+
* @inheritdoc
11+
*/
12+
public $controllerNamespace = 'dmitriyha\Yii2AdvancedTemplateInit\controllers';
13+
14+
/**
15+
* @inheritdoc
16+
*/
17+
public function init()
18+
{
19+
parent::init();
20+
21+
// custom initialization code goes here
22+
}
23+
}

‎composer.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
{
2-
"name": "libs8000/consoleutils",
3-
"description": "Console utilities for the libs8000",
4-
"type": "library",
5-
"authors": [
6-
{
7-
"name": "Dmitriy Haralson",
8-
"email": "diharalson@gmail.com"
9-
}
10-
],
11-
"require": {
12-
"yiisoft/yii2": ">=2.0.6"
13-
},
14-
"autoload": {
15-
"psr-4": {
16-
"libs8000\\consoleutils\\": ""
17-
}
18-
}
19-
}
1+
{
2+
"name": "dmitriyha/yii2-advanced-template-init",
3+
"description": "Console utility to initialize and reinitialze a Yii2 application",
4+
"type": "library",
5+
"authors": [
6+
{
7+
"name": "Dmitriy Haralson",
8+
"email": "diharalson@gmail.com"
9+
}
10+
],
11+
"require": {
12+
"yiisoft/yii2": ">=2.0.6"
13+
},
14+
"autoload": {
15+
"psr-4": {
16+
"dmitriyha\\Yii2AdvancedTemplateInit\\": ""
17+
}
18+
}
19+
}

‎controllers/EnvironmentController.php‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
<?php
2-
3-
namespace libs8000\consoleutils\controllers;
4-
5-
use Yii;
6-
7-
use yii\console\Controller;
8-
use libs8000\consoleutils\widgets\DevelopmentEnvironment;
9-
use libs8000\consoleutils\widgets\ProductionEnvironment;
10-
11-
/**
12-
* Environemt controller
13-
*
14-
*
15-
**/
16-
17-
class EnvironmentController extends Controller
18-
{
19-
20-
public function actionDev()
21-
{
22-
DevelopmentEnvironment::widget();
23-
}
24-
25-
public function actionProd()
26-
{
27-
ProductionEnvironment::widget();
28-
}
29-
}
1+
<?php
2+
namespace dmitriyha\Yii2AdvancedTemplateInit\controllers;
3+
4+
use Yii;
5+
6+
use yii\console\Controller;
7+
use dmitriyha\Yii2AdvancedTemplateInit\widgets\DevelopmentEnvironment;
8+
use dmitriyha\Yii2AdvancedTemplateInit\widgets\ProductionEnvironment;
9+
10+
/**
11+
* Environemt controller
12+
*
13+
*
14+
**/
15+
16+
class EnvironmentController extends Controller
17+
{
18+
19+
public function actionDev()
20+
{
21+
DevelopmentEnvironment::widget();
22+
}
23+
24+
public function actionProd()
25+
{
26+
ProductionEnvironment::widget();
27+
}
28+
}

‎widgets/BaseEnvironment.php‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
1-
<?php
2-
namespace libs8000\consoleutils\widgets;
3-
4-
use Yii;
5-
use yii\base\Widget;
6-
7-
//the base widget class to set environment files
8-
abstract class BaseEnvironment extends Widget {
9-
public $dbName;
10-
public $dbUser = 'root';
11-
public $dbPassword = '';
12-
public $dbHost = 'localhost';
13-
14-
public $namespaces = [
15-
'@common',
16-
'@frontend',
17-
'@backend',
18-
'@console',
19-
];
20-
21-
protected $environment;
22-
23-
public function run(){
24-
foreach($this->namespaces as $namespace){
25-
$path = yii::getAlias($namespace);
26-
$configFolder = $path.'/config';
27-
$folder = str_replace('@','',$namespace);
28-
file_put_contents($configFolder.'/main-local.php',
29-
$this->render(
30-
$this->environment.'/'.$folder.'/config/main-local.php',
31-
[
32-
'dbName'=>$this->dbName,
33-
'dbUser'=>$this->dbUser,
34-
'dbPassword'=>$this->dbPassword,
35-
'dbHost'=>$this->dbHost,
36-
]
37-
)
38-
);
39-
file_put_contents($configFolder.'/params-local.php',$this->render($this->environment.'/'.$folder.'/config/params-local.php'));
40-
if(!file_exists($path.'/web/index.php') && $namespace !== '@common' && $namespace !== '@console'){
41-
if(!file_exists($path.'/web/assets')){
42-
mkdir($path.'/web/assets',755);
43-
mkdir($path.'/runtime',755);
44-
}
45-
file_put_contents($path.'/web/index.php',$this->render($this->environment.'/'.$folder.'/web/index.php'));
46-
}
47-
48-
}
49-
50-
return parent::run();
51-
}
1+
<?php
2+
namespace dmitriyha\Yii2AdvancedTemplateInit\widgets;
3+
4+
use Yii;
5+
use yii\base\Widget;
6+
7+
//the base widget class to set environment files
8+
abstract class BaseEnvironment extends Widget {
9+
public $dbName;
10+
public $dbUser = 'root';
11+
public $dbPassword = '';
12+
public $dbHost = 'localhost';
13+
14+
public $namespaces = [
15+
'@common',
16+
'@frontend',
17+
'@backend',
18+
'@console',
19+
];
20+
21+
protected $environment;
22+
23+
public function run(){
24+
foreach($this->namespaces as $namespace){
25+
$path = yii::getAlias($namespace);
26+
$configFolder = $path.'/config';
27+
$folder = str_replace('@','',$namespace);
28+
file_put_contents($configFolder.'/main-local.php',
29+
$this->render(
30+
$this->environment.'/'.$folder.'/config/main-local.php',
31+
[
32+
'dbName'=>$this->dbName,
33+
'dbUser'=>$this->dbUser,
34+
'dbPassword'=>$this->dbPassword,
35+
'dbHost'=>$this->dbHost,
36+
]
37+
)
38+
);
39+
file_put_contents($configFolder.'/params-local.php',$this->render($this->environment.'/'.$folder.'/config/params-local.php'));
40+
if(!file_exists($path.'/web/index.php') && $namespace !== '@common' && $namespace !== '@console'){
41+
if(!file_exists($path.'/web/assets')){
42+
mkdir($path.'/web/assets',755);
43+
mkdir($path.'/runtime',755);
44+
}
45+
file_put_contents($path.'/web/index.php',$this->render($this->environment.'/'.$folder.'/web/index.php'));
46+
}
47+
48+
}
49+
50+
return parent::run();
51+
}
5252
}

‎widgets/DevelopmentEnvironment.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php
2-
namespace libs8000\consoleutils\widgets;
3-
//use yii\base\Widget;
4-
5-
class DevelopmentEnvironment extends BaseEnvironment {
6-
7-
protected $environment = 'dev';
8-
1+
<?php
2+
namespace dmitriyha\Yii2AdvancedTemplateInit\widgets;
3+
//use yii\base\Widget;
4+
5+
class DevelopmentEnvironment extends BaseEnvironment {
6+
7+
protected $environment = 'dev';
8+
99
}

‎widgets/ProductionEnvironment.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php
2-
namespace libs8000\consoleutils\widgets;
3-
4-
//production environment setting widget
5-
class ProductionEnvironment extends BaseEnvironment {
6-
7-
protected $environment = 'prod';
8-
1+
<?php
2+
namespace dmitriyha\Yii2AdvancedTemplateInit\widgets;
3+
4+
//production environment setting widget
5+
class ProductionEnvironment extends BaseEnvironment {
6+
7+
protected $environment = 'prod';
8+
99
}

‎widgets/views/prod/yii‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
#!/usr/bin/env php
2-
<?php
3-
/**
4-
* Yii console bootstrap file.
5-
*
6-
* @link http://www.yiiframework.com/
7-
* @copyright Copyright (c) 2008 Yii Software LLC
8-
* @license http://www.yiiframework.com/license/
9-
*/
10-
11-
defined('YII_DEBUG') or define('YII_DEBUG', false);
12-
defined('YII_ENV') or define('YII_ENV', 'prod');
13-
14-
require(__DIR__ . '/vendor/autoload.php');
15-
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
16-
require(__DIR__ . '/common/config/bootstrap.php');
17-
require(__DIR__ . '/console/config/bootstrap.php');
18-
19-
$config = yii\helpers\ArrayHelper::merge(
20-
require(__DIR__ . '/common/config/main.php'),
21-
require(__DIR__ . '/common/config/main-local.php'),
22-
require(__DIR__ . '/console/config/main.php'),
23-
require(__DIR__ . '/console/config/main-local.php')
24-
);
25-
26-
$application = new yii\console\Application($config);
27-
$exitCode = $application->run();
28-
exit($exitCode);
1+
#!/usr/bin/env php
2+
<?php
3+
/**
4+
* Yii console bootstrap file.
5+
*
6+
* @link http://www.yiiframework.com/
7+
* @copyright Copyright (c) 2008 Yii Software LLC
8+
* @license http://www.yiiframework.com/license/
9+
*/
10+
11+
defined('YII_DEBUG') or define('YII_DEBUG', false);
12+
defined('YII_ENV') or define('YII_ENV', 'prod');
13+
14+
require(__DIR__ . '/vendor/autoload.php');
15+
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
16+
require(__DIR__ . '/common/config/bootstrap.php');
17+
require(__DIR__ . '/console/config/bootstrap.php');
18+
19+
$config = yii\helpers\ArrayHelper::merge(
20+
require(__DIR__ . '/common/config/main.php'),
21+
require(__DIR__ . '/common/config/main-local.php'),
22+
require(__DIR__ . '/console/config/main.php'),
23+
require(__DIR__ . '/console/config/main-local.php')
24+
);
25+
26+
$application = new yii\console\Application($config);
27+
$exitCode = $application->run();
28+
exit($exitCode);

0 commit comments

Comments
 (0)