Reverted #7459, #7469, #7470

2025-11-09 01:27:20 +08:00 · 2015-02-27 02:25:54 +03:00
parent 30e45a4aea
commit aa0ebc7f5f
21 changed files with 58 additions and 57 deletions
--- a/apps/advanced/README.md
+++ b/apps/advanced/README.md
@ -75,7 +75,7 @@ You can then install the application using the following command:

 ~~~
 php composer.phar global require "fxp/composer-asset-plugin:1.0.0"
-php composer.phar create-project yiisoft/yii2-app-advanced advanced
+php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-advanced advanced
 ~~~


--- a/apps/advanced/composer.json
+++ b/apps/advanced/composer.json
@ -12,20 +12,20 @@
        "irc": "irc://irc.freenode.net/yii",
        "source": "https://github.com/yiisoft/yii2"
    },
+    "minimum-stability": "dev",
    "require": {
        "php": ">=5.4.0",
-        "yiisoft/yii2": "~2.0.0",
-        "yiisoft/yii2-bootstrap": "~2.0.0",
-        "yiisoft/yii2-swiftmailer": "~2.0.0"
+        "yiisoft/yii2": "*",
+        "yiisoft/yii2-bootstrap": "*",
+        "yiisoft/yii2-swiftmailer": "*"
    },
    "require-dev": {
-        "yiisoft/yii2-codeception": "~2.0.0",
-        "yiisoft/yii2-debug": "~2.0.0",
-        "yiisoft/yii2-gii": "~2.0.0",
-        "yiisoft/yii2-faker": "~2.0.0"
+        "yiisoft/yii2-codeception": "*",
+        "yiisoft/yii2-debug": "*",
+        "yiisoft/yii2-gii": "*",
+        "yiisoft/yii2-faker": "*"
    },
    "config": {
-        "preferred-install": "dist",
        "process-timeout": 1800
    },
    "extra": {
--- a/apps/basic/README.md
+++ b/apps/basic/README.md
@ -56,7 +56,7 @@ You can then install this application template using the following command:

 ~~~
 php composer.phar global require "fxp/composer-asset-plugin:1.0.0"
-php composer.phar create-project yiisoft/yii2-app-basic basic
+php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~

 Now you should be able to access the application through the following URL, assuming `basic` is the directory
--- a/apps/basic/composer.json
+++ b/apps/basic/composer.json
@ -12,20 +12,20 @@
        "irc": "irc://irc.freenode.net/yii",
        "source": "https://github.com/yiisoft/yii2"
    },
+    "minimum-stability": "dev",
    "require": {
        "php": ">=5.4.0",
-        "yiisoft/yii2": "~2.0.0",
-        "yiisoft/yii2-bootstrap": "~2.0.0",
-        "yiisoft/yii2-swiftmailer": "~2.0.0"
+        "yiisoft/yii2": "*",
+        "yiisoft/yii2-bootstrap": "*",
+        "yiisoft/yii2-swiftmailer": "*"
    },
    "require-dev": {
-        "yiisoft/yii2-codeception": "~2.0.0",
-        "yiisoft/yii2-debug": "~2.0.0",
-        "yiisoft/yii2-gii": "~2.0.0",
-        "yiisoft/yii2-faker": "~2.0.0"
+        "yiisoft/yii2-codeception": "*",
+        "yiisoft/yii2-debug": "*",
+        "yiisoft/yii2-gii": "*",
+        "yiisoft/yii2-faker": "*"
    },
    "config": {
-        "preferred-install": "dist",
        "process-timeout": 1800
    },
    "scripts": {
--- a/apps/benchmark/composer.json
+++ b/apps/benchmark/composer.json
@ -12,11 +12,12 @@
 		"irc": "irc://irc.freenode.net/yii",
 		"source": "https://github.com/yiisoft/yii2"
 	},
-    "require": {
-        "php": ">=5.4.0",
-        "yiisoft/yii2": "~2.0.0"
-    },
 	"config": {
 	  "vendor-dir": "protected/vendor"
+	},
+	"minimum-stability": "dev",
+	"require": {
+		"php": ">=5.4.0",
+		"yiisoft/yii2": "*"
 	}
 }
--- a/extensions/apidoc/composer.json
+++ b/extensions/apidoc/composer.json
@ -19,8 +19,8 @@
    ],
    "minimum-stability": "dev",
    "require": {
-        "yiisoft/yii2": "~2.0.0",
-        "yiisoft/yii2-bootstrap": "~2.0.0",
+        "yiisoft/yii2": "*",
+        "yiisoft/yii2-bootstrap": "*",
        "phpdocumentor/reflection": ">=1.0.3",
        "phpdocumentor/reflection-docblock": ">2.0.1",
        "nikic/php-parser": "0.9.*",
--- a/extensions/authclient/composer.json
+++ b/extensions/authclient/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "ext-curl": "*"
    },
    "autoload": {
--- a/extensions/bootstrap/composer.json
+++ b/extensions/bootstrap/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*"
    },
    "autoload": {
--- a/extensions/codeception/composer.json
+++ b/extensions/codeception/composer.json
@ -17,7 +17,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0"
+        "yiisoft/yii2": "*"
    },
    "autoload": {
        "psr-4": { "yii\\codeception\\": "" }
--- a/extensions/debug/composer.json
+++ b/extensions/debug/composer.json
@ -18,8 +18,8 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
-        "yiisoft/yii2-bootstrap": "~2.0.0"
+        "yiisoft/yii2": "*",
+        "yiisoft/yii2-bootstrap": "*"
    },
    "autoload": {
        "psr-4": {
--- a/extensions/elasticsearch/composer.json
+++ b/extensions/elasticsearch/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "ext-curl": "*"
    },
    "autoload": {
--- a/extensions/faker/composer.json
+++ b/extensions/faker/composer.json
@ -17,7 +17,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "fzaninotto/faker": "*"
    },
    "autoload": {
--- a/extensions/gii/composer.json
+++ b/extensions/gii/composer.json
@ -18,8 +18,8 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
-        "yiisoft/yii2-bootstrap": "~2.0.0",
+        "yiisoft/yii2": "*",
+        "yiisoft/yii2-bootstrap": "*",
        "phpspec/php-diff": ">=1.0.2",
        "bower-asset/typeahead.js": "0.10.*"
    },
--- a/extensions/imagine/composer.json
+++ b/extensions/imagine/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "imagine/imagine": "0.5.*"
    },
    "autoload": {
--- a/extensions/jui/composer.json
+++ b/extensions/jui/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "bower-asset/jquery-ui": "1.11.*@stable"
    },
    "autoload": {
--- a/extensions/mongodb/composer.json
+++ b/extensions/mongodb/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "ext-mongo": ">=1.5.0"
    },
    "autoload": {
--- a/extensions/redis/composer.json
+++ b/extensions/redis/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0"
+        "yiisoft/yii2": "*"
    },
    "autoload": {
        "psr-4": { "yii\\redis\\": "" }
--- a/extensions/smarty/composer.json
+++ b/extensions/smarty/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "smarty/smarty": "*"
    },
    "autoload": {
--- a/extensions/sphinx/composer.json
+++ b/extensions/sphinx/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "ext-pdo": "*",
        "ext-pdo_mysql": "*"
    },
--- a/extensions/swiftmailer/composer.json
+++ b/extensions/swiftmailer/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "swiftmailer/swiftmailer": "*"
    },
    "autoload": {
--- a/extensions/twig/composer.json
+++ b/extensions/twig/composer.json
@ -18,7 +18,7 @@
        }
    ],
    "require": {
-        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2": "*",
        "twig/twig": "*"
    },
    "autoload": {