From 833336340ebf412766f3b9eba9e51d3e1a783734 Mon Sep 17 00:00:00 2001 From: Luciano Baraglia Date: Sun, 26 May 2013 19:22:40 -0300 Subject: [PATCH 1/4] Removed dot from framework path --- apps/basic/requirements.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/basic/requirements.php b/apps/basic/requirements.php index c075760..c9e6493 100644 --- a/apps/basic/requirements.php +++ b/apps/basic/requirements.php @@ -11,7 +11,7 @@ */ // you may need to adjust this path to the correct Yii framework path -$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2/yii.'; +$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2/yii'; if (!is_dir($frameworkPath)) { echo '

Error

'; From a6c251d2ab6d222b5318cc7fa21eb3791a296c62 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Mon, 27 May 2013 00:21:18 +0200 Subject: [PATCH 2/4] Adjusted vendor dirs of example applications - update composer json to chosse right path - set vendorPath in application config if not default --- apps/advanced/backstage/config/main.php | 1 + apps/advanced/console/config/main.php | 1 + apps/advanced/frontend/config/main.php | 1 + apps/benchmark/.gitignore | 1 + apps/benchmark/composer.json | 3 +++ framework/yii/base/Application.php | 3 ++- 6 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 apps/benchmark/.gitignore diff --git a/apps/advanced/backstage/config/main.php b/apps/advanced/backstage/config/main.php index d3288bd..4898bfd 100644 --- a/apps/advanced/backstage/config/main.php +++ b/apps/advanced/backstage/config/main.php @@ -11,6 +11,7 @@ $params = array_merge( return array( 'id' => 'change-me', 'basePath' => dirname(__DIR__), + 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'preload' => array('log'), 'controllerNamespace' => 'backstage\controllers', 'modules' => array( diff --git a/apps/advanced/console/config/main.php b/apps/advanced/console/config/main.php index 83cb2e3..cceb311 100644 --- a/apps/advanced/console/config/main.php +++ b/apps/advanced/console/config/main.php @@ -11,6 +11,7 @@ $params = array_merge( return array( 'id' => 'change-me', 'basePath' => dirname(__DIR__), + 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'preload' => array('log'), 'controllerNamespace' => 'console\controllers', 'modules' => array( diff --git a/apps/advanced/frontend/config/main.php b/apps/advanced/frontend/config/main.php index 607c9a9..02a66c9 100644 --- a/apps/advanced/frontend/config/main.php +++ b/apps/advanced/frontend/config/main.php @@ -11,6 +11,7 @@ $params = array_merge( return array( 'id' => 'change-me', 'basePath' => dirname(__DIR__), + 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'preload' => array('log'), 'controllerNamespace' => 'frontend\controllers', 'modules' => array( diff --git a/apps/benchmark/.gitignore b/apps/benchmark/.gitignore new file mode 100644 index 0000000..2cf7a3f --- /dev/null +++ b/apps/benchmark/.gitignore @@ -0,0 +1 @@ +composer.lock \ No newline at end of file diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json index 4805f4f..e92f1d6 100644 --- a/apps/benchmark/composer.json +++ b/apps/benchmark/composer.json @@ -12,6 +12,9 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, + "config": { + "vendor-dir": "protected/vendor" + }, "minimum-stability": "dev", "require": { "php": ">=5.3.0", diff --git a/framework/yii/base/Application.php b/framework/yii/base/Application.php index fb9a6c1..eb0a0d3 100644 --- a/framework/yii/base/Application.php +++ b/framework/yii/base/Application.php @@ -207,7 +207,8 @@ class Application extends Module /** * Returns the directory that stores vendor files. - * @return string the directory that stores vendor files. Defaults to 'protected/vendor'. + * @return string the directory that stores vendor files. + * Defaults to 'vendor' directory under applications [[basePath]]. */ public function getVendorPath() { From dff144797dc4589130c9ce15ecc71d5345a9b493 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Mon, 27 May 2013 00:26:07 +0200 Subject: [PATCH 3/4] composer.json indentation fix --- apps/benchmark/composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json index e92f1d6..2b077e0 100644 --- a/apps/benchmark/composer.json +++ b/apps/benchmark/composer.json @@ -12,9 +12,9 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "config": { - "vendor-dir": "protected/vendor" - }, + "config": { + "vendor-dir": "protected/vendor" + }, "minimum-stability": "dev", "require": { "php": ">=5.3.0", From ff16c4ef050df6cfa0d6833b7b25027270cdd5f6 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Mon, 27 May 2013 00:48:49 +0200 Subject: [PATCH 4/4] Do not ignore composer.lock https://github.com/yiisoft/yii2/commit/a6c251d2ab6d222b5318cc7fa21eb3791a296c62#commitcomment-3291785 --- apps/advanced/.gitignore | 3 +- apps/advanced/composer.lock | 164 +++++++++++++++++++++++++++++++++++++++++++ apps/basic/.gitignore | 1 - apps/basic/composer.lock | 164 +++++++++++++++++++++++++++++++++++++++++++ apps/benchmark/.gitignore | 1 - apps/benchmark/composer.lock | 119 +++++++++++++++++++++++++++++++ 6 files changed, 448 insertions(+), 4 deletions(-) create mode 100644 apps/advanced/composer.lock delete mode 100644 apps/basic/.gitignore create mode 100644 apps/basic/composer.lock delete mode 100644 apps/benchmark/.gitignore create mode 100644 apps/benchmark/composer.lock diff --git a/apps/advanced/.gitignore b/apps/advanced/.gitignore index fd6a8d5..b1cf719 100644 --- a/apps/advanced/.gitignore +++ b/apps/advanced/.gitignore @@ -1,2 +1 @@ -/yii -composer.lock +/yii \ No newline at end of file diff --git a/apps/advanced/composer.lock b/apps/advanced/composer.lock new file mode 100644 index 0000000..761ae2f --- /dev/null +++ b/apps/advanced/composer.lock @@ -0,0 +1,164 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" + ], + "hash": "0b96a35ac23eae4e84ffd588653e88d2", + "packages": [ + { + "name": "yiisoft/yii2", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/yiisoft/yii2-framework.git", + "reference": "15a8d0559260e39954a8eb6de0d28bfb7de95e7b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/15a8d0559260e39954a8eb6de0d28bfb7de95e7b", + "reference": "15a8d0559260e39954a8eb6de0d28bfb7de95e7b", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "lib-pcre": "*", + "php": ">=5.3.7" + }, + "suggest": { + "ezyang/htmlpurifier": "Required by HtmlPurifier.", + "michelf/php-markdown": "Required by Markdown.", + "smarty/smarty": "Required by SmartyViewRenderer.", + "twig/twig": "Required by TwigViewRenderer." + }, + "type": "library", + "autoload": { + "psr-0": { + "yii\\": "/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Qiang Xue", + "email": "qiang.xue@gmail.com", + "homepage": "http://www.yiiframework.com/", + "role": "Founder and project lead" + }, + { + "name": "Alexander Makarov", + "email": "sam@rmcreative.ru", + "homepage": "http://rmcreative.ru/", + "role": "Core framework development" + }, + { + "name": "Maurizio Domba", + "homepage": "http://mdomba.info/", + "role": "Core framework development" + }, + { + "name": "Carsten Brandt", + "email": "mail@cebe.cc", + "homepage": "http://cebe.cc/", + "role": "Core framework development" + }, + { + "name": "Wei Zhuo", + "email": "weizhuo@gmail.com", + "role": "Project site maintenance and development" + }, + { + "name": "Sebastián Thierer", + "email": "sebas@artfos.com", + "role": "Component development" + }, + { + "name": "Jeffrey Winesett", + "email": "jefftulsa@gmail.com", + "role": "Documentation and marketing" + }, + { + "name": "Timur Ruziev", + "email": "resurtm@gmail.com", + "homepage": "http://resurtm.com/", + "role": "Core framework development" + }, + { + "name": "Paul Klimov", + "email": "klimov.paul@gmail.com", + "role": "Core framework development" + } + ], + "description": "Yii2 Web Programming Framework", + "homepage": "http://www.yiiframework.com/", + "keywords": [ + "framework", + "yii" + ], + "time": "2013-05-25 20:59:05" + }, + { + "name": "yiisoft/yii2-composer", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/yiisoft/yii2-composer.git", + "reference": "7ce4060faca940b836ab88de207638940a0a0568" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/7ce4060faca940b836ab88de207638940a0a0568", + "reference": "7ce4060faca940b836ab88de207638940a0a0568", + "shasum": "" + }, + "require": { + "yiisoft/yii2": "*" + }, + "type": "library", + "autoload": { + "psr-0": { + "yii\\composer": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Qiang Xue", + "email": "qiang.xue@gmail.com", + "homepage": "http://www.yiiframework.com/", + "role": "Founder and project lead" + } + ], + "description": "The composer integration for the Yii framework", + "keywords": [ + "composer", + "install", + "update", + "yii" + ], + "time": "2013-05-23 19:12:45" + } + ], + "packages-dev": [ + + ], + "aliases": [ + + ], + "minimum-stability": "dev", + "stability-flags": { + "yiisoft/yii2": 20, + "yiisoft/yii2-composer": 20 + }, + "platform": { + "php": ">=5.3.0" + }, + "platform-dev": [ + + ] +} diff --git a/apps/basic/.gitignore b/apps/basic/.gitignore deleted file mode 100644 index 2cf7a3f..0000000 --- a/apps/basic/.gitignore +++ /dev/null @@ -1 +0,0 @@ -composer.lock \ No newline at end of file diff --git a/apps/basic/composer.lock b/apps/basic/composer.lock new file mode 100644 index 0000000..a66bbea --- /dev/null +++ b/apps/basic/composer.lock @@ -0,0 +1,164 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" + ], + "hash": "0411dbbd774aa1c89256c77c68023940", + "packages": [ + { + "name": "yiisoft/yii2", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/yiisoft/yii2-framework.git", + "reference": "15a8d0559260e39954a8eb6de0d28bfb7de95e7b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/15a8d0559260e39954a8eb6de0d28bfb7de95e7b", + "reference": "15a8d0559260e39954a8eb6de0d28bfb7de95e7b", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "lib-pcre": "*", + "php": ">=5.3.7" + }, + "suggest": { + "ezyang/htmlpurifier": "Required by HtmlPurifier.", + "michelf/php-markdown": "Required by Markdown.", + "smarty/smarty": "Required by SmartyViewRenderer.", + "twig/twig": "Required by TwigViewRenderer." + }, + "type": "library", + "autoload": { + "psr-0": { + "yii\\": "/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Qiang Xue", + "email": "qiang.xue@gmail.com", + "homepage": "http://www.yiiframework.com/", + "role": "Founder and project lead" + }, + { + "name": "Alexander Makarov", + "email": "sam@rmcreative.ru", + "homepage": "http://rmcreative.ru/", + "role": "Core framework development" + }, + { + "name": "Maurizio Domba", + "homepage": "http://mdomba.info/", + "role": "Core framework development" + }, + { + "name": "Carsten Brandt", + "email": "mail@cebe.cc", + "homepage": "http://cebe.cc/", + "role": "Core framework development" + }, + { + "name": "Wei Zhuo", + "email": "weizhuo@gmail.com", + "role": "Project site maintenance and development" + }, + { + "name": "Sebastián Thierer", + "email": "sebas@artfos.com", + "role": "Component development" + }, + { + "name": "Jeffrey Winesett", + "email": "jefftulsa@gmail.com", + "role": "Documentation and marketing" + }, + { + "name": "Timur Ruziev", + "email": "resurtm@gmail.com", + "homepage": "http://resurtm.com/", + "role": "Core framework development" + }, + { + "name": "Paul Klimov", + "email": "klimov.paul@gmail.com", + "role": "Core framework development" + } + ], + "description": "Yii2 Web Programming Framework", + "homepage": "http://www.yiiframework.com/", + "keywords": [ + "framework", + "yii" + ], + "time": "2013-05-25 20:59:05" + }, + { + "name": "yiisoft/yii2-composer", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/yiisoft/yii2-composer.git", + "reference": "7ce4060faca940b836ab88de207638940a0a0568" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/7ce4060faca940b836ab88de207638940a0a0568", + "reference": "7ce4060faca940b836ab88de207638940a0a0568", + "shasum": "" + }, + "require": { + "yiisoft/yii2": "*" + }, + "type": "library", + "autoload": { + "psr-0": { + "yii\\composer": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Qiang Xue", + "email": "qiang.xue@gmail.com", + "homepage": "http://www.yiiframework.com/", + "role": "Founder and project lead" + } + ], + "description": "The composer integration for the Yii framework", + "keywords": [ + "composer", + "install", + "update", + "yii" + ], + "time": "2013-05-23 19:12:45" + } + ], + "packages-dev": [ + + ], + "aliases": [ + + ], + "minimum-stability": "dev", + "stability-flags": { + "yiisoft/yii2": 20, + "yiisoft/yii2-composer": 20 + }, + "platform": { + "php": ">=5.3.0" + }, + "platform-dev": [ + + ] +} diff --git a/apps/benchmark/.gitignore b/apps/benchmark/.gitignore deleted file mode 100644 index 2cf7a3f..0000000 --- a/apps/benchmark/.gitignore +++ /dev/null @@ -1 +0,0 @@ -composer.lock \ No newline at end of file diff --git a/apps/benchmark/composer.lock b/apps/benchmark/composer.lock new file mode 100644 index 0000000..c7a0324 --- /dev/null +++ b/apps/benchmark/composer.lock @@ -0,0 +1,119 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" + ], + "hash": "5ce5f1ad2aa7d7e31c3e216b8ce23387", + "packages": [ + { + "name": "yiisoft/yii2", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/yiisoft/yii2-framework.git", + "reference": "f3c3d9d764de25fc46711bce2259274bcceade1c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/f3c3d9d764de25fc46711bce2259274bcceade1c", + "reference": "f3c3d9d764de25fc46711bce2259274bcceade1c", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "lib-pcre": "*", + "php": ">=5.3.7" + }, + "suggest": { + "ezyang/htmlpurifier": "Required by HtmlPurifier.", + "michelf/php-markdown": "Required by Markdown.", + "smarty/smarty": "Required by SmartyViewRenderer.", + "twig/twig": "Required by TwigViewRenderer." + }, + "type": "library", + "autoload": { + "psr-0": { + "yii\\": "/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Qiang Xue", + "email": "qiang.xue@gmail.com", + "homepage": "http://www.yiiframework.com/", + "role": "Founder and project lead" + }, + { + "name": "Alexander Makarov", + "email": "sam@rmcreative.ru", + "homepage": "http://rmcreative.ru/", + "role": "Core framework development" + }, + { + "name": "Maurizio Domba", + "homepage": "http://mdomba.info/", + "role": "Core framework development" + }, + { + "name": "Carsten Brandt", + "email": "mail@cebe.cc", + "homepage": "http://cebe.cc/", + "role": "Core framework development" + }, + { + "name": "Wei Zhuo", + "email": "weizhuo@gmail.com", + "role": "Project site maintenance and development" + }, + { + "name": "Sebastián Thierer", + "email": "sebas@artfos.com", + "role": "Component development" + }, + { + "name": "Jeffrey Winesett", + "email": "jefftulsa@gmail.com", + "role": "Documentation and marketing" + }, + { + "name": "Timur Ruziev", + "email": "resurtm@gmail.com", + "homepage": "http://resurtm.com/", + "role": "Core framework development" + }, + { + "name": "Paul Klimov", + "email": "klimov.paul@gmail.com", + "role": "Core framework development" + } + ], + "description": "Yii2 Web Programming Framework", + "homepage": "http://www.yiiframework.com/", + "keywords": [ + "framework", + "yii" + ], + "time": "2013-05-26 21:57:00" + } + ], + "packages-dev": [ + + ], + "aliases": [ + + ], + "minimum-stability": "dev", + "stability-flags": { + "yiisoft/yii2": 20 + }, + "platform": { + "php": ">=5.3.0" + }, + "platform-dev": [ + + ] +}