@@ -2,13 +2,13 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\installer\components; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 6 | +use app\modules\config\helpers\ConfigurationUpdater; |
|
| 7 | +use app\modules\config\models\Configurable; |
|
| 5 | 8 | use app\modules\installer\models\AdminUser; |
| 6 | 9 | use app\modules\installer\models\FinalStep; |
| 7 | -use Yii; |
|
| 8 | 10 | use yii\helpers\ArrayHelper; |
| 9 | 11 | use yii\helpers\VarDumper; |
| 10 | -use app\modules\config\helpers\ConfigurationUpdater; |
|
| 11 | -use app\modules\config\models\Configurable; |
|
| 12 | 12 | |
| 13 | 13 | class InstallerHelper |
| 14 | 14 | { |
@@ -6,11 +6,10 @@ |
||
| 6 | 6 | use app\modules\seo\assets\GoogleAnalyticsAssets; |
| 7 | 7 | use app\modules\shop\controllers\CartController; |
| 8 | 8 | use app\modules\shop\events\CartActionEvent; |
| 9 | +use app\modules\shop\helpers\CurrencyHelper; |
|
| 9 | 10 | use app\modules\shop\models\Currency; |
| 10 | 11 | use app\modules\shop\models\Order; |
| 11 | -use app\modules\shop\models\OrderItem; |
|
| 12 | 12 | use app\modules\shop\models\Product; |
| 13 | -use app\modules\shop\helpers\CurrencyHelper; |
|
| 14 | 13 | use yii\base\ActionEvent; |
| 15 | 14 | use yii\base\Event; |
| 16 | 15 | use yii\base\Object; |
@@ -11,6 +11,9 @@ discard block |
||
| 11 | 11 | protected $fileHandler; |
| 12 | 12 | protected $urlsCount = 0; |
| 13 | 13 | |
| 14 | + /** |
|
| 15 | + * @return resource |
|
| 16 | + */ |
|
| 14 | 17 | protected function getFileHandler() |
| 15 | 18 | { |
| 16 | 19 | if ($this->fileHandler === null) { |
@@ -38,12 +41,19 @@ discard block |
||
| 38 | 41 | return rename($this->directory . $oldName, $this->directory . $newName); |
| 39 | 42 | } |
| 40 | 43 | |
| 44 | + /** |
|
| 45 | + * @param string|boolean $directory |
|
| 46 | + * @param string $domain |
|
| 47 | + */ |
|
| 41 | 48 | public function __construct($directory, $domain) |
| 42 | 49 | { |
| 43 | 50 | $this->directory = $directory; |
| 44 | 51 | $this->domain = $domain; |
| 45 | 52 | } |
| 46 | 53 | |
| 54 | + /** |
|
| 55 | + * @param string $url |
|
| 56 | + */ |
|
| 47 | 57 | public function addUrl($url) |
| 48 | 58 | { |
| 49 | 59 | // @todo convert "wrong" symbols |
@@ -94,7 +94,7 @@ |
||
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /** |
| 97 | - * @return array prepared to dropdown list in configurable |
|
| 97 | + * @return string[] prepared to dropdown list in configurable |
|
| 98 | 98 | */ |
| 99 | 99 | public static function getRedirectTypes() |
| 100 | 100 | { |
@@ -1,14 +1,13 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace app\modules\seo; |
| 3 | 3 | |
| 4 | +use Yii; |
|
| 4 | 5 | use app\components\BaseModule; |
| 5 | 6 | use app\modules\seo\handlers\AnalyticsHandler; |
| 6 | 7 | use app\modules\seo\models\Counter; |
| 7 | 8 | use app\modules\seo\models\Meta; |
| 8 | -use Yii; |
|
| 9 | 9 | use yii\base\BootstrapInterface; |
| 10 | 10 | use yii\web\Application; |
| 11 | -use yii\web\Controller; |
|
| 12 | 11 | use yii\web\View; |
| 13 | 12 | |
| 14 | 13 | class SeoModule extends BaseModule implements BootstrapInterface |
@@ -1,11 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace app\modules\shop\controllers; |
| 3 | 3 | |
| 4 | +use Yii; |
|
| 4 | 5 | use app\modules\core\behaviors\DisableRobotIndexBehavior; |
| 5 | 6 | use app\modules\shop\models\UserPreferences; |
| 6 | -use Yii; |
|
| 7 | -use yii\helpers\Url; |
|
| 8 | -use yii\validators\UrlValidator; |
|
| 9 | 7 | use yii\web\Controller; |
| 10 | 8 | use yii\web\Response; |
| 11 | 9 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | 121 | * Return delete modes list |
| 122 | - * @return array |
|
| 122 | + * @return string[] |
|
| 123 | 123 | */ |
| 124 | 124 | public static function deleteModesList() |
| 125 | 125 | { |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | /** |
| 240 | 240 | * Returns model using indentity map and cache |
| 241 | 241 | * @param int $id |
| 242 | - * @param int|null $isActive |
|
| 242 | + * @param integer $isActive |
|
| 243 | 243 | * @return Category|null |
| 244 | 244 | */ |
| 245 | 245 | public static function findById($id, $isActive = 1) |
@@ -275,6 +275,7 @@ discard block |
||
| 275 | 275 | /** |
| 276 | 276 | * Finds category by slug inside category_group_id |
| 277 | 277 | * Uses cache and identity_map |
| 278 | + * @param integer $category_group_id |
|
| 278 | 279 | */ |
| 279 | 280 | public static function findBySlug($slug, $category_group_id, $parent_id = 0) |
| 280 | 281 | { |
@@ -328,6 +329,7 @@ discard block |
||
| 328 | 329 | /** |
| 329 | 330 | * Ищет по name в рамках category_group_id |
| 330 | 331 | * Заносит в identity_map |
| 332 | + * @param integer $category_group_id |
|
| 331 | 333 | */ |
| 332 | 334 | public static function findByName($name, $category_group_id, $parent_id = 0) |
| 333 | 335 | { |
@@ -415,6 +417,7 @@ discard block |
||
| 415 | 417 | /** |
| 416 | 418 | * Ищет root для группы категорий |
| 417 | 419 | * Использует identity_map |
| 420 | + * @param integer $id |
|
| 418 | 421 | * @return Category|null |
| 419 | 422 | */ |
| 420 | 423 | public static function findRootForCategoryGroup($id = null) |
@@ -477,7 +480,7 @@ discard block |
||
| 477 | 480 | |
| 478 | 481 | /** |
| 479 | 482 | * @param int $parentId |
| 480 | - * @param int|null $isActive |
|
| 483 | + * @param integer $isActive |
|
| 481 | 484 | * @return Category[]|array |
| 482 | 485 | */ |
| 483 | 486 | public static function getByParentId($parentId = null, $isActive = 1) |
@@ -2,6 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\shop\models; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 5 | 6 | use app\behaviors\CleanRelations; |
| 6 | 7 | use app\behaviors\Tree; |
| 7 | 8 | use app\components\Helper; |
@@ -10,13 +11,11 @@ discard block |
||
| 10 | 11 | use app\properties\HasProperties; |
| 11 | 12 | use app\traits\GetImages; |
| 12 | 13 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
| 13 | -use Yii; |
|
| 14 | 14 | use yii\behaviors\TimestampBehavior; |
| 15 | 15 | use yii\caching\TagDependency; |
| 16 | 16 | use yii\data\ActiveDataProvider; |
| 17 | 17 | use yii\db\ActiveRecord; |
| 18 | 18 | use yii\db\Expression; |
| 19 | -use yii\helpers\ArrayHelper; |
|
| 20 | 19 | use yii\helpers\Url; |
| 21 | 20 | |
| 22 | 21 | /** |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | /** |
| 100 | - * @return Order|null |
|
| 100 | + * @return \yii\db\ActiveQuery |
|
| 101 | 101 | */ |
| 102 | 102 | public function getOrder() |
| 103 | 103 | { |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | /** |
| 108 | - * @return ShippingOption|null |
|
| 108 | + * @return \yii\db\ActiveQuery |
|
| 109 | 109 | */ |
| 110 | 110 | public function getShippingOption() |
| 111 | 111 | { |
@@ -2,6 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\shop\models; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 5 | 6 | use app\models\Property; |
| 6 | 7 | use app\models\PropertyGroup; |
| 7 | 8 | use app\properties\AbstractModel; |
@@ -9,7 +10,6 @@ discard block |
||
| 9 | 10 | use app\properties\PropertyValue; |
| 10 | 11 | use app\properties\traits\PropertyTrait; |
| 11 | 12 | use devgroup\TagDependencyHelper\ActiveRecordHelper; |
| 12 | -use Yii; |
|
| 13 | 13 | use yii\caching\TagDependency; |
| 14 | 14 | |
| 15 | 15 | /** |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | /** |
| 133 | - * @return OrderStageLeaf[] |
|
| 133 | + * @return \yii\db\ActiveQuery |
|
| 134 | 134 | */ |
| 135 | 135 | public function getNextLeafs() |
| 136 | 136 | { |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | /** |
| 142 | - * @return OrderStageLeaf[] |
|
| 142 | + * @return \yii\db\ActiveQuery |
|
| 143 | 143 | */ |
| 144 | 144 | public function getPrevLeafs() |
| 145 | 145 | { |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | /** |
| 98 | - * @return OrderStage|null |
|
| 98 | + * @return \yii\db\ActiveQuery |
|
| 99 | 99 | */ |
| 100 | 100 | public function getStageFrom() |
| 101 | 101 | { |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | - * @return OrderStage|null |
|
| 106 | + * @return \yii\db\ActiveQuery |
|
| 107 | 107 | */ |
| 108 | 108 | public function getStageTo() |
| 109 | 109 | { |