skeeks-cms / cms

src/controllers/UpaPersonalController.php

Spacing +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
                         $e->sender->formModels['dm'] = $dm;
                     },
 
-                    'on beforeSave' => function (Event $e) {
+                    'on beforeSave' => function(Event $e) {
                         /**
                          * @var $action BackendModelUpdateAction;
                          * @var $model CmsUser;

src/cmsWidgets/treeMenu/TreeMenuCmsWidget.php

Spacing +2 added lines, -2 removed lines

@@ -315,12 +315,12 @@
 
     protected function _run()
     {
-        $key = $this->getCacheKey().'run';
+        $key = $this->getCacheKey() . 'run';
 
         $dependency = new TagDependency([
             'tags' =>
                 [
-                    $this->className().(string)$this->namespace,
+                    $this->className() . (string)$this->namespace,
                     (new Tree())->getTableCacheTag(),
                 ],
         ]);

src/cmsWidgets/contentElements/ContentElementsCmsWidget.php

Spacing +12 added lines, -12 removed lines

@@ -121,15 +121,15 @@ 
         $this->initDataProvider();
 
         if ($this->createdBy) {
-            $this->dataProvider->query->andWhere([$className::tableName().'.created_by' => $this->createdBy]);
+            $this->dataProvider->query->andWhere([$className::tableName() . '.created_by' => $this->createdBy]);
         }
 
         if ($this->active) {
-            $this->dataProvider->query->andWhere([$className::tableName().'.active' => $this->active]);
+            $this->dataProvider->query->andWhere([$className::tableName() . '.active' => $this->active]);
         }
 
         if ($this->content_ids) {
-            $this->dataProvider->query->andWhere([$className::tableName().'.content_id' => $this->content_ids]);
+            $this->dataProvider->query->andWhere([$className::tableName() . '.content_id' => $this->content_ids]);
         }
 
         if ($this->limit) {
@@ -178,12 +178,12 @@ 
                     $query->andWhere(
                         [
                             'or',
-                            [$className::tableName().'.tree_id' => $treeIds],
-                            [CmsContentElementTree::tableName().'.tree_id' => $treeIds],
+                            [$className::tableName() . '.tree_id' => $treeIds],
+                            [CmsContentElementTree::tableName() . '.tree_id' => $treeIds],
                         ]
                     );
                 } else {
-                    $query->andWhere([$className::tableName().'.tree_id' => $treeIds]);
+                    $query->andWhere([$className::tableName() . '.tree_id' => $treeIds]);
                 }
 
             }
@@ -193,14 +193,14 @@ 
 
         if ($this->enabledActiveTime == Cms::BOOL_Y) {
             $this->dataProvider->query->andWhere(
-                ["<=", $className::tableName().'.published_at', \Yii::$app->formatter->asTimestamp(time())]
+                ["<=", $className::tableName() . '.published_at', \Yii::$app->formatter->asTimestamp(time())]
             );
 
             $this->dataProvider->query->andWhere(
                 [
                     'or',
-                    [">=", $className::tableName().'.published_to', \Yii::$app->formatter->asTimestamp(time())],
-                    [CmsContentElement::tableName().'.published_to' => null],
+                    [">=", $className::tableName() . '.published_to', \Yii::$app->formatter->asTimestamp(time())],
+                    [CmsContentElement::tableName() . '.published_to' => null],
                 ]
             );
         }
@@ -212,7 +212,7 @@ 
             $this->dataProvider->query->with($this->with);
         }
 
-        $this->dataProvider->query->groupBy([$className::tableName().'.id']);
+        $this->dataProvider->query->groupBy([$className::tableName() . '.id']);
 
         if ($this->activeQueryCallback && is_callable($this->activeQueryCallback)) {
             $callback = $this->activeQueryCallback;
@@ -516,12 +516,12 @@ 
     }
     protected function _run()
     {
-        $cacheKey = $this->getCacheKey().'run';
+        $cacheKey = $this->getCacheKey() . 'run';
 
         $dependency = new TagDependency([
             'tags' =>
                 [
-                    $this->className().(string)$this->namespace,
+                    $this->className() . (string)$this->namespace,
                     (new CmsContentElement())->getTableCacheTag(),
                 ],
         ]);

src/components/Cms.php

Spacing +6 added lines, -6 removed lines

@@ -141,7 +141,7 @@ 
     }
     public function renderConfigForm(ActiveForm $form)
     {
-        echo \Yii::$app->view->renderFile(__DIR__.'/cms/_form.php', [
+        echo \Yii::$app->view->renderFile(__DIR__ . '/cms/_form.php', [
             'form'  => $form,
             'model' => $this,
         ], $this);
@@ -238,10 +238,10 @@ 
                 $this->noImageUrl = CmsAsset::getAssetUrl('img/image-not-found.jpg');
             }
 
-            \Yii::$app->view->on(View::EVENT_BEGIN_PAGE, function (Event $e) {
+            \Yii::$app->view->on(View::EVENT_BEGIN_PAGE, function(Event $e) {
                 if (!\Yii::$app->request->isAjax && !\Yii::$app->request->isPjax) {
                     \Yii::$app->response->getHeaders()->setDefault('X-Powered-CMS',
-                        $this->descriptor->name." {$this->descriptor->homepage}");
+                        $this->descriptor->name . " {$this->descriptor->homepage}");
 
                     /**
                      * @var $view View
@@ -250,7 +250,7 @@ 
                     if (!isset($view->metaTags[self::$_huck])) {
                         $view->registerMetaTag([
                             "name"    => base64_decode(self::$_huck),
-                            "content" => $this->descriptor->name." — {$this->descriptor->homepage}",
+                            "content" => $this->descriptor->name . " — {$this->descriptor->homepage}",
                         ], self::$_huck);
                     }
 
@@ -263,7 +263,7 @@ 
                 }
             });
 
-            \Yii::$app->user->on(\yii\web\User::EVENT_AFTER_LOGIN, function (UserEvent $e) {
+            \Yii::$app->user->on(\yii\web\User::EVENT_AFTER_LOGIN, function(UserEvent $e) {
                 $e->identity->logged_at = \Yii::$app->formatter->asTimestamp(time());
                 $e->identity->save(false);
 
@@ -371,7 +371,7 @@ 
                 'fields' => [
                     'access' => [
                         'class'   => HtmlBlock::class,
-                        'content' => function (HtmlBlock $htmlBlock) {
+                        'content' => function(HtmlBlock $htmlBlock) {
                             $content = \yii\bootstrap\Alert::widget([
                                 'options' => [
                                     'class' => 'alert-warning',

src/views/admin-component-settings/index.php

Braces +7 added lines, -3 removed lines

@@ -23,10 +23,11 @@ 
         </button>
         <small><?= \Yii::t('skeeks/cms',
                 'The settings for this component are stored in the database. This option will erase them from the database, but the component, restore the default values. As they have in the code the developer.') ?></small>
-    <?php else
+    <?php else {
         : ?>
         <small><?= \Yii::t('skeeks/cms', 'These settings not yet saved in the database') ?></small>
     <?php endif;
+}
     ?>
 </div>
 
@@ -45,9 +46,12 @@ 
     ]))->render(); ?>
 <? elseif ($formContent = $component->renderConfigForm($form)) : ?>
     <?= $formContent; ?>
-<? else : ?>
+<? else {
+    : ?>
     Нет редактируемых настроек для данного компонента
-<? endif; ?>
+<? endif;
+}
+?>
 
 <?= $form->buttonsStandart($component); ?>
 <?= $form->errorSummary(\yii\helpers\ArrayHelper::merge(

src/base/Widget.php

Spacing +10 added lines, -10 removed lines

@@ -82,7 +82,7 @@ 
 
         \Yii::$app->cmsToolbar->initEnabled();
         if (\Yii::$app->cmsToolbar->editWidgets == Cms::BOOL_Y && \Yii::$app->cmsToolbar->enabled) {
-            $id = 'sx-infoblock-'.$this->id;
+            $id = 'sx-infoblock-' . $this->id;
 
             return Html::beginTag('div',
                 [
@@ -126,10 +126,10 @@ 
 
     public function init()
     {
-        $this->_token = \Yii::t('skeeks/cms', 'Widget').': '.$this->id;
-        \Yii::beginProfile("Cms Widget: ".$this->_token);
+        $this->_token = \Yii::t('skeeks/cms', 'Widget') . ': ' . $this->id;
+        \Yii::beginProfile("Cms Widget: " . $this->_token);
         parent::init();
-        \Yii::endProfile("Cms Widget: ".$this->_token);
+        \Yii::endProfile("Cms Widget: " . $this->_token);
     }
     /**
      * @return string
@@ -138,17 +138,17 @@ 
     {
         if (YII_ENV == 'prod') {
             try {
-                \Yii::beginProfile("Run: ".$this->_token);
+                \Yii::beginProfile("Run: " . $this->_token);
                 $content = $this->_run();
-                \Yii::endProfile("Run: ".$this->_token);
+                \Yii::endProfile("Run: " . $this->_token);
             } catch (\Exception $e) {
                 $content = \Yii::t('skeeks/cms', 'Error widget {class}',
-                        ['class' => $this->className()])." (".$this->descriptor->name."): ".$e->getMessage();
+                        ['class' => $this->className()]) . " (" . $this->descriptor->name . "): " . $e->getMessage();
             }
         } else {
-            \Yii::beginProfile("Run: ".$this->_token);
+            \Yii::beginProfile("Run: " . $this->_token);
             $content = $this->_run();
-            \Yii::endProfile("Run: ".$this->_token);
+            \Yii::endProfile("Run: " . $this->_token);
         }
 
         if ($this->_isBegin) {
@@ -177,7 +177,7 @@ 
         $result = "";
 
         if (\Yii::$app->cmsToolbar->editWidgets == Cms::BOOL_Y && \Yii::$app->cmsToolbar->enabled) {
-            $id = 'sx-infoblock-'.$this->id;
+            $id = 'sx-infoblock-' . $this->id;
 
             $this->view->registerJs(<<<JS
 new sx.classes.toolbar.EditViewBlock({'id' : '{$id}'});

src/base/Component.php

Spacing +8 added lines, -8 removed lines

@@ -186,7 +186,7 @@ 
     {
         $this->_callAttributes = $this->attributes;
 
-        \Yii::beginProfile("Init: ".static::class);
+        \Yii::beginProfile("Init: " . static::class);
 
         if (!\Yii::$app instanceof Application) {
             if ($this->cmsSite === null && isset(\Yii::$app->currentSite) && \Yii::$app->currentSite->site) {
@@ -202,7 +202,7 @@ 
 
         $this->trigger(self::EVENT_INIT);
 
-        \Yii::endProfile("Init: ".static::class);
+        \Yii::endProfile("Init: " . static::class);
     }
 
     /**
@@ -217,7 +217,7 @@ 
             $this->_oldAttributes = $this->toArray($this->safeAttributes());
         } catch (\Exception $e) {
             \Yii::error(\Yii::t('skeeks/cms', '{cms} component error load defaul settings',
-                    ['cms' => 'Cms']).': '.$e->getMessage());
+                    ['cms' => 'Cms']) . ': ' . $e->getMessage());
         }
 
         return $this;
@@ -527,7 +527,7 @@ 
 
         if ($models = $this->getConfigFormModels()) {
             foreach ($models as $key => $model) {
-                $value[$key."Array"] = $model->attributes;
+                $value[$key . "Array"] = $model->attributes;
             }
         }
 
@@ -710,7 +710,7 @@ 
      */
     public function getCallableId()
     {
-        return $this->settingsId.'-callable';
+        return $this->settingsId . '-callable';
     }
 
     /**
@@ -721,7 +721,7 @@ 
     public function getSettingsId($autoGenerate = true)
     {
         if ($autoGenerate && $this->_settingsId === null) {
-            $this->_settingsId = static::$autoSettingsIdPrefix.static::$counterSettings++;
+            $this->_settingsId = static::$autoSettingsIdPrefix . static::$counterSettings++;
         }
 
         return $this->_settingsId;
@@ -805,7 +805,7 @@ 
         if (isset($this->{$name})) {
             $this->{$name} = $value;
         } else {
-            throw new InvalidParamException(get_class($this).' has no attribute named "'.$name.'".');
+            throw new InvalidParamException(get_class($this) . ' has no attribute named "' . $name . '".');
         }
     }
 
@@ -855,7 +855,7 @@ 
         if (isset($this->_oldAttributes[$name]) || $this->hasAttribute($name)) {
             $this->_oldAttributes[$name] = $value;
         } else {
-            throw new InvalidParamException(get_class($this).' has no attribute named "'.$name.'".');
+            throw new InvalidParamException(get_class($this) . ' has no attribute named "' . $name . '".');
         }
     }
 

src/widgets/FiltersWidget.php

Indentation +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
     public function init()
     {
         $defaultFiltersModel = [
-           'class' => DynamicConfigModel::class,
+            'class' => DynamicConfigModel::class,
         ];
 
         //Автомтическое конфигурирование колонок

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
                                 'visibleLabel' => \Yii::t('skeeks/cms', 'Display columns'),
                                 'hiddenLabel' => \Yii::t('skeeks/cms', 'Hidden columns'),
                             ],
-                            'on beforeRender' => function ($e) {
+                            'on beforeRender' => function($e) {
                                 $widgetField = $e->sender;
                                 $widgetField->widgetConfig['items'] = ArrayHelper::getValue(
                                     \Yii::$app->controller->getCallableData(),
@@ -127,9 +127,9 @@ 
         //Автомтическое конфигурирование колонок
         $this->_initAutoFilters();
 
-        $defaultFiltersModel = ArrayHelper::merge((array) $this->_autoDynamicModelData, $defaultFiltersModel);
+        $defaultFiltersModel = ArrayHelper::merge((array)$this->_autoDynamicModelData, $defaultFiltersModel);
 
-        $this->filtersModel = ArrayHelper::merge($defaultFiltersModel, (array) $this->filtersModel);
+        $this->filtersModel = ArrayHelper::merge($defaultFiltersModel, (array)$this->filtersModel);
         $this->filtersModel = \Yii::createObject($this->filtersModel);
         $this->filtersModel->load(\Yii::$app->request->get());
 

src/controllers/ImagingController.php

Spacing +15 added lines, -15 removed lines

@@ -43,7 +43,7 @@ 
         $extension = Imaging::getExtension($newFileSrc);
 
         if (!$extension) {
-            throw new \yii\base\Exception("Extension not found: ".$newFileSrc);
+            throw new \yii\base\Exception("Extension not found: " . $newFileSrc);
         }
 
 
@@ -53,31 +53,31 @@ 
 
 
         $newFile = File::object($newFileSrc);
-        $strposFilter = strpos($newFileSrc, "/".Imaging::THUMBNAIL_PREFIX);
+        $strposFilter = strpos($newFileSrc, "/" . Imaging::THUMBNAIL_PREFIX);
         if (!$strposFilter) {
-            throw new NotFoundHttpException("This is not a filter thumbnail: ".$newFileSrc);
+            throw new NotFoundHttpException("This is not a filter thumbnail: " . $newFileSrc);
         }
 
-        $originalFileSrc = substr($newFileSrc, 0, $strposFilter).".".$newFile->getExtension();
+        $originalFileSrc = substr($newFileSrc, 0, $strposFilter) . "." . $newFile->getExtension();
 
         //TODO: hardcode delete it in the future
         $webRoot = \Yii::getAlias('@webroot');
 
-        $originalFileRoot = $webRoot.DIRECTORY_SEPARATOR.$originalFileSrc;
-        $newFileRoot = $webRoot.DIRECTORY_SEPARATOR.$newFileSrc;
-        $newFileRootDefault = $webRoot.DIRECTORY_SEPARATOR.str_replace($newFile->getBaseName(),
-                Imaging::DEFAULT_THUMBNAIL_FILENAME.".".$extension, $newFileSrc);
+        $originalFileRoot = $webRoot . DIRECTORY_SEPARATOR . $originalFileSrc;
+        $newFileRoot = $webRoot . DIRECTORY_SEPARATOR . $newFileSrc;
+        $newFileRootDefault = $webRoot . DIRECTORY_SEPARATOR . str_replace($newFile->getBaseName(),
+                Imaging::DEFAULT_THUMBNAIL_FILENAME . "." . $extension, $newFileSrc);
 
         $originalFile = new File($originalFileRoot);
 
         if (!$originalFile->isExist()) {
-            throw new NotFoundHttpException("The original file is not found: ".$newFileSrc);
+            throw new NotFoundHttpException("The original file is not found: " . $newFileSrc);
         }
 
         //Проверено наличие оригинального файла, есть пути к оригиналу, и результирующему файлу.
         //Отслось собрать фильтр, и проверить наличие параметров. А так же проверить разрешены ли эти параметры, для этого в строке есть захэшированный ключь
 
-        $filterSting = substr($newFileSrc, ($strposFilter + strlen(DIRECTORY_SEPARATOR.Imaging::THUMBNAIL_PREFIX)),
+        $filterSting = substr($newFileSrc, ($strposFilter + strlen(DIRECTORY_SEPARATOR . Imaging::THUMBNAIL_PREFIX)),
             strlen($newFileSrc));
         $filterCode = explode("/", $filterSting);
         $filterCode = $filterCode[0]; //Код фильтра
@@ -86,12 +86,12 @@ 
         if ($params = \Yii::$app->request->get()) {
             $pramsCheckArray = explode(DIRECTORY_SEPARATOR, $filterSting);
             if (count($pramsCheckArray) < 3) {
-                throw new \yii\base\Exception("the control line not found: ".$newFileSrc);
+                throw new \yii\base\Exception("the control line not found: " . $newFileSrc);
             }
 
             $string = $imaging->getParamsCheckString($params);
             if ($pramsCheckArray[1] != $string) {
-                throw new \yii\base\Exception("Parameters invalid: ".$newFileSrc);
+                throw new \yii\base\Exception("Parameters invalid: " . $newFileSrc);
             }
         }
 
@@ -99,7 +99,7 @@ 
 
 
         if (!class_exists($filterClass)) {
-            throw new \ErrorException("Filter class is not created: ".$newFileSrc);
+            throw new \ErrorException("Filter class is not created: " . $newFileSrc);
         }
 
         /**
@@ -107,7 +107,7 @@ 
          */
         $filter = new $filterClass((array)$params);
         if (!is_subclass_of($filter, Filter::className())) {
-            throw new NotFoundHttpException("No child filter class: ".$newFileSrc);
+            throw new NotFoundHttpException("No child filter class: " . $newFileSrc);
         }
 
         try {
@@ -128,7 +128,7 @@ 
                 }
             }
 
-            $url = \Yii::$app->request->getUrl().($params ?
+            $url = \Yii::$app->request->getUrl() . ($params ?
                     ""//"?" . http_build_query($params) . '&sx-refresh'
                     : '?sx-refresh');