Merge pull request #5084 from yiisoft/asset-improvements

extensions/README.md

@@ -9,7 +9,7 @@ To add a new extension named `xyz` (must be in lower case), take the following s
    * `CHANGELOG.md`
    * `LICENSE.md`
 3. ask Qiang to create a subsplit for `xyz` and a composer package named `yii2-xyz`;
-4. modify `/composer.json` and add `xyz` to the `replace` section;
+4. modify `/composer.json` and add `yiisoft/yii2-xyz` to the `replace` section;
 5. If an extension contains js/css files or depends on external bower packages:
    * create `bower.json`
    * ask Qiang to register a bower package with the name `yii2-xyz`

extensions/bootstrap/BootstrapAsset.php

@@ -17,8 +17,8 @@ use yii\web\AssetBundle;
  */
 class BootstrapAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/bootstrap';
+    public $sourcePath = '@bower/bootstrap/dist';
     public $css = [
-        'dist/css/bootstrap.css',
+        'css/bootstrap.css',
     ];
 }

extensions/bootstrap/BootstrapPluginAsset.php

@@ -17,9 +17,9 @@ use yii\web\AssetBundle;
  */
 class BootstrapPluginAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/bootstrap';
+    public $sourcePath = '@bower/bootstrap/dist';
     public $js = [
-        'dist/js/bootstrap.js',
+        'js/bootstrap.js',
     ];
     public $depends = [
         'yii\web\JqueryAsset',

extensions/bootstrap/BootstrapThemeAsset.php

@@ -17,9 +17,9 @@ use yii\web\AssetBundle;
  */
 class BootstrapThemeAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/bootstrap';
+    public $sourcePath = '@bower/bootstrap/dist';
     public $css = [
-        'dist/css/bootstrap-theme.css',
+        'css/bootstrap-theme.css',
     ];
     public $depends = [
         'yii\bootstrap\BootstrapAsset',

extensions/gii/TypeAheadAsset.php

@@ -16,9 +16,9 @@ use yii\web\AssetBundle;
  */
 class TypeAheadAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/typeahead.js';
+    public $sourcePath = '@bower/typeahead.js/dist';
     public $js = [
-        'dist/typeahead.bundle.js',
+        'typeahead.bundle.js',
     ];
     public $depends = [
         'yii\bootstrap\BootstrapAsset',

framework/web/AssetManager.php

@@ -268,9 +268,9 @@ class AssetManager extends Component
             $asset = $bundle->sourcePath . '/' . $asset;
         }
 
-        $n = strlen($asset);
+        $n = mb_strlen($asset);
         foreach ($this->assetMap as $from => $to) {
-            $n2 = strlen($from);
+            $n2 = mb_strlen($from);
             if ($n2 <= $n && substr_compare($asset, $from, $n - $n2, $n2) === 0) {
                 return $to;
             }

framework/widgets/MaskedInputAsset.php

@@ -19,9 +19,9 @@ use yii\web\AssetBundle;
  */
 class MaskedInputAsset extends AssetBundle
 {
-    public $sourcePath = '@bower/jquery.inputmask';
+    public $sourcePath = '@bower/jquery.inputmask/dist';
     public $js = [
-        'dist/jquery.inputmask.bundle.js'
+        'jquery.inputmask.bundle.js'
     ];
     public $depends = [
         'yii\web\YiiAsset'

tests/unit/extensions/smarty/ViewRendererTest.php

@@ -56,7 +56,7 @@ class ViewRendererTest extends TestCase
         $view = $this->mockView();
         $content = $view->renderFile('@yiiunit/extensions/smarty/views/layout.tpl');
 
-        $this->assertEquals(1, preg_match('#<script src="/assets/[0-9a-z]+/dist/jquery\\.js"></script>\s*</body>#', $content), 'Content does not contain the jquery js:' . $content);
+        $this->assertEquals(1, preg_match('#<script src="/assets/[0-9a-z]+/jquery\\.js"></script>\s*</body>#', $content), 'Content does not contain the jquery js:' . $content);
     }
 
 

tests/unit/extensions/twig/ViewRendererTest.php

@@ -39,7 +39,7 @@ class ViewRendererTest extends DatabaseTestCase
         $view = $this->mockView();
         $content = $view->renderFile('@yiiunit/extensions/twig/views/layout.twig');
 
-        $this->assertEquals(1, preg_match('#<script src="/assets/[0-9a-z]+/dist/jquery\\.js"></script>\s*</body>#', $content), 'Content does not contain the jquery js:' . $content);
+        $this->assertEquals(1, preg_match('#<script src="/assets/[0-9a-z]+/jquery\\.js"></script>\s*</body>#', $content), 'Content does not contain the jquery js:' . $content);
     }
 
     public function testAppGlobal()