@@ -10,13 +10,13 @@ |
||
10 | 10 | defined('YII_DEBUG') or define('YII_DEBUG', true); |
11 | 11 | defined('YII_ENV') or define('YII_ENV', 'test'); |
12 | 12 | |
13 | -require(__DIR__ . '/../vendor/autoload.php'); |
|
14 | -require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php'); |
|
13 | +require(__DIR__.'/../vendor/autoload.php'); |
|
14 | +require(__DIR__.'/../vendor/yiisoft/yii2/Yii.php'); |
|
15 | 15 | |
16 | 16 | include '../c3.php'; |
17 | 17 | |
18 | 18 | define('MY_APP_STARTED', true); |
19 | 19 | |
20 | -$config = require(__DIR__ . '/../tests/codeception/config/acceptance.php'); |
|
20 | +$config = require(__DIR__.'/../tests/codeception/config/acceptance.php'); |
|
21 | 21 | |
22 | 22 | (new yii\web\Application($config))->run(); |
@@ -3,14 +3,14 @@ |
||
3 | 3 | defined('YII_DEBUG') or define('YII_DEBUG', true); |
4 | 4 | defined('YII_ENV') or define('YII_ENV', 'dev'); |
5 | 5 | |
6 | -require(__DIR__ . '/../vendor/autoload.php'); |
|
7 | -require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php'); |
|
6 | +require(__DIR__.'/../vendor/autoload.php'); |
|
7 | +require(__DIR__.'/../vendor/yiisoft/yii2/Yii.php'); |
|
8 | 8 | |
9 | 9 | $config = yii\helpers\ArrayHelper::merge( |
10 | - require(__DIR__ . '/../config/main.php'), |
|
11 | - require(__DIR__ . '/../config/main.local.php'), |
|
12 | - require(__DIR__ . '/../config/common.php'), |
|
13 | - require(__DIR__ . '/../config/common.local.php') |
|
10 | + require(__DIR__.'/../config/main.php'), |
|
11 | + require(__DIR__.'/../config/main.local.php'), |
|
12 | + require(__DIR__.'/../config/common.php'), |
|
13 | + require(__DIR__.'/../config/common.local.php') |
|
14 | 14 | ); |
15 | 15 | |
16 | 16 | (new yii\web\Application($config))->run(); |
@@ -53,17 +53,17 @@ |
||
53 | 53 | |
54 | 54 | $session = \Yii::$app->getSession(); |
55 | 55 | $flashes = $session->getAllFlashes(); |
56 | - $appendCss = isset($this->options['class']) ? ' ' . $this->options['class'] : ''; |
|
56 | + $appendCss = isset($this->options['class']) ? ' '.$this->options['class'] : ''; |
|
57 | 57 | |
58 | 58 | foreach ($flashes as $type => $data) { |
59 | 59 | if (isset($this->alertTypes[$type])) { |
60 | 60 | $data = (array) $data; |
61 | 61 | foreach ($data as $message) { |
62 | 62 | /* initialize css class for each alert box */ |
63 | - $this->options['class'] = $this->alertTypes[$type] . $appendCss; |
|
63 | + $this->options['class'] = $this->alertTypes[$type].$appendCss; |
|
64 | 64 | |
65 | 65 | /* assign unique id to each alert box */ |
66 | - $this->options['id'] = $this->getId() . '-' . $type; |
|
66 | + $this->options['id'] = $this->getId().'-'.$type; |
|
67 | 67 | |
68 | 68 | echo \yii\bootstrap\Alert::widget([ |
69 | 69 | 'body' => $message, |
@@ -5,7 +5,7 @@ |
||
5 | 5 | /* @var $this yii\web\View */ |
6 | 6 | /* @var $model app\models\UserModel */ |
7 | 7 | |
8 | -$this->title = 'Update User: ' . ' ' . $model->username; |
|
8 | +$this->title = 'Update User: '.' '.$model->username; |
|
9 | 9 | $this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']]; |
10 | 10 | $this->params['breadcrumbs'][] = 'Update'; |
11 | 11 | ?> |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | ], $tableOptions); |
41 | 41 | |
42 | 42 | //Create Cms table |
43 | - $this->createTable('{{%Cms}}', [ |
|
43 | + $this->createTable('{{%Cms}}', [ |
|
44 | 44 | 'id' => Schema::TYPE_PK, |
45 | 45 | 'url' => Schema::TYPE_STRING . '(255)', |
46 | 46 | 'title' => Schema::TYPE_STRING . '(255)', |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | 'data' => 'LONGBLOB' |
114 | 114 | ]); |
115 | 115 | |
116 | - $this->createTable('{{%AuthRule}}', [ |
|
116 | + $this->createTable('{{%AuthRule}}', [ |
|
117 | 117 | 'name' => Schema::TYPE_STRING . '(64) NOT NULL', |
118 | 118 | 'data' => Schema::TYPE_TEXT, |
119 | 119 | 'created_at' => Schema::TYPE_INTEGER, |
@@ -22,14 +22,14 @@ discard block |
||
22 | 22 | //Create user table |
23 | 23 | $this->createTable('{{%User}}', [ |
24 | 24 | 'id' => Schema::TYPE_PK, |
25 | - 'username' => Schema::TYPE_STRING . ' NOT NULL', |
|
26 | - 'authKey' => Schema::TYPE_STRING . '(32) NOT NULL', |
|
27 | - 'passwordHash' => Schema::TYPE_STRING . ' NOT NULL', |
|
25 | + 'username' => Schema::TYPE_STRING.' NOT NULL', |
|
26 | + 'authKey' => Schema::TYPE_STRING.'(32) NOT NULL', |
|
27 | + 'passwordHash' => Schema::TYPE_STRING.' NOT NULL', |
|
28 | 28 | 'passwordResetToken' => Schema::TYPE_STRING, |
29 | - 'email' => Schema::TYPE_STRING . ' NOT NULL', |
|
30 | - 'status' => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10', |
|
31 | - 'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
32 | - 'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
29 | + 'email' => Schema::TYPE_STRING.' NOT NULL', |
|
30 | + 'status' => Schema::TYPE_SMALLINT.' NOT NULL DEFAULT 10', |
|
31 | + 'createdAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
32 | + 'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
33 | 33 | 'lastLogin' => Schema::TYPE_INTEGER, |
34 | 34 | ], $tableOptions); |
35 | 35 | |
@@ -42,31 +42,31 @@ discard block |
||
42 | 42 | //Create Cms table |
43 | 43 | $this->createTable('{{%Cms}}', [ |
44 | 44 | 'id' => Schema::TYPE_PK, |
45 | - 'url' => Schema::TYPE_STRING . '(255)', |
|
46 | - 'title' => Schema::TYPE_STRING . '(255)', |
|
45 | + 'url' => Schema::TYPE_STRING.'(255)', |
|
46 | + 'title' => Schema::TYPE_STRING.'(255)', |
|
47 | 47 | 'content' => Schema::TYPE_TEXT, |
48 | 48 | 'status' => Schema::TYPE_SMALLINT, |
49 | 49 | 'commentAvailable' => 'TINYINT(1) DEFAULT 0', |
50 | 50 | 'metaTitle' => Schema::TYPE_TEXT, |
51 | 51 | 'metaDescription' => Schema::TYPE_TEXT, |
52 | 52 | 'metaKeywords' => Schema::TYPE_TEXT, |
53 | - 'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
54 | - 'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
53 | + 'createdAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
54 | + 'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
55 | 55 | ], $tableOptions); |
56 | 56 | |
57 | 57 | //Create Comment table |
58 | 58 | $this->createTable('{{%Comment}}', [ |
59 | 59 | 'id' => Schema::TYPE_PK, |
60 | 60 | 'entity' => 'CHAR(10) NOT NULL', |
61 | - 'entityId' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
62 | - 'content' => Schema::TYPE_TEXT . ' NOT NULL', |
|
63 | - 'parentId' => Schema::TYPE_INTEGER . ' DEFAULT NULL', |
|
61 | + 'entityId' => Schema::TYPE_INTEGER.' NOT NULL', |
|
62 | + 'content' => Schema::TYPE_TEXT.' NOT NULL', |
|
63 | + 'parentId' => Schema::TYPE_INTEGER.' DEFAULT NULL', |
|
64 | 64 | 'level' => 'TINYINT(3) NOT NULL DEFAULT 1', |
65 | - 'createdBy' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
66 | - 'updatedBy' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
65 | + 'createdBy' => Schema::TYPE_INTEGER.' NOT NULL', |
|
66 | + 'updatedBy' => Schema::TYPE_INTEGER.' NOT NULL', |
|
67 | 67 | 'status' => 'TINYINT(2) NOT NULL DEFAULT 1', |
68 | - 'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
69 | - 'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
68 | + 'createdAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
69 | + 'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
70 | 70 | ], $tableOptions); |
71 | 71 | |
72 | 72 | //Insert pages in CMS table |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | ]); |
115 | 115 | |
116 | 116 | $this->createTable('{{%AuthRule}}', [ |
117 | - 'name' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
117 | + 'name' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
118 | 118 | 'data' => Schema::TYPE_TEXT, |
119 | 119 | 'created_at' => Schema::TYPE_INTEGER, |
120 | 120 | 'updated_at' => Schema::TYPE_INTEGER, |
@@ -122,45 +122,45 @@ discard block |
||
122 | 122 | ], $tableOptions); |
123 | 123 | |
124 | 124 | $this->createTable('{{%AuthItem}}', [ |
125 | - 'name' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
126 | - 'type' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
125 | + 'name' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
126 | + 'type' => Schema::TYPE_INTEGER.' NOT NULL', |
|
127 | 127 | 'description' => Schema::TYPE_TEXT, |
128 | - 'rule_name' => Schema::TYPE_STRING . '(64)', |
|
128 | + 'rule_name' => Schema::TYPE_STRING.'(64)', |
|
129 | 129 | 'data' => Schema::TYPE_TEXT, |
130 | 130 | 'created_at' => Schema::TYPE_INTEGER, |
131 | 131 | 'updated_at' => Schema::TYPE_INTEGER, |
132 | 132 | 'PRIMARY KEY (name)', |
133 | - 'FOREIGN KEY (rule_name) REFERENCES ' . '{{%AuthRule}}' . ' (name) ON DELETE SET NULL ON UPDATE CASCADE', |
|
133 | + 'FOREIGN KEY (rule_name) REFERENCES '.'{{%AuthRule}}'.' (name) ON DELETE SET NULL ON UPDATE CASCADE', |
|
134 | 134 | ], $tableOptions); |
135 | 135 | |
136 | 136 | $this->createIndex('idx-auth_item-type', '{{%AuthItem}}', 'type'); |
137 | 137 | |
138 | 138 | $this->createTable('{{%AuthItemChild}}', [ |
139 | - 'parent' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
140 | - 'child' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
139 | + 'parent' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
140 | + 'child' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
141 | 141 | 'PRIMARY KEY (parent, child)', |
142 | - 'FOREIGN KEY (parent) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
143 | - 'FOREIGN KEY (child) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
142 | + 'FOREIGN KEY (parent) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
143 | + 'FOREIGN KEY (child) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
144 | 144 | ], $tableOptions); |
145 | 145 | |
146 | 146 | $this->createTable('{{%AuthAssignment}}', [ |
147 | - 'item_name' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
148 | - 'user_id' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
147 | + 'item_name' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
148 | + 'user_id' => Schema::TYPE_INTEGER.' NOT NULL', |
|
149 | 149 | 'created_at' => Schema::TYPE_INTEGER, |
150 | 150 | 'PRIMARY KEY (item_name, user_id)', |
151 | - 'FOREIGN KEY (item_name) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
151 | + 'FOREIGN KEY (item_name) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
152 | 152 | ], $tableOptions); |
153 | 153 | |
154 | 154 | // Create Cron Shedule table |
155 | - $this->createTable('{{%CronSchedule}}',[ |
|
155 | + $this->createTable('{{%CronSchedule}}', [ |
|
156 | 156 | 'id' => Schema::TYPE_PK, |
157 | - 'jobCode' => Schema::TYPE_STRING . '(255) NULL DEFAULT NULL', |
|
158 | - 'status' => Schema::TYPE_SMALLINT . ' NOT NULL', |
|
159 | - 'messages' => Schema::TYPE_TEXT . ' NULL', |
|
160 | - 'dateCreated' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL', |
|
161 | - 'dateScheduled' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL', |
|
162 | - 'dateExecuted' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL', |
|
163 | - 'dateFinished' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL', |
|
157 | + 'jobCode' => Schema::TYPE_STRING.'(255) NULL DEFAULT NULL', |
|
158 | + 'status' => Schema::TYPE_SMALLINT.' NOT NULL', |
|
159 | + 'messages' => Schema::TYPE_TEXT.' NULL', |
|
160 | + 'dateCreated' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL', |
|
161 | + 'dateScheduled' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL', |
|
162 | + 'dateExecuted' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL', |
|
163 | + 'dateFinished' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL', |
|
164 | 164 | ], |
165 | 165 | $tableOptions |
166 | 166 | ); |