From 9b1dfe54e9a43f09e0cee777cb095fdea680d2fd Mon Sep 17 00:00:00 2001 From: SilverFire - Dmitry Naumenko Date: Mon, 30 Nov 2015 08:28:48 +0200 Subject: [PATCH] Updated composer-asset-plugin requirement to `~1.1.1` all over the framework --- .travis.yml | 2 +- docs/guide-es/start-installation.md | 2 +- docs/guide-it/start-installation.md | 2 +- docs/guide-ja/start-installation.md | 2 +- docs/guide-ja/tutorial-start-from-scratch.md | 2 +- docs/guide-ja/tutorial-yii-integration.md | 2 +- docs/guide-pl/start-installation.md | 2 +- docs/guide-pl/tutorial-start-from-scratch.md | 2 +- docs/guide-pt-BR/start-installation.md | 2 +- docs/guide-pt-BR/tutorial-yii-integration.md | 2 +- docs/guide-ru/start-installation.md | 2 +- docs/guide-ru/tutorial-start-from-scratch.md | 2 +- docs/guide-ru/tutorial-yii-integration.md | 2 +- docs/guide-uk/start-installation.md | 2 +- docs/guide-uk/tutorial-start-from-scratch.md | 2 +- docs/guide-uk/tutorial-yii-integration.md | 2 +- docs/guide-vi/start-installation.md | 2 +- docs/guide-zh-CN/start-installation.md | 2 +- docs/guide/start-installation.md | 2 +- docs/guide/tutorial-start-from-scratch.md | 2 +- docs/guide/tutorial-yii-integration.md | 2 +- docs/internals-ja/git-workflow.md | 2 +- docs/internals/git-workflow.md | 2 +- framework/README.md | 2 +- framework/UPGRADE.md | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index a11284fbf1..8439f149ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ addons: install: - travis_retry composer self-update && composer --version - - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.0" + - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.1" - export PATH="$HOME/.composer/vendor/bin:$PATH" # core framework: - travis_retry composer install --prefer-dist --no-interaction diff --git a/docs/guide-es/start-installation.md b/docs/guide-es/start-installation.md index 2facf9bc1a..350bd8e644 100644 --- a/docs/guide-es/start-installation.md +++ b/docs/guide-es/start-installation.md @@ -26,7 +26,7 @@ Si ya tienes composer instalado asegurate que esté actualizado ejecutando `comp Teniendo Composer instalado, puedes instalar Yii ejecutando los siguientes comandos en un directorio accesible vía Web: Nota: es posible que en al ejecutar el primer comando te pida tu username - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic El comando anterior instala Yii dentro del directorio `basic`. diff --git a/docs/guide-it/start-installation.md b/docs/guide-it/start-installation.md index 8308552fcb..009cdcea5c 100644 --- a/docs/guide-it/start-installation.md +++ b/docs/guide-it/start-installation.md @@ -27,7 +27,7 @@ Se hai già Composer installato assicurati di avere una versione aggiornata. Puo Una volta installato Composer, puoi installare Yii eseguendo questo comando in una directory accessbile via web: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic Il primo comando installa il [plugin composer asset](https://github.com/francoispluchino/composer-asset-plugin/) diff --git a/docs/guide-ja/start-installation.md b/docs/guide-ja/start-installation.md index 425484a0b1..736ddff2ed 100644 --- a/docs/guide-ja/start-installation.md +++ b/docs/guide-ja/start-installation.md @@ -36,7 +36,7 @@ Composer は `composer self-update` コマンドを実行してアップデー Composer がインストールされたら、ウェブからアクセスできるフォルダで下記のコマンドを実行することによって Yii をインストールすることが出来ます。 - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic 最初のコマンドは [composer アセットプラグイン](https://github.com/francoispluchino/composer-asset-plugin/) をインストールします。 diff --git a/docs/guide-ja/tutorial-start-from-scratch.md b/docs/guide-ja/tutorial-start-from-scratch.md index ee4fbf41b4..76b1faf864 100644 --- a/docs/guide-ja/tutorial-start-from-scratch.md +++ b/docs/guide-ja/tutorial-start-from-scratch.md @@ -54,6 +54,6 @@ Yii の新しいプロジェクトテンプレートを作成するのに必要 これで、あなたのテンプレートを使ってプロジェクトを作成することが出来ます。 ``` -composer global require "fxp/composer-asset-plugin:~1.1.0" +composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project ``` diff --git a/docs/guide-ja/tutorial-yii-integration.md b/docs/guide-ja/tutorial-yii-integration.md index d3ab8c9a9c..4a67352e12 100644 --- a/docs/guide-ja/tutorial-yii-integration.md +++ b/docs/guide-ja/tutorial-yii-integration.md @@ -77,7 +77,7 @@ Yii は数多くの優れた機能を提供していますので、サードパ サードパーティのシステムが Composer を使って依存を管理している場合は、単に下記のコマンドを実行すれば Yii をインストールすることが出来ます。 - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer require yiisoft/yii2 composer install diff --git a/docs/guide-pl/start-installation.md b/docs/guide-pl/start-installation.md index 9371acfa24..9a074bea12 100644 --- a/docs/guide-pl/start-installation.md +++ b/docs/guide-pl/start-installation.md @@ -32,7 +32,7 @@ Jeśli posiadałeś już wcześniej zainstalowanego Composer'a, upewnij się, ż Z zainstalowanym Composer'em możesz przejść do instalacji Yii wywołując poniższe komendy w katalogu dostępnym w sieci web: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic Pierwsza komenda instaluje [wtyczkę zasobów](https://github.com/francoispluchino/composer-asset-plugin/), która pozwala na zarządzanie zasobami [Bower'a](http://bower.io) oraz [paczkami zależności NPM](https://www.npmjs.com/) przez Composer. diff --git a/docs/guide-pl/tutorial-start-from-scratch.md b/docs/guide-pl/tutorial-start-from-scratch.md index 303f589326..e6503e8b00 100644 --- a/docs/guide-pl/tutorial-start-from-scratch.md +++ b/docs/guide-pl/tutorial-start-from-scratch.md @@ -51,6 +51,6 @@ Użycie szablonu Tylko tyle jest wymagane, aby stworzyć nowy szablon projektu Yii. Teraz już możesz rozpocząć pracę nad świeżym projektem, używając swojego szablonu, za pomocą komend: ``` -composer global require "fxp/composer-asset-plugin:~1.1.0" +composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist --stability=dev mojafirma/yii2-app-fajna nowy-projekt ``` diff --git a/docs/guide-pt-BR/start-installation.md b/docs/guide-pt-BR/start-installation.md index 12e3f8dc38..8da8b8ed3f 100644 --- a/docs/guide-pt-BR/start-installation.md +++ b/docs/guide-pt-BR/start-installation.md @@ -46,7 +46,7 @@ Você pode atualizar o Composer executando o comando `composer self-update`. Com o Composer instalado, você pode instalar o Yii executando o seguinte comando em um diretório acessível pela Web: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic O primeiro comando instaka o [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/) diff --git a/docs/guide-pt-BR/tutorial-yii-integration.md b/docs/guide-pt-BR/tutorial-yii-integration.md index f5d9f5e368..14f118e2a9 100644 --- a/docs/guide-pt-BR/tutorial-yii-integration.md +++ b/docs/guide-pt-BR/tutorial-yii-integration.md @@ -66,7 +66,7 @@ Como o Yii fornece muitas características excelentes, algumas vezes você pode Se o sistema em questão utilizar o Composer para gerenciar suas dependências, você pode simplesmente executar o seguinte comando para instalar o Yii: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer require yiisoft/yii2 composer install diff --git a/docs/guide-ru/start-installation.md b/docs/guide-ru/start-installation.md index 5cfaa0c540..321bd866d8 100644 --- a/docs/guide-ru/start-installation.md +++ b/docs/guide-ru/start-installation.md @@ -29,7 +29,7 @@ После установки Composer устанавливать Yii можно запустив следующую команду в папке доступной через веб: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic Первая команда устанавливает [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/), diff --git a/docs/guide-ru/tutorial-start-from-scratch.md b/docs/guide-ru/tutorial-start-from-scratch.md index e477160fc4..b101d3551f 100644 --- a/docs/guide-ru/tutorial-start-from-scratch.md +++ b/docs/guide-ru/tutorial-start-from-scratch.md @@ -46,6 +46,6 @@ git clone git@github.com:yiisoft/yii2-app-basic.git Это все, что требуется для создания нового шаблона проекта в Yii. Сейчас вы можете создавать проекты, использующие ваш шаблон: ``` -composer global require "fxp/composer-asset-plugin:~1.1.0" +composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project ``` diff --git a/docs/guide-ru/tutorial-yii-integration.md b/docs/guide-ru/tutorial-yii-integration.md index 2f9dbdf706..43c92ede91 100644 --- a/docs/guide-ru/tutorial-yii-integration.md +++ b/docs/guide-ru/tutorial-yii-integration.md @@ -63,7 +63,7 @@ Yii::$classMap['Class2'] = 'path/to/Class2.php'; Если сторонняя система использует для управления зависимостями Composer, Yii можно просто установить с помощью следующих команд: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer require "yiisoft/yii2:*" composer install diff --git a/docs/guide-uk/start-installation.md b/docs/guide-uk/start-installation.md index d1998c1e34..17e0d1f861 100644 --- a/docs/guide-uk/start-installation.md +++ b/docs/guide-uk/start-installation.md @@ -37,7 +37,7 @@ Після встановлення Composer, встановити Yii можна виконавши наступну команду з директорії, яка доступна через Web: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic Перша команда встановить [плагін ресурсів composer (composer-asset-plugin)](https://github.com/francoispluchino/composer-asset-plugin/), diff --git a/docs/guide-uk/tutorial-start-from-scratch.md b/docs/guide-uk/tutorial-start-from-scratch.md index dd7d25d41a..bbbbfcbf2c 100644 --- a/docs/guide-uk/tutorial-start-from-scratch.md +++ b/docs/guide-uk/tutorial-start-from-scratch.md @@ -57,6 +57,6 @@ git clone git@github.com:yiisoft/yii2-app-basic.git Тепер ви можете створювати проекти, використовуючи свій шаблон: ``` -composer global require "fxp/composer-asset-plugin:~1.1.0" +composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project ``` \ No newline at end of file diff --git a/docs/guide-uk/tutorial-yii-integration.md b/docs/guide-uk/tutorial-yii-integration.md index 5686cb2d82..23cf560e74 100644 --- a/docs/guide-uk/tutorial-yii-integration.md +++ b/docs/guide-uk/tutorial-yii-integration.md @@ -83,7 +83,7 @@ Yii::$classMap['Class2'] = 'path/to/Class2.php'; Якщо стороння система використовує управління залежностями Composer, ви можете встановити Yii за допомогою наступних команд: - composer global require "fxp/composer-asset-plugin:~1.0.3" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer require yiisoft/yii2 composer install diff --git a/docs/guide-vi/start-installation.md b/docs/guide-vi/start-installation.md index 13d765e9fe..a641fc0a79 100644 --- a/docs/guide-vi/start-installation.md +++ b/docs/guide-vi/start-installation.md @@ -36,7 +36,7 @@ Nếu bạn đã cài Composer rồi, hãy chắc chắn rằng bạn đang sử Sau khi cài đặt Composer, bạn có thể cài đặt Yii bằng cách chạy lệnh sau ở thư mục Web mà ứng dụng cần chạy: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic Câu lệnh đầu tiên sẽ cài đặt [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/) diff --git a/docs/guide-zh-CN/start-installation.md b/docs/guide-zh-CN/start-installation.md index c03621c9a7..9cab5e74ce 100644 --- a/docs/guide-zh-CN/start-installation.md +++ b/docs/guide-zh-CN/start-installation.md @@ -22,7 +22,7 @@ Composer 安装后，切换到一个可通过 Web 访问的目录，执行如下命令即可安装 Yii ： - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic 第一条命令安装 [Composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/)，它是通过 Composer 管理 bower 和 npm 包所必须的，此命令全局生效，一劳永逸。 diff --git a/docs/guide/start-installation.md b/docs/guide/start-installation.md index 4aa4c7d9b6..a02f0e3827 100644 --- a/docs/guide/start-installation.md +++ b/docs/guide/start-installation.md @@ -37,7 +37,7 @@ by running `composer self-update`. With Composer installed, you can install Yii by running the following commands under a Web-accessible folder: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist yiisoft/yii2-app-basic basic The first command installs the [composer asset plugin](https://github.com/francoispluchino/composer-asset-plugin/) diff --git a/docs/guide/tutorial-start-from-scratch.md b/docs/guide/tutorial-start-from-scratch.md index 2b1c8e7566..ee1ab5024e 100644 --- a/docs/guide/tutorial-start-from-scratch.md +++ b/docs/guide/tutorial-start-from-scratch.md @@ -50,6 +50,6 @@ Use the Template That's all that's required to create a new Yii project template. Now you can create projects using your template: ``` -composer global require "fxp/composer-asset-plugin:~1.1.0" +composer global require "fxp/composer-asset-plugin:~1.1.1" composer create-project --prefer-dist --stability=dev mysoft/yii2-app-coolone new-project ``` diff --git a/docs/guide/tutorial-yii-integration.md b/docs/guide/tutorial-yii-integration.md index bd2929d33f..597550b584 100644 --- a/docs/guide/tutorial-yii-integration.md +++ b/docs/guide/tutorial-yii-integration.md @@ -82,7 +82,7 @@ take two steps: install Yii, and bootstrap Yii. If the third-party system uses Composer to manage its dependencies, you can simply run the following commands to install Yii: - composer global require "fxp/composer-asset-plugin:~1.1.0" + composer global require "fxp/composer-asset-plugin:~1.1.1" composer require yiisoft/yii2 composer install diff --git a/docs/internals-ja/git-workflow.md b/docs/internals-ja/git-workflow.md index 84f152612e..a194a584de 100644 --- a/docs/internals-ja/git-workflow.md +++ b/docs/internals-ja/git-workflow.md @@ -33,7 +33,7 @@ git remote add upstream git://github.com/yiisoft/yii2.git - `composer update` を実行して、依存パッケージをインストールします ([composer をグローバルにインストール](https://getcomposer.org/doc/00-intro.md#globally) したものと仮定しています)。 -> Note|注意: `Problem 1 The requested package bower-asset/jquery could not be found in any version, there may be a typo in the package name.` というようなエラーが生ずる場合は、`composer global require "fxp/composer-asset-plugin:~1.1.0"` を実行する必要があります。 +> Note|注意: `Problem 1 The requested package bower-asset/jquery could not be found in any version, there may be a typo in the package name.` というようなエラーが生ずる場合は、`composer global require "fxp/composer-asset-plugin:~1.1.1"` を実行する必要があります。 - `php build/build dev/app basic` を実行して、ベーシックアプリケーションをクローンし、その依存パッケージをインストールします。 このコマンドは外部 composer パッケージは通常どおりインストールしますが、yii2 レポジトリは現在チェックアウトされているものをリンクします。 diff --git a/docs/internals/git-workflow.md b/docs/internals/git-workflow.md index cfefa4eb15..cc2f0f3c18 100644 --- a/docs/internals/git-workflow.md +++ b/docs/internals/git-workflow.md @@ -35,7 +35,7 @@ The following steps are not necessary if you want to work only on translations o - run `composer update` to install dependencies (assuming you have [composer installed globally](https://getcomposer.org/doc/00-intro.md#globally)). -> Note: If you see errors like `Problem 1 The requested package bower-asset/jquery could not be found in any version, there may be a typo in the package name.`, you will need to run `composer global require "fxp/composer-asset-plugin:~1.1.0"` +> Note: If you see errors like `Problem 1 The requested package bower-asset/jquery could not be found in any version, there may be a typo in the package name.`, you will need to run `composer global require "fxp/composer-asset-plugin:~1.1.1"` - run `php build/build dev/app basic` to clone the basic app and install composer dependencies for the basic app. This command will install foreign composer packages as normal but will link the yii2 repo to diff --git a/framework/README.md b/framework/README.md index ee12826909..8a17cf41bc 100644 --- a/framework/README.md +++ b/framework/README.md @@ -15,7 +15,7 @@ The preferred way to install the Yii framework is through [composer](http://getc Either run ``` -composer global require "fxp/composer-asset-plugin:~1.1.0" +composer global require "fxp/composer-asset-plugin:~1.1.1" composer require yiisoft/yii2 ``` diff --git a/framework/UPGRADE.md b/framework/UPGRADE.md index de83f0d808..c53c9224c9 100644 --- a/framework/UPGRADE.md +++ b/framework/UPGRADE.md @@ -11,7 +11,7 @@ for both A and B. Make sure you have global install of latest version of composer asset plugin: ``` -php composer.phar global require "fxp/composer-asset-plugin:~1.1.0" +php composer.phar global require "fxp/composer-asset-plugin:~1.1.1" ``` Upgrade from Yii 2.0.6