@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -Yii::setAlias('@tests', dirname(__DIR__) . '/tests'); |
|
| 3 | +Yii::setAlias('@tests', dirname(__DIR__).'/tests'); |
|
| 4 | 4 | Yii::setAlias('@webroot', dirname(__DIR__)); |
| 5 | 5 | |
| 6 | 6 | $config = [ |
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | 'options' => ['class' => 'navbar-nav navbar-right'], |
| 88 | 88 | 'items' => [ |
| 89 | 89 | ['label' => '<i class="glyphicon glyphicon-globe"></i> Public Area', 'url' => ['/']], |
| 90 | - ['label' => '<i class="glyphicon glyphicon-off"></i> Logout (' . Yii::$app->user->identity->username . ')', |
|
| 90 | + ['label' => '<i class="glyphicon glyphicon-off"></i> Logout ('.Yii::$app->user->identity->username.')', |
|
| 91 | 91 | 'url' => ['/site/logout'], |
| 92 | 92 | 'linkOptions' => ['data-method' => 'post'], |
| 93 | 93 | ] |
@@ -36,11 +36,11 @@ discard block |
||
| 36 | 36 | 'class' => EditableColumn::className(), |
| 37 | 37 | 'attribute' => 'status', |
| 38 | 38 | 'url' => ['edit-user'], |
| 39 | - 'value' => function ($model) { |
|
| 39 | + 'value' => function($model) { |
|
| 40 | 40 | return UserStatus::getLabel($model->status); |
| 41 | 41 | }, |
| 42 | 42 | 'type' => 'select', |
| 43 | - 'editableOptions' => function ($model) { |
|
| 43 | + 'editableOptions' => function($model) { |
|
| 44 | 44 | return [ |
| 45 | 45 | 'source' => Json::encode(UserStatus::listData()), |
| 46 | 46 | 'value' => $model->status, |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | [ |
| 53 | 53 | 'attribute' => 'createdAt', |
| 54 | 54 | 'label' => 'Created date', |
| 55 | - 'value' => function ($model) { |
|
| 55 | + 'value' => function($model) { |
|
| 56 | 56 | return date("d-M-Y", $model->createdAt); |
| 57 | 57 | }, |
| 58 | 58 | 'filter' => false, |
@@ -11,16 +11,16 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | |
| 13 | 13 | // you may need to adjust this path to the correct Yii framework path |
| 14 | -$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2'; |
|
| 14 | +$frameworkPath = dirname(__FILE__).'/vendor/yiisoft/yii2'; |
|
| 15 | 15 | |
| 16 | 16 | if (!is_dir($frameworkPath)) { |
| 17 | 17 | echo '<h1>Error</h1>'; |
| 18 | 18 | echo '<p><strong>The path to yii framework seems to be incorrect.</strong></p>'; |
| 19 | - echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="' . __FILE__ . '">' . basename(__FILE__) . '</abbr>.</p>'; |
|
| 20 | - echo '<p>Please refer to the <abbr title="' . dirname(__FILE__) . '/README.md">README</abbr> on how to install Yii.</p>'; |
|
| 19 | + echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="'.__FILE__.'">'.basename(__FILE__).'</abbr>.</p>'; |
|
| 20 | + echo '<p>Please refer to the <abbr title="'.dirname(__FILE__).'/README.md">README</abbr> on how to install Yii.</p>'; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | -require_once($frameworkPath . '/requirements/YiiRequirementChecker.php'); |
|
| 23 | +require_once($frameworkPath.'/requirements/YiiRequirementChecker.php'); |
|
| 24 | 24 | $requirementsChecker = new YiiRequirementChecker(); |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | 'phpSmtp' => array( |
| 103 | 103 | 'name' => 'PHP mail SMTP', |
| 104 | 104 | 'mandatory' => false, |
| 105 | - 'condition' => strlen(ini_get('SMTP'))>0, |
|
| 105 | + 'condition' => strlen(ini_get('SMTP')) > 0, |
|
| 106 | 106 | 'by' => 'Email sending', |
| 107 | 107 | 'memo' => 'PHP mail SMTP server required', |
| 108 | 108 | ), |
@@ -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(); |
@@ -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, |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | $menuItems[] = '<li>' |
| 53 | 53 | . Html::beginForm(['/site/logout'], 'post') |
| 54 | 54 | . Html::submitButton( |
| 55 | - 'Logout (' . Yii::$app->user->identity->username . ')', |
|
| 55 | + 'Logout ('.Yii::$app->user->identity->username.')', |
|
| 56 | 56 | ['class' => 'btn btn-link'] |
| 57 | 57 | ) |
| 58 | 58 | . Html::endForm() |
@@ -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 | ?> |
@@ -23,14 +23,14 @@ discard block |
||
| 23 | 23 | //Create user table |
| 24 | 24 | $this->createTable('{{%User}}', [ |
| 25 | 25 | 'id' => Schema::TYPE_PK, |
| 26 | - 'username' => Schema::TYPE_STRING . ' NOT NULL', |
|
| 27 | - 'authKey' => Schema::TYPE_STRING . '(32) NOT NULL', |
|
| 28 | - 'passwordHash' => Schema::TYPE_STRING . ' NOT NULL', |
|
| 26 | + 'username' => Schema::TYPE_STRING.' NOT NULL', |
|
| 27 | + 'authKey' => Schema::TYPE_STRING.'(32) NOT NULL', |
|
| 28 | + 'passwordHash' => Schema::TYPE_STRING.' NOT NULL', |
|
| 29 | 29 | 'passwordResetToken' => Schema::TYPE_STRING, |
| 30 | - 'email' => Schema::TYPE_STRING . ' NOT NULL', |
|
| 31 | - 'status' => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10', |
|
| 32 | - 'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 33 | - 'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 30 | + 'email' => Schema::TYPE_STRING.' NOT NULL', |
|
| 31 | + 'status' => Schema::TYPE_SMALLINT.' NOT NULL DEFAULT 10', |
|
| 32 | + 'createdAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 33 | + 'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 34 | 34 | 'lastLogin' => Schema::TYPE_INTEGER, |
| 35 | 35 | ], $tableOptions); |
| 36 | 36 | |
@@ -43,32 +43,32 @@ discard block |
||
| 43 | 43 | //Create Cms table |
| 44 | 44 | $this->createTable('{{%Cms}}', [ |
| 45 | 45 | 'id' => Schema::TYPE_PK, |
| 46 | - 'url' => Schema::TYPE_STRING . '(255)', |
|
| 47 | - 'title' => Schema::TYPE_STRING . '(255)', |
|
| 46 | + 'url' => Schema::TYPE_STRING.'(255)', |
|
| 47 | + 'title' => Schema::TYPE_STRING.'(255)', |
|
| 48 | 48 | 'content' => Schema::TYPE_TEXT, |
| 49 | 49 | 'status' => Schema::TYPE_SMALLINT, |
| 50 | 50 | 'commentAvailable' => 'TINYINT(1) DEFAULT 0', |
| 51 | 51 | 'metaTitle' => Schema::TYPE_TEXT, |
| 52 | 52 | 'metaDescription' => Schema::TYPE_TEXT, |
| 53 | 53 | 'metaKeywords' => Schema::TYPE_TEXT, |
| 54 | - 'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 55 | - 'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 54 | + 'createdAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 55 | + 'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 56 | 56 | ], $tableOptions); |
| 57 | 57 | |
| 58 | 58 | //Create Comment table |
| 59 | 59 | $this->createTable('{{%Comment}}', [ |
| 60 | 60 | 'id' => Schema::TYPE_PK, |
| 61 | 61 | 'entity' => 'CHAR(10) NOT NULL', |
| 62 | - 'entityId' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 63 | - 'content' => Schema::TYPE_TEXT . ' NOT NULL', |
|
| 64 | - 'parentId' => Schema::TYPE_INTEGER . ' DEFAULT NULL', |
|
| 62 | + 'entityId' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 63 | + 'content' => Schema::TYPE_TEXT.' NOT NULL', |
|
| 64 | + 'parentId' => Schema::TYPE_INTEGER.' DEFAULT NULL', |
|
| 65 | 65 | 'level' => 'TINYINT(3) NOT NULL DEFAULT 1', |
| 66 | - 'createdBy' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 67 | - 'updatedBy' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 66 | + 'createdBy' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 67 | + 'updatedBy' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 68 | 68 | 'relatedTo' => $this->string(500)->notNull(), |
| 69 | 69 | 'status' => 'TINYINT(2) NOT NULL DEFAULT 1', |
| 70 | - 'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 71 | - 'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 70 | + 'createdAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 71 | + 'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 72 | 72 | ], $tableOptions); |
| 73 | 73 | |
| 74 | 74 | //Insert pages in CMS table |
@@ -86,13 +86,13 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | $this->createTable('{{%Setting}}', [ |
| 88 | 88 | 'id' => Schema::TYPE_PK, |
| 89 | - 'type' => Schema::TYPE_STRING . '(10) NOT NULL', |
|
| 90 | - 'section' => Schema::TYPE_STRING . ' NOT NULL', |
|
| 91 | - 'key' => Schema::TYPE_STRING . ' NOT NULL', |
|
| 92 | - 'value' => Schema::TYPE_STRING . ' NOT NULL', |
|
| 93 | - 'status' => Schema::TYPE_SMALLINT . ' NOT NULL', |
|
| 94 | - 'createdAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 95 | - 'updatedAt' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 89 | + 'type' => Schema::TYPE_STRING.'(10) NOT NULL', |
|
| 90 | + 'section' => Schema::TYPE_STRING.' NOT NULL', |
|
| 91 | + 'key' => Schema::TYPE_STRING.' NOT NULL', |
|
| 92 | + 'value' => Schema::TYPE_STRING.' NOT NULL', |
|
| 93 | + 'status' => Schema::TYPE_SMALLINT.' NOT NULL', |
|
| 94 | + 'createdAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 95 | + 'updatedAt' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 96 | 96 | ], $tableOptions |
| 97 | 97 | ); |
| 98 | 98 | |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | ]); |
| 129 | 129 | |
| 130 | 130 | $this->createTable('{{%AuthRule}}', [ |
| 131 | - 'name' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
| 131 | + 'name' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
| 132 | 132 | 'data' => Schema::TYPE_TEXT, |
| 133 | 133 | 'created_at' => Schema::TYPE_INTEGER, |
| 134 | 134 | 'updated_at' => Schema::TYPE_INTEGER, |
@@ -136,45 +136,45 @@ discard block |
||
| 136 | 136 | ], $tableOptions); |
| 137 | 137 | |
| 138 | 138 | $this->createTable('{{%AuthItem}}', [ |
| 139 | - 'name' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
| 140 | - 'type' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 139 | + 'name' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
| 140 | + 'type' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 141 | 141 | 'description' => Schema::TYPE_TEXT, |
| 142 | - 'rule_name' => Schema::TYPE_STRING . '(64)', |
|
| 142 | + 'rule_name' => Schema::TYPE_STRING.'(64)', |
|
| 143 | 143 | 'data' => Schema::TYPE_TEXT, |
| 144 | 144 | 'created_at' => Schema::TYPE_INTEGER, |
| 145 | 145 | 'updated_at' => Schema::TYPE_INTEGER, |
| 146 | 146 | 'PRIMARY KEY (name)', |
| 147 | - 'FOREIGN KEY (rule_name) REFERENCES ' . '{{%AuthRule}}' . ' (name) ON DELETE SET NULL ON UPDATE CASCADE', |
|
| 147 | + 'FOREIGN KEY (rule_name) REFERENCES '.'{{%AuthRule}}'.' (name) ON DELETE SET NULL ON UPDATE CASCADE', |
|
| 148 | 148 | ], $tableOptions); |
| 149 | 149 | |
| 150 | 150 | $this->createIndex('idx-auth_item-type', '{{%AuthItem}}', 'type'); |
| 151 | 151 | |
| 152 | 152 | $this->createTable('{{%AuthItemChild}}', [ |
| 153 | - 'parent' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
| 154 | - 'child' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
| 153 | + 'parent' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
| 154 | + 'child' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
| 155 | 155 | 'PRIMARY KEY (parent, child)', |
| 156 | - 'FOREIGN KEY (parent) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
| 157 | - 'FOREIGN KEY (child) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
| 156 | + 'FOREIGN KEY (parent) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
| 157 | + 'FOREIGN KEY (child) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
| 158 | 158 | ], $tableOptions); |
| 159 | 159 | |
| 160 | 160 | $this->createTable('{{%AuthAssignment}}', [ |
| 161 | - 'item_name' => Schema::TYPE_STRING . '(64) NOT NULL', |
|
| 162 | - 'user_id' => Schema::TYPE_INTEGER . ' NOT NULL', |
|
| 161 | + 'item_name' => Schema::TYPE_STRING.'(64) NOT NULL', |
|
| 162 | + 'user_id' => Schema::TYPE_INTEGER.' NOT NULL', |
|
| 163 | 163 | 'created_at' => Schema::TYPE_INTEGER, |
| 164 | 164 | 'PRIMARY KEY (item_name, user_id)', |
| 165 | - 'FOREIGN KEY (item_name) REFERENCES ' . '{{%AuthItem}}' . ' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
| 165 | + 'FOREIGN KEY (item_name) REFERENCES '.'{{%AuthItem}}'.' (name) ON DELETE CASCADE ON UPDATE CASCADE', |
|
| 166 | 166 | ], $tableOptions); |
| 167 | 167 | |
| 168 | 168 | // Create Cron Shedule table |
| 169 | - $this->createTable('{{%CronSchedule}}',[ |
|
| 169 | + $this->createTable('{{%CronSchedule}}', [ |
|
| 170 | 170 | 'id' => Schema::TYPE_PK, |
| 171 | - 'jobCode' => Schema::TYPE_STRING . '(255) NULL DEFAULT NULL', |
|
| 172 | - 'status' => Schema::TYPE_SMALLINT . ' NOT NULL', |
|
| 173 | - 'messages' => Schema::TYPE_TEXT . ' NULL', |
|
| 174 | - 'dateCreated' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL', |
|
| 175 | - 'dateScheduled' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL', |
|
| 176 | - 'dateExecuted' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL', |
|
| 177 | - 'dateFinished' => Schema::TYPE_TIMESTAMP . ' NULL DEFAULT NULL', |
|
| 171 | + 'jobCode' => Schema::TYPE_STRING.'(255) NULL DEFAULT NULL', |
|
| 172 | + 'status' => Schema::TYPE_SMALLINT.' NOT NULL', |
|
| 173 | + 'messages' => Schema::TYPE_TEXT.' NULL', |
|
| 174 | + 'dateCreated' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL', |
|
| 175 | + 'dateScheduled' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL', |
|
| 176 | + 'dateExecuted' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL', |
|
| 177 | + 'dateFinished' => Schema::TYPE_TIMESTAMP.' NULL DEFAULT NULL', |
|
| 178 | 178 | ], |
| 179 | 179 | $tableOptions |
| 180 | 180 | ); |