diff --git a/yii-2.0/_benchmark/setup.sh b/yii-2.0/_benchmark/setup.sh index 04ce5320e..358ca76b7 100644 --- a/yii-2.0/_benchmark/setup.sh +++ b/yii-2.0/_benchmark/setup.sh @@ -1,7 +1,4 @@ #!/bin/sh -# Yii 2.0 requires composer-asset-plugin -composer global require "fxp/composer-asset-plugin:~1.1.1" - composer install --no-dev --optimize-autoloader chmod o+w assets/ runtime/ web/assets/ diff --git a/yii-2.0/composer.json b/yii-2.0/composer.json index faf0732a1..871cc8e9c 100644 --- a/yii-2.0/composer.json +++ b/yii-2.0/composer.json @@ -33,6 +33,12 @@ "yii\\composer\\Installer::postCreateProject" ] }, + "repositories": [ + { + "type": "composer", + "url": "https://asset-packagist.org" + } + ], "extra": { "yii\\composer\\Installer::postCreateProject": { "setPermission": [ diff --git a/yii-2.0/composer.lock b/yii-2.0/composer.lock index 2daca2c7b..edb2400fd 100644 --- a/yii-2.0/composer.lock +++ b/yii-2.0/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "865ce4d9e6c2c445e707b268f070dd3f", - "content-hash": "185c162a729f4d9f0ec86a45029bb978", + "content-hash": "350ce26c168e9647b03c113a9127311b", "packages": [ { "name": "bower-asset/bootstrap", @@ -19,41 +18,14 @@ "type": "zip", "url": "https://api.github.com/repos/twbs/bootstrap/zipball/0b9c4a4007c44201dce9a6cc1a38407005c26c86", "reference": "0b9c4a4007c44201dce9a6cc1a38407005c26c86", - "shasum": "" + "shasum": null }, "require": { - "bower-asset/jquery": ">=1.9.1,<=3" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": [ - "less/bootstrap.less", - "dist/js/bootstrap.js" - ], - "bower-asset-ignore": [ - "/.*", - "_config.yml", - "CNAME", - "composer.json", - "CONTRIBUTING.md", - "docs", - "js/tests", - "test-infra" - ] + "bower-asset/jquery": ">=1.9.1,<4.0" }, + "type": "bower-asset", "license": [ "MIT" - ], - "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "keywords": [ - "css", - "framework", - "front-end", - "js", - "less", - "mobile-first", - "responsive", - "web" ] }, { @@ -68,76 +40,33 @@ "type": "zip", "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/c0185ab7c75aab88762c5aae780b9d83b80eda72", "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72", - "shasum": "" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "dist/jquery.js", - "bower-asset-ignore": [ - "package.json" - ] + "shasum": null }, + "type": "bower-asset", "license": [ "MIT" - ], - "keywords": [ - "browser", - "javascript", - "jquery", - "library" ] }, { "name": "bower-asset/jquery.inputmask", - "version": "3.3.4", + "version": "3.3.7", "source": { "type": "git", "url": "https://github.com/RobinHerbots/Inputmask.git", - "reference": "8a882bc471ba4077c4f8ecbe3d9d61c7558f3ef2" + "reference": "9835731cb78cac749734d94a1cb5bd70da4d3b10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/8a882bc471ba4077c4f8ecbe3d9d61c7558f3ef2", - "reference": "8a882bc471ba4077c4f8ecbe3d9d61c7558f3ef2", - "shasum": "" + "url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/9835731cb78cac749734d94a1cb5bd70da4d3b10", + "reference": "9835731cb78cac749734d94a1cb5bd70da4d3b10", + "shasum": null }, "require": { "bower-asset/jquery": ">=1.7" }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": [ - "./dist/inputmask/inputmask.dependencyLib", - "./dist/inputmask/inputmask", - "./dist/inputmask/inputmask.extensions", - "./dist/inputmask/inputmask.date.extensions", - "./dist/inputmask/inputmask.numeric.extensions", - "./dist/inputmask/inputmask.phone.extensions", - "./dist/inputmask/inputmask.regex.extensions", - "./dist/inputmask/jquery.inputmask" - ], - "bower-asset-ignore": [ - "**/*", - "!dist/*", - "!dist/inputmask/*", - "!dist/min/*", - "!dist/min/inputmask/*", - "!extra/bindings/*", - "!extra/dependencyLibs/*", - "!extra/phone-codes/*" - ] - }, + "type": "bower-asset", "license": [ "http://opensource.org/licenses/mit-license.php" - ], - "description": "jquery.inputmask is a jquery plugin which create an input mask.", - "keywords": [ - "form", - "input", - "inputmask", - "jquery", - "mask", - "plugins" ] }, { @@ -152,21 +81,9 @@ "type": "zip", "url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3", "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3", - "shasum": "" + "shasum": null }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "punycode.js", - "bower-asset-ignore": [ - "coverage", - "tests", - ".*", - "component.json", - "Gruntfile.js", - "node_modules", - "package.json" - ] - } + "type": "bower-asset" }, { "name": "bower-asset/yii2-pjax", @@ -180,40 +97,28 @@ "type": "zip", "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/60728da6ade5879e807a49ce59ef9a72039b8978", "reference": "60728da6ade5879e807a49ce59ef9a72039b8978", - "shasum": "" + "shasum": null }, "require": { "bower-asset/jquery": ">=1.8" }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "./jquery.pjax.js", - "bower-asset-ignore": [ - ".travis.yml", - "Gemfile", - "Gemfile.lock", - "CONTRIBUTING.md", - "vendor/", - "script/", - "test/" - ] - }, + "type": "bower-asset", "license": [ "MIT" ] }, { "name": "cebe/markdown", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/cebe/markdown.git", - "reference": "c30eb5e01fe021cc5bba2f9ee0eeef96d4931166" + "reference": "25b28bae8a6f185b5030673af77b32e1163d5c6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cebe/markdown/zipball/c30eb5e01fe021cc5bba2f9ee0eeef96d4931166", - "reference": "c30eb5e01fe021cc5bba2f9ee0eeef96d4931166", + "url": "https://api.github.com/repos/cebe/markdown/zipball/25b28bae8a6f185b5030673af77b32e1163d5c6e", + "reference": "25b28bae8a6f185b5030673af77b32e1163d5c6e", "shasum": "" }, "require": { @@ -260,25 +165,28 @@ "markdown", "markdown-extra" ], - "time": "2016-09-14 20:40:20" + "time": "2017-07-16T21:13:23+00:00" }, { "name": "ezyang/htmlpurifier", - "version": "v4.8.0", + "version": "v4.9.3", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2" + "reference": "95e1bae3182efc0f3422896a3236e991049dac69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2", - "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69", "shasum": "" }, "require": { "php": ">=5.2" }, + "require-dev": { + "simpletest/simpletest": "^1.1" + }, "type": "library", "autoload": { "psr-0": { @@ -304,20 +212,20 @@ "keywords": [ "html" ], - "time": "2016-07-16 12:58:58" + "time": "2017-06-03T02:28:16+00:00" }, { "name": "swiftmailer/swiftmailer", - "version": "v5.4.6", + "version": "v5.4.8", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e" + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e", - "reference": "81fdccfaf8bdc5d5d7a1ef6bb3a61bbb1a6c4a3e", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517", + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517", "shasum": "" }, "require": { @@ -358,25 +266,25 @@ "mail", "mailer" ], - "time": "2017-02-13 07:52:53" + "time": "2017-05-01T15:54:03+00:00" }, { "name": "yiisoft/yii2", - "version": "2.0.11.2", + "version": "2.0.12", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "ee996adec1dfd7babb67bd0c604f5bd6425fe5ab" + "reference": "70acbecc75cb26b6cd66d16be0b06e4b73db190d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/ee996adec1dfd7babb67bd0c604f5bd6425fe5ab", - "reference": "ee996adec1dfd7babb67bd0c604f5bd6425fe5ab", + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/70acbecc75cb26b6cd66d16be0b06e4b73db190d", + "reference": "70acbecc75cb26b6cd66d16be0b06e4b73db190d", "shasum": "" }, "require": { "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable", - "bower-asset/jquery.inputmask": "~3.2.2 | ~3.3.3", + "bower-asset/jquery.inputmask": "~3.2.2 | ~3.3.5", "bower-asset/punycode": "1.3.*", "bower-asset/yii2-pjax": "~2.0.1", "cebe/markdown": "~1.0.0 | ~1.1.0", @@ -458,7 +366,7 @@ "framework", "yii2" ], - "time": "2017-02-08 09:04:32" + "time": "2017-06-05T14:33:41+00:00" }, { "name": "yiisoft/yii2-bootstrap", @@ -508,7 +416,7 @@ "bootstrap", "yii2" ], - "time": "2016-03-17 03:29:28" + "time": "2016-03-17T03:29:28+00:00" }, { "name": "yiisoft/yii2-composer", @@ -558,20 +466,20 @@ "extension installer", "yii2" ], - "time": "2016-12-20 13:26:02" + "time": "2016-12-20T13:26:02+00:00" }, { "name": "yiisoft/yii2-swiftmailer", - "version": "2.0.6", + "version": "2.0.7", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-swiftmailer.git", - "reference": "26b900767f1031ff3a4668dfa36c10595875f0a5" + "reference": "8a03a62cbcb82e7697d3002eb43a8d2637f566ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/26b900767f1031ff3a4668dfa36c10595875f0a5", - "reference": "26b900767f1031ff3a4668dfa36c10595875f0a5", + "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/8a03a62cbcb82e7697d3002eb43a8d2637f566ec", + "reference": "8a03a62cbcb82e7697d3002eb43a8d2637f566ec", "shasum": "" }, "require": { @@ -608,7 +516,7 @@ "swiftmailer", "yii2" ], - "time": "2016-09-09 11:48:11" + "time": "2017-05-01T08:29:00+00:00" } ], "packages-dev": [ @@ -624,20 +532,12 @@ "type": "zip", "url": "https://api.github.com/repos/twitter/typeahead.js/zipball/588440f66559714280628a4f9799f0c4eb880a4a", "reference": "588440f66559714280628a4f9799f0c4eb880a4a", - "shasum": "" + "shasum": null }, "require": { "bower-asset/jquery": ">=1.7" }, - "require-dev": { - "bower-asset/jasmine-ajax": "~1.3.1", - "bower-asset/jasmine-jquery": "~1.5.2", - "bower-asset/jquery": "~1.7" - }, - "type": "bower-asset-library", - "extra": { - "bower-asset-main": "dist/typeahead.bundle.js" - } + "type": "bower-asset" }, { "name": "fzaninotto/faker", @@ -685,7 +585,7 @@ "faker", "fixtures" ], - "time": "2016-04-29 12:21:54" + "time": "2016-04-29T12:21:54+00:00" }, { "name": "phpspec/php-diff", @@ -723,20 +623,20 @@ } ], "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).", - "time": "2016-04-07 12:29:16" + "time": "2016-04-07T12:29:16+00:00" }, { "name": "yiisoft/yii2-codeception", - "version": "2.0.5", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-codeception.git", - "reference": "c916a36d09fc128b05a374e7922bc56854334d56" + "reference": "086c8c2d28736e7a484a7a8611b5cc84024e9fb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/c916a36d09fc128b05a374e7922bc56854334d56", - "reference": "c916a36d09fc128b05a374e7922bc56854334d56", + "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/086c8c2d28736e7a484a7a8611b5cc84024e9fb3", + "reference": "086c8c2d28736e7a484a7a8611b5cc84024e9fb3", "shasum": "" }, "require": { @@ -769,24 +669,24 @@ "yii2" ], "abandoned": "codeception/codeception", - "time": "2016-03-17 03:41:26" + "time": "2017-05-22T12:08:21+00:00" }, { "name": "yiisoft/yii2-debug", - "version": "2.0.7", + "version": "2.0.9", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-debug.git", - "reference": "a74a2433ad1dfda30a253a92f6db52c131807432" + "reference": "647be6c9d48dc2f3c2e2f33b9eba0a4ca78abde9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/a74a2433ad1dfda30a253a92f6db52c131807432", - "reference": "a74a2433ad1dfda30a253a92f6db52c131807432", + "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/647be6c9d48dc2f3c2e2f33b9eba0a4ca78abde9", + "reference": "647be6c9d48dc2f3c2e2f33b9eba0a4ca78abde9", "shasum": "" }, "require": { - "yiisoft/yii2": "~2.0.4", + "yiisoft/yii2": "~2.0.11", "yiisoft/yii2-bootstrap": "~2.0.0" }, "type": "yii2-extension", @@ -816,7 +716,7 @@ "debugger", "yii2" ], - "time": "2016-11-24 09:42:29" + "time": "2017-02-21T10:30:50+00:00" }, { "name": "yiisoft/yii2-faker", @@ -863,7 +763,7 @@ "faker", "yii2" ], - "time": "2015-03-01 06:22:44" + "time": "2015-03-01T06:22:44+00:00" }, { "name": "yiisoft/yii2-gii", @@ -916,7 +816,7 @@ "gii", "yii2" ], - "time": "2016-03-18 14:09:46" + "time": "2016-03-18T14:09:46+00:00" } ], "aliases": [], diff --git a/yii-2.0/config/web.php b/yii-2.0/config/web.php index cd2a8fe42..dbeba95ed 100644 --- a/yii-2.0/config/web.php +++ b/yii-2.0/config/web.php @@ -6,6 +6,10 @@ 'id' => 'basic', 'basePath' => dirname(__DIR__), 'bootstrap' => ['log'], + 'aliases' => [ + '@bower' => '@vendor/bower-asset', + '@npm' => '@vendor/npm-asset', + ], 'components' => [ 'request' => [ // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation