use yiins\Yii everywhere

composer.json

@@ -13,6 +13,7 @@
   },
   "require": {
     "yiisoft/yii": "~1.1.17",
+    "jbzoo/utils": "1.7.11",
     "clevertech/yii-booster": "4.0.1",
     "php": ">=7.0"
   }

src/Yii.php

@@ -10,7 +10,10 @@ class Yii extends \YiiBase
      */
     public static function web()
     {
-        return static::app();
+        /** @var \yiins\web\Application $app */
+        $app = static::app();
+
+        return $app;
     }
 
     /**
@@ -18,6 +21,9 @@ class Yii extends \YiiBase
      */
     public static function cli()
     {
-        return static::app();
+        /** @var \yiins\console\Application $app */
+        $app = static::app();
+
+        return $app;
     }
 }

src/assets/BoosterBundle.php

@@ -2,9 +2,9 @@
 
 namespace yiins\assets;
 
-use Yii;
 use yiins\exceptions\InvalidConfigException;
 use yiins\web\AssetBundle;
+use yiins\Yii;
 
 class BoosterBundle extends AssetBundle
 {

src/assets/Select2Asset.php

@@ -2,8 +2,8 @@
 
 namespace yiins\assets;
 
-use Yii;
 use yiins\web\AssetBundle;
+use yiins\Yii;
 
 class Select2Asset extends AssetBundle
 {

src/components/AliasedBehavior.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lcdee
- * Date: 04.04.2017
- * Time: 14:57
- */
 
 namespace yiins\components;
 

src/components/BatchQueryResult.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lcdee
- * Date: 16.03.2017
- * Time: 19:39
- */
 
 namespace yiins\components;
 

src/components/CompositeUniqueValidation.php

@@ -1,14 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lcdee
- * Date: 04.04.2017
- * Time: 16:26
- */
 
 namespace yiins\components;
 
 
+use yiins\Yii;
+
 trait CompositeUniqueValidation
 {
     public function compositeUnique($attribute, $params)
@@ -62,7 +58,7 @@ trait CompositeUniqueValidation
             if (isset($params['message'])) {
                 $message = $params['message'];
             }
-            $message = \Yii::t('yii', $message, $messageAttributes);
+            $message = Yii::t('yii', $message, $messageAttributes);
             $this->addError($attribute, $message);
         }
     }

src/components/Enum.php

@@ -4,6 +4,7 @@ namespace yiins\components;
 
 
 use yiins\exceptions\InvalidValueException;
+use yiins\Yii;
 
 abstract class Enum
 {
@@ -17,7 +18,7 @@ abstract class Enum
     {
         $className = get_class($this);
         if (!self::isValidValue($value, $useStrictMode)) {
-            throw new InvalidValueException(\Yii::t('errors', "Value {value} not found in enum {class}", [
+            throw new InvalidValueException(Yii::t('errors', "Value {value} not found in enum {class}", [
                 '{class}' => $className,
                 '{value}' => $value,
             ]));

src/components/EnumValidator.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lcdee
- * Date: 29.03.2017
- * Time: 17:03
- */
 
 namespace yiins\components;
 

src/components/FancyBox.php

@@ -1,15 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 27.01.2017
- * Time: 14:44
- */
 
 namespace yiins\components;
 
 use CHtml;
 use yiins\assets\FancyboxAsset;
+use yiins\Yii;
 
 class FancyBox
 {
@@ -41,7 +36,7 @@ class FancyBox
         $script = <<<JS
 $("$this->target").fancybox($config);
 JS;
-        \Yii::web()->getClientScript()->registerScript('fancybox-' . (CHtml::$count++), $script,
+        Yii::web()->getClientScript()->registerScript('fancybox-' . (CHtml::$count++), $script,
             \CClientScript::POS_READY);
     }
 }

src/components/ImageGD.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 15.02.2017
- * Time: 17:34
- */
 
 namespace yiins\components;
 

src/components/NSPost.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lcdee
- * Date: 28.01.2017
- * Time: 14:22
- */
 
 namespace yiins\components;
 

src/components/NestedSetBehavior.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 25.01.2017
- * Time: 13:41
- */
 
 namespace yiins\components;
 
@@ -23,7 +17,7 @@ use CDbException;
 use CDbExpression;
 use CException;
 use Exception;
-use Yii;
+use yiins\Yii;
 
 /**
  * Provides nested set functionality for a model.

src/components/Select2.php

@@ -1,15 +1,9 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 27.01.2017
- * Time: 18:37
- */
 
 namespace yiins\components;
 
-use Yii;
 use yiins\assets\Select2Asset;
+use yiins\Yii;
 
 class Select2
 {

src/components/Update.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lcdee
- * Date: 28.01.2017
- * Time: 1:25
- */
 
 namespace yiins\components;
 

src/console/Application.php

@@ -2,7 +2,7 @@
 
 namespace yiins\console;
 
-use Yii;
+use yiins\Yii;
 
 /**
  * Description of Application

src/console/CommandRunner.php

@@ -1,13 +1,9 @@
 <?php
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
 namespace yiins\console;
 
+use yiins\Yii;
+
 /**
  * Description of CommandRunner
  *
@@ -44,6 +40,7 @@ class CommandRunner extends \CConsoleCommandRunner
             }
         }
         closedir($dir);
+
         return $commands;
     }
 
@@ -74,16 +71,18 @@ class CommandRunner extends \CConsoleCommandRunner
                     }
                 } else // an alias
                 {
-                    $className = \Yii::import($command);
+                    $className = Yii::import($command);
                 }
                 if (class_exists($this->namespace . '\\' . $className)) {
                     $nsClassName = $this->namespace . '\\' . $className;
+
                     return new $nsClassName($name, $this);
                 }
+
                 return new $className($name, $this);
             } else // an array configuration
             {
-                return \Yii::createComponent($command, $name, $this);
+                return Yii::createComponent($command, $name, $this);
             }
         } elseif ($name === 'help') {
             return new \CHelpCommand('help', $this);

src/exceptions/InvalidConfigException.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 24.01.2017
- * Time: 11:54
- */
 
 namespace yiins\exceptions;
 

src/exceptions/InvalidParamException.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 24.01.2017
- * Time: 11:55
- */
 
 namespace yiins\exceptions;
 

src/exceptions/InvalidValueException.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 16.02.2017
- * Time: 15:45
- */
 
 namespace yiins\exceptions;
 

src/helpers/StringsHelper.php

@@ -19,24 +19,12 @@ final class StringsHelper
     {
         $text = strip_tags($text, $allowedTags);
         return Str::truncateSafe($text, $maxCount, $ellipses ? '...' : false);
-
-//        $helper = new self($text);
-//        $helper->stripTags($allowedTags);
-//        $helper->cropString($maxCount, $ellipses);
-//        return $helper->string;
     }
 
     public static function URLize($string)
     {
         $string = Slug::downcode($string, 'ru');
         return Slug::filter($string);
-//        $helper = new self($string);
-//        $helper->stripTags();
-//        $helper->cropString(100);
-//        $helper->lower();
-//        $helper->dashes();
-//        $helper->transliterate();
-//        return $helper->string;
     }
 
     public static function ucWords($string)

src/web/Action.php

@@ -1,14 +1,8 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 24.01.2017
- * Time: 11:11
- */
 
 namespace yiins\web;
 
-use Yii;
+use yiins\Yii;
 
 class Action extends \CAction
 {

src/web/Application.php

@@ -3,6 +3,8 @@
 
 namespace yiins\web;
 
+use yiins\Yii;
+
 /**
  * Description of Application
  *
@@ -21,7 +23,10 @@ class Application extends \CWebApplication
      */
     public function getUploadSaver()
     {
-        return $this->getComponent('uploadSaver');
+        /** @var UploadSaver $saver */
+        $saver = $this->getComponent('uploadSaver');
+
+        return $saver;
     }
 
     /**
@@ -40,13 +45,16 @@ class Application extends \CWebApplication
      */
     public function getResponse()
     {
-        return $this->getComponent('response');
+        /** @var Response $response */
+        $response = $this->getComponent('response');
+
+        return $response;
     }
 
     public function init()
     {
         parent::init();
-        \Yii::setPathOfAlias('@base', dirname(dirname(__FILE__)));
+        Yii::setPathOfAlias('@base', dirname(__DIR__));
         // preload 'response'.
         $this->getResponse();
         $this->getClientScript()->scriptMap = [
@@ -73,7 +81,7 @@ class Application extends \CWebApplication
             $controller->run($actionID);
             $this->setController($oldController);
         } else {
-            throw new \CHttpException(404, \Yii::t('yii', 'Unable to resolve the request "{route}".',
+            throw new \CHttpException(404, Yii::t('yii', 'Unable to resolve the request "{route}".',
                 array('{route}' => $route === '' ? $this->defaultController : $route)));
         }
     }
@@ -91,8 +99,10 @@ class Application extends \CWebApplication
             if ($this->_module !== null) {
                 return $this->_module;
             }
+
             return $this;
         }
+
         return parent::getModule($id);
     }
 

src/web/AssetBundle.php

@@ -2,7 +2,7 @@
 
 namespace yiins\web;
 
-use Yii;
+use yiins\Yii;
 
 /**
  * Class AssetBundle

src/web/Controller.php

@@ -2,7 +2,7 @@
 
 namespace yiins\web;
 
-use Yii;
+use yiins\Yii;
 
 class Controller extends \CController
 {

src/web/Image.php

@@ -1,16 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 15.02.2017
- * Time: 12:41
- */
 
 namespace yiins\web;
 
 use CHtml;
-use Yii;
 use yiins\components\ImageGD;
+use yiins\Yii;
 
 class Image
 {
@@ -27,7 +21,7 @@ class Image
 
     private final function __construct(array $options)
     {
-        $this->params = \Yii::app()->params['imagephp'] ?? [];
+        $this->params = Yii::app()->params['imagephp'] ?? [];
         $this->image = $options['image'] ?? '';
         $this->imagePath = realpath(Yii::web()->uploadSaver->uploadsPath . '/..' . $this->image);
         $this->width = $options['width'] ?? false;

src/web/InlineAction.php

@@ -1,14 +1,8 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 24.01.2017
- * Time: 11:17
- */
 
 namespace yiins\web;
 
-use Yii;
+use yiins\Yii;
 
 class InlineAction extends Action
 {

src/web/Request.php

@@ -1,16 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 23.01.2017
- * Time: 17:21
- */
 
 namespace yiins\web;
 
 use CException;
-use Yii;
 use yiins\exceptions\InvalidConfigException;
+use yiins\Yii;
 
 class Request extends \CHttpRequest
 {

src/web/Response.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 23.01.2017
- * Time: 17:24
- */
 
 namespace yiins\web;
 

src/web/UploadedFile.php

@@ -1,15 +1,9 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: AlexLcDee
- * Date: 01.02.2017
- * Time: 15:18
- */
 
 namespace yiins\web;
 
 use CUploadedFile;
-use Yii;
+use yiins\Yii;
 
 class UploadedFile extends CUploadedFile
 {

src/web/Widget.php

@@ -3,8 +3,8 @@
 namespace yiins\web;
 
 
-use Yii;
 use yiins\helpers\HtmlHelper;
+use yiins\Yii;
 
 class Widget extends \CWidget
 {
@@ -21,7 +21,7 @@ class Widget extends \CWidget
             return static::$_viewPaths[$className][$scope];
         }
 
-        if ($checkTheme && ($theme = Yii::app()->getTheme()) !== null) {
+        if ($checkTheme && ($theme = Yii::web()->getTheme()) !== null) {
             $path = $theme->getViewPath() . DIRECTORY_SEPARATOR;
             $path .= $className;
             if (is_dir($path)) {