Merge branch 'master' of git://github.com/yiisoft/yii2

apps/advanced/composer.json

@@ -17,10 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*",
+        "yiisoft/yii2-swiftmailer": "*"
-        "bower-asset/jquery": "@stable",
-        "bower-asset/jquery-ui": "@stable",
-        "bower-asset/jquery.inputmask": "@stable"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",

apps/basic/composer.json

@@ -17,10 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*",
+        "yiisoft/yii2-swiftmailer": "*"
-        "bower-asset/jquery": "@stable",
-        "bower-asset/jquery-ui": "@stable",
-        "bower-asset/jquery.inputmask": "@stable"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",

composer.json

@@ -78,13 +78,13 @@
         "yiisoft/yii2-composer": "*",
         "ezyang/htmlpurifier": "4.6.*",
         "cebe/markdown": "0.9.*",
-        "bower-asset/jquery": "~1.11 | ~2.1",
+        "bower-asset/jquery": "2.1.*@stable | ~2.1@stable | ~1.11@stable",
-        "bower-asset/jquery.inputmask": "~3.1",
+        "bower-asset/jquery.inputmask": "3.1.* | ~3.1",
-        "bower-asset/punycode": "~1.3",
+        "bower-asset/punycode": "1.3.* | ~1.3",
-        "bower-asset/yii2-pjax": "~2.0",
+        "bower-asset/yii2-pjax": "2.0.* | ~2.0",
-        "bower-asset/bootstrap": "~3.2",
+        "bower-asset/bootstrap": "3.2.* | ~3.1",
-        "bower-asset/jquery-ui": "~1.11",
+        "bower-asset/jquery-ui": "1.11.*@stable | ~1.11@stable",
-        "bower-asset/typeahead.js": "~0.10"
+        "bower-asset/typeahead.js": "0.10.* | ~0.10"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
@@ -134,6 +134,9 @@
         "framework/yii"
     ],
     "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        },
         "asset-installer-paths": {
             "npm-asset-library": "vendor/npm",
             "bower-asset-library": "vendor/bower"

extensions/apidoc/composer.json

@@ -33,6 +33,9 @@
     },
     "bin": ["apidoc"],
     "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        },
         "asset-installer-paths": {
             "npm-asset-library": "vendor/npm",
             "bower-asset-library": "vendor/bower"

extensions/authclient/composer.json

@@ -23,5 +23,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\authclient\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/bootstrap/composer.json

@@ -19,11 +19,16 @@
     ],
     "require": {
         "yiisoft/yii2": "*",
-        "bower-asset/bootstrap": "~3.2"
+        "bower-asset/bootstrap": "3.2.* | ~3.1"
     },
     "autoload": {
         "psr-4": {
             "yii\\bootstrap\\": ""
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/codeception/composer.json

@@ -21,5 +21,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\codeception\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/composer/composer.json

@@ -17,13 +17,16 @@
             "email": "qiang.xue@gmail.com"
         }
     ],
+    "require": {
+        "composer-plugin-api": "1.0.0"
+    },
     "autoload": {
         "psr-4": { "yii\\composer\\": "" }
     },
     "extra": {
-		"class": "yii\\composer\\Plugin"
+        "class": "yii\\composer\\Plugin",
-	},
+        "branch-alias": {
-	"require": {
+            "dev-master": "2.0.x-dev"
-		"composer-plugin-api": "1.0.0"
+        }
     }
 }

extensions/debug/composer.json

@@ -25,5 +25,10 @@
         "psr-4": {
             "yii\\debug\\": ""
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/elasticsearch/composer.json

@@ -23,5 +23,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\elasticsearch\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/faker/composer.json

@@ -22,5 +22,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\faker\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/gii/composer.json

@@ -21,11 +21,16 @@
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
         "phpspec/php-diff": ">=1.0.2",
-        "bower-asset/typeahead.js": "~0.10"
+        "bower-asset/typeahead.js": "0.10.* | ~0.10"
     },
     "autoload": {
         "psr-4": {
             "yii\\gii\\": ""
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/imagine/composer.json

@@ -25,5 +25,10 @@
         "psr-4": {
             "yii\\imagine\\": ""
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/jui/composer.json

@@ -19,11 +19,16 @@
     ],
     "require": {
         "yiisoft/yii2": "*",
-        "bower-asset/jquery-ui": "~1.11"
+        "bower-asset/jquery-ui": "1.11.*@stable | ~1.11@stable"
     },
     "autoload": {
         "psr-4": {
             "yii\\jui\\": ""
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/mongodb/composer.json

@@ -23,5 +23,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\mongodb\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/redis/composer.json

@@ -22,5 +22,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\redis\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/smarty/composer.json

@@ -23,5 +23,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\smarty\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/sphinx/composer.json

@@ -24,5 +24,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\sphinx\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/swiftmailer/composer.json

@@ -23,5 +23,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\swiftmailer\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

extensions/twig/composer.json

@@ -23,5 +23,10 @@
     },
     "autoload": {
         "psr-4": { "yii\\twig\\": "" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
     }
 }

framework/composer.json

@@ -58,15 +58,20 @@
         "yiisoft/yii2-composer": "*",
         "ezyang/htmlpurifier": "4.6.*",
         "cebe/markdown": "0.9.*",
-        "bower-asset/jquery": "~1.11 | ~2.1",
+        "bower-asset/jquery": "2.1.*@stable | ~2.1@stable | ~1.11@stable",
-        "bower-asset/jquery.inputmask": "~3.1",
+        "bower-asset/jquery.inputmask": "3.1.* | ~3.1",
-        "bower-asset/punycode": "~1.3",
+        "bower-asset/punycode": "1.3.* | ~1.3",
-        "bower-asset/yii2-pjax": "~2.0"
+        "bower-asset/yii2-pjax": "2.0.* | ~2.0"
     },
     "autoload": {
         "psr-4": {"yii\\": ""}
     },
     "bin": [
         "yii"
-    ]
+    ],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    }
 }