Test Setup Failed
Push — master ( e4104b...d8ee25 )
by Александр
35:40
created
src/migrations/v3/m150520_153305_cms_alter_table__cms_lang.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
 
35 35
             'active'                => "CHAR(1) NOT NULL DEFAULT 'Y'",
36 36
             'def'                   => "CHAR(1) NOT NULL DEFAULT 'N'",
37
-            'priority'              => Schema::TYPE_INTEGER. "(11) NOT NULL DEFAULT '500'",
37
+            'priority'              => Schema::TYPE_INTEGER . "(11) NOT NULL DEFAULT '500'",
38 38
 
39 39
             'code'                  => "CHAR(5) NOT NULL",
40 40
             'name'                  => Schema::TYPE_STRING . '(255) NOT NULL',
Please login to merge, or discard this patch.
src/migrations/v3/m150512_103220_create_table__cms_content.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -39,27 +39,27 @@
 block discarded – undo
39 39
             'created_at'            => Schema::TYPE_INTEGER . ' NULL',
40 40
             'updated_at'            => Schema::TYPE_INTEGER . ' NULL',
41 41
 
42
-            'name'                  => Schema::TYPE_STRING. '(255) NOT NULL',
43
-            'code'                  => Schema::TYPE_STRING. '(50) NOT NULL',
42
+            'name'                  => Schema::TYPE_STRING . '(255) NOT NULL',
43
+            'code'                  => Schema::TYPE_STRING . '(50) NOT NULL',
44 44
 
45 45
             'active'                => "CHAR(1) NOT NULL DEFAULT 'Y'",
46 46
 
47
-            'priority'              => Schema::TYPE_INTEGER. "(11) NOT NULL DEFAULT '500'",
47
+            'priority'              => Schema::TYPE_INTEGER . "(11) NOT NULL DEFAULT '500'",
48 48
 
49
-            'description'           => Schema::TYPE_TEXT. " NULL",
49
+            'description'           => Schema::TYPE_TEXT . " NULL",
50 50
 
51
-            'files'                 => Schema::TYPE_TEXT. ' NULL',
51
+            'files'                 => Schema::TYPE_TEXT . ' NULL',
52 52
 
53 53
             'index_for_search'         => "CHAR(1) NOT NULL DEFAULT 'Y'", //Индексировать элементы для модуля поиска
54 54
 
55
-            'name_meny'         => Schema::TYPE_STRING. '(100) NULL',
56
-            'name_one'          => Schema::TYPE_STRING. '(100) NULL',
55
+            'name_meny'         => Schema::TYPE_STRING . '(100) NULL',
56
+            'name_one'          => Schema::TYPE_STRING . '(100) NULL',
57 57
 
58 58
 
59 59
             'tree_chooser'          => "CHAR(1) NULL", //Интерфейс привязки элемента к разделам
60 60
             'list_mode'             => "CHAR(1) NULL", //Режим просмотра разделов и элементов
61 61
 
62
-            'content_type'          => Schema::TYPE_STRING. '(32) NOT NULL',
62
+            'content_type'          => Schema::TYPE_STRING . '(32) NOT NULL',
63 63
 
64 64
         ], $tableOptions);
65 65
         
Please login to merge, or discard this patch.
migrations/v3/m150512_123230_create_table__cms_content_property_enum.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@
 block discarded – undo
36 36
 
37 37
             'value'                 => Schema::TYPE_STRING . '(255) NOT NULL',
38 38
             'def'                   => "CHAR(1) NOT NULL DEFAULT 'N'",
39
-            'code'                  => Schema::TYPE_STRING. '(32) NOT NULL',
40
-            'priority'              => Schema::TYPE_INTEGER. "(11) NOT NULL DEFAULT '500'",
39
+            'code'                  => Schema::TYPE_STRING . '(32) NOT NULL',
40
+            'priority'              => Schema::TYPE_INTEGER . "(11) NOT NULL DEFAULT '500'",
41 41
 
42 42
         ], $tableOptions);
43 43
 
Please login to merge, or discard this patch.
src/migrations/v3/m141106_100557_create_user_group_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 
52 52
             'status'                => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10',
53 53
 
54
-            'files'                 => Schema::TYPE_TEXT. ' NULL', //
54
+            'files'                 => Schema::TYPE_TEXT . ' NULL', //
55 55
 
56 56
         ], $tableOptions);
57 57
 
Please login to merge, or discard this patch.
migrations/v3/m150523_103525_create_table__cms_tree_type_property_enum.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@
 block discarded – undo
36 36
 
37 37
             'value'                 => Schema::TYPE_STRING . '(255) NOT NULL',
38 38
             'def'                   => "CHAR(1) NOT NULL DEFAULT 'N'",
39
-            'code'                  => Schema::TYPE_STRING. '(32) NOT NULL',
40
-            'priority'              => Schema::TYPE_INTEGER. "(11) NOT NULL DEFAULT '500'",
39
+            'code'                  => Schema::TYPE_STRING . '(32) NOT NULL',
40
+            'priority'              => Schema::TYPE_INTEGER . "(11) NOT NULL DEFAULT '500'",
41 41
 
42 42
         ], $tableOptions);
43 43
 
Please login to merge, or discard this patch.
src/console/controllers/UpdateController.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -100,8 +100,8 @@
 block discarded – undo
100 100
          * @var $element CmsContentElement
101 101
          */
102 102
         foreach (CmsContentElement::find()
103
-                     //->orderBy(['id' => SORT_ASC])
104
-                     ->each(10) as $element) {
103
+                        //->orderBy(['id' => SORT_ASC])
104
+                        ->each(10) as $element) {
105 105
             $this->stdout("\t Element: {$element->id}", Console::FG_YELLOW);
106 106
 
107 107
             if ($element->relatedPropertiesModel->save()) {
Please login to merge, or discard this patch.
src/views/admin-cms-content-element/_form.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
         <?= $form->fieldSet(\Yii::t('skeeks/cms', 'Access')); ?>
149 149
         <?= \skeeks\cms\rbac\widgets\adminPermissionForRoles\AdminPermissionForRolesWidget::widget([
150 150
             'permissionName'        => $model->permissionName,
151
-            'permissionDescription' => 'Доступ к этому элементу: '.$model->name,
151
+            'permissionDescription' => 'Доступ к этому элементу: ' . $model->name,
152 152
             'label'                 => 'Доступ к этому элементу',
153 153
         ]); ?>
154 154
         <?= $form->fieldSetEnd() ?>
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
             : ?>
180 180
             <?= \skeeks\cms\modules\admin\widgets\RelatedModelsGrid::widget([
181 181
                 'label'       => $childContent->name,
182
-                'namespace'   => md5($model->className().$childContent->id),
182
+                'namespace'   => md5($model->className() . $childContent->id),
183 183
                 'parentModel' => $model,
184 184
                 'relation'    => [
185 185
                     'content_id'                => $childContent->id,
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -87,9 +87,10 @@  discard block
 block discarded – undo
87 87
             <?php $model->content_id = $content_id; ?>
88 88
             <?= $form->field($model, 'content_id')->hiddenInput(['value' => $content_id])->label(false); ?>
89 89
         <?php endif; ?>
90
-    <?php else
90
+    <?php else {
91 91
         : ?>
92 92
         <?php $contentModel = $model->cmsContent;
93
+}
93 94
         ?>
94 95
     <?php endif; ?>
95 96
 
@@ -175,7 +176,7 @@  discard block
 block discarded – undo
175 176
                     ],
176 177
                 'body'    => \Yii::t('skeeks/cms', 'Management will be available after saving'),
177 178
             ]); ?>
178
-        <?php else
179
+        <?php else {
179 180
             : ?>
180 181
             <?= \skeeks\cms\modules\admin\widgets\RelatedModelsGrid::widget([
181 182
                 'label'       => $childContent->name,
@@ -198,6 +199,7 @@  discard block
 block discarded – undo
198 199
                     'columns' => (array)\skeeks\cms\controllers\AdminCmsContentElementController::getColumns($childContent),
199 200
                 ],
200 201
             ]);
202
+}
201 203
             ?>
202 204
 
203 205
         <?php endif; ?>
Please login to merge, or discard this patch.
src/controllers/AdminTreeController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -81,12 +81,12 @@  discard block
 block discarded – undo
81 81
                 "preContent"     => "Механизм перемещения раздела. Укажите новый родительский раздел. <p><b>Внимание!</b> перемещение раздела, повлияет на изменение адресов всех дочерних разделов.</p>",
82 82
                 "successMessage" => "Раздел успешно перемещен",
83 83
 
84
-                'on initFormModels' => function (Event $e) {
84
+                'on initFormModels' => function(Event $e) {
85 85
                     $model = $e->sender->model;
86 86
                     $dm = new DynamicModel(['pid']);
87 87
                     $dm->addRule(['pid'], 'integer');
88 88
 
89
-                    $dm->addRule(['pid'], function ($attribute) use ($dm, $model) {
89
+                    $dm->addRule(['pid'], function($attribute) use ($dm, $model) {
90 90
                         if ($dm->pid == $model->id) {
91 91
                             $dm->addError($attribute, \Yii::t('skeeks/cms', 'Нельзя переместить в этот раздел.'));
92 92
                             return false;
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 
95 95
                         $newParent = CmsTree::findOne($dm->pid);
96 96
                         if ($newParent->getChildren()->andWhere(['code' => $model->code])->one()) {
97
-                            $dm->addError($attribute, \Yii::t('skeeks/cms', 'Нельзя переместить в этот раздел, потому что в этом разделе есть подразделы с кодом: '.$model->code));
97
+                            $dm->addError($attribute, \Yii::t('skeeks/cms', 'Нельзя переместить в этот раздел, потому что в этом разделе есть подразделы с кодом: ' . $model->code));
98 98
                             return false;
99 99
                         }
100 100
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
                     $e->sender->formModels['dm'] = $dm;
105 105
                 },
106 106
 
107
-                'on beforeSave' => function (Event $e) {
107
+                'on beforeSave' => function(Event $e) {
108 108
                     /**
109 109
                      * @var $action BackendModelUpdateAction;
110 110
                      * @var $model CmsTree;
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 
134 134
                 },
135 135
 
136
-                'fields' => function ($action) {
136
+                'fields' => function($action) {
137 137
                     /**
138 138
                      * @var $action BackendModelUpdateAction;
139 139
                      * @var $model CmsTree;
@@ -240,14 +240,14 @@  discard block
 block discarded – undo
240 240
     public function indexAction()
241 241
     {
242 242
         if ($root_id = \Yii::$app->request->get('root_id')) {
243
-            $query = CmsTree::find()->where([CmsTree::tableName().'.id' => $root_id]);
243
+            $query = CmsTree::find()->where([CmsTree::tableName() . '.id' => $root_id]);
244 244
         } else {
245 245
             $query = CmsTree::findRoots();
246 246
         }
247 247
 
248 248
         $models = $query
249 249
             ->joinWith('cmsSiteRelation')
250
-            ->orderBy([CmsSite::tableName().".priority" => SORT_ASC])
250
+            ->orderBy([CmsSite::tableName() . ".priority" => SORT_ASC])
251 251
             ->all();
252 252
 
253 253
         return $this->render($this->action->id, ['models' => $models]);
Please login to merge, or discard this patch.
src/controllers/AdminCmsContentElementController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
             [
95 95
                 'class'     => \yii\grid\DataColumn::class,
96
-                'value'     => function (\skeeks\cms\models\CmsContentElement $model) {
96
+                'value'     => function(\skeeks\cms\models\CmsContentElement $model) {
97 97
                     if (!$model->cmsTree) {
98 98
                         return null;
99 99
                     }
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
                     if ($model->cmsTree->parents) {
104 104
                         foreach ($model->cmsTree->parents as $parent) {
105 105
                             if ($parent->isRoot()) {
106
-                                $path[] = "[".$parent->site->name."] ".$parent->name;
106
+                                $path[] = "[" . $parent->site->name . "] " . $parent->name;
107 107
                             } else {
108 108
                                 $path[] = $parent->name;
109 109
                             }
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 
121 121
             'additionalSections' => [
122 122
                 'class'   => \yii\grid\DataColumn::class,
123
-                'value'   => function (\skeeks\cms\models\CmsContentElement $model) {
123
+                'value'   => function(\skeeks\cms\models\CmsContentElement $model) {
124 124
                     $result = [];
125 125
 
126 126
                     if ($model->cmsContentElementTrees) {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
             [
149 149
                 'class'  => \yii\grid\DataColumn::class,
150 150
                 'label'  => "Смотреть",
151
-                'value'  => function (\skeeks\cms\models\CmsContentElement $model) {
151
+                'value'  => function(\skeeks\cms\models\CmsContentElement $model) {
152 152
 
153 153
                     return \yii\helpers\Html::a('<i class="glyphicon glyphicon-arrow-right"></i>', $model->absoluteUrl,
154 154
                         [
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
                     'visible'   => false,
195 195
                     'format'    => 'raw',
196 196
                     'class'     => \yii\grid\DataColumn::class,
197
-                    'value'     => function ($model, $key, $index) use ($name) {
197
+                    'value'     => function($model, $key, $index) use ($name) {
198 198
                         if (is_array($model->{$name})) {
199 199
                             return implode(",", $model->{$name});
200 200
                         } else {
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
                     "preContent"  => "Механизм создания копии текущего элемента. Укажите параметры копирования и нажмите применить.",
257 257
                     "successMessage"  => "Элемент успешно скопирован",
258 258
 
259
-                    'on initFormModels' => function (Event $e) {
259
+                    'on initFormModels' => function(Event $e) {
260 260
                         $model = $e->sender->model;
261 261
                         $dm = new DynamicModel(['is_copy_images', 'is_copy_files']);
262 262
                         $dm->addRule(['is_copy_images', 'is_copy_files'], 'boolean');
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
                         $e->sender->formModels['dm'] = $dm;
268 268
                     },
269 269
 
270
-                    'on beforeSave'   => function (Event $e) {
270
+                    'on beforeSave'   => function(Event $e) {
271 271
                         /**
272 272
                          * @var $action BackendModelUpdateAction;
273 273
                          */
@@ -298,7 +298,7 @@  discard block
 block discarded – undo
298 298
 
299 299
                     },
300 300
 
301
-                    'fields' => function () {
301
+                    'fields' => function() {
302 302
                         return [
303 303
                             'dm.is_copy_images'  => [
304 304
                                 'class' => BoolField::class,
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
             foreach ((array)ArrayHelper::getValue($formData, 'fields') as $code) {
539 539
                 if ($rpForSave->hasAttribute($code)) {
540 540
                     $rpForSave->setAttribute($code,
541
-                        ArrayHelper::getValue($formData, 'RelatedPropertiesModel.'.$code));
541
+                        ArrayHelper::getValue($formData, 'RelatedPropertiesModel.' . $code));
542 542
                 }
543 543
             }
544 544
 
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
         $unique = parent::getPermissionName();
583 583
 
584 584
         if ($this->content) {
585
-            $unique = $unique."__".$this->content->id;
585
+            $unique = $unique . "__" . $this->content->id;
586 586
         }
587 587
 
588 588
         return $unique;
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
608 608
                         ],
609 609
                 ]);
610 610
 
611
-                $this->_content = CmsContent::getDb()->cache(function ($db) use ($content_id) {
611
+                $this->_content = CmsContent::getDb()->cache(function($db) use ($content_id) {
612 612
                     return CmsContent::find()->where([
613 613
                         "id" => $content_id,
614 614
                     ])->one();
Please login to merge, or discard this patch.