From b062f62f35328d0f5003cc94b1adaec0eb9c0c6d Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Tue, 18 Jun 2013 00:58:34 +0400 Subject: [PATCH] Removed composer.lock from all apps. Currently it creates more problems since framework code changes rapidly. --- 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, 4 insertions(+), 448 deletions(-) delete mode 100644 apps/advanced/composer.lock create mode 100644 apps/basic/.gitignore delete mode 100644 apps/basic/composer.lock create mode 100644 apps/benchmark/.gitignore delete mode 100644 apps/benchmark/composer.lock diff --git a/apps/advanced/.gitignore b/apps/advanced/.gitignore index b1cf719..19dfc06 100644 --- a/apps/advanced/.gitignore +++ b/apps/advanced/.gitignore @@ -1 +1,2 @@ -/yii \ No newline at end of file +/yii +/composer.lock \ No newline at end of file diff --git a/apps/advanced/composer.lock b/apps/advanced/composer.lock deleted file mode 100644 index 3022597..0000000 --- a/apps/advanced/composer.lock +++ /dev/null @@ -1,164 +0,0 @@ -{ - "_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": "2d1053fbaaf2044054f273a71d0ccde0", - "packages": [ - { - "name": "yiisoft/yii2", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "3ad6334be076a80df3b2ea0b57f38bd0c6901989" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/3ad6334be076a80df3b2ea0b57f38bd0c6901989", - "reference": "3ad6334be076a80df3b2ea0b57f38bd0c6901989", - "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-06-02 19:19:29" - }, - { - "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 new file mode 100644 index 0000000..9dce4ff --- /dev/null +++ b/apps/basic/.gitignore @@ -0,0 +1 @@ +/composer.lock \ No newline at end of file diff --git a/apps/basic/composer.lock b/apps/basic/composer.lock deleted file mode 100644 index 3beca12..0000000 --- a/apps/basic/composer.lock +++ /dev/null @@ -1,164 +0,0 @@ -{ - "_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": "a558e011d6b5c7e8a1fda1afc159561c", - "packages": [ - { - "name": "yiisoft/yii2", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "ce2e402a2682bbc680154725abd6d3c423e6aaa5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/ce2e402a2682bbc680154725abd6d3c423e6aaa5", - "reference": "ce2e402a2682bbc680154725abd6d3c423e6aaa5", - "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-06-17 04:48:05" - }, - { - "name": "yiisoft/yii2-composer", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/yii2-composer.git", - "reference": "660ef5a4ea6945e6b754d009f6029b110ab4797d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/660ef5a4ea6945e6b754d009f6029b110ab4797d", - "reference": "660ef5a4ea6945e6b754d009f6029b110ab4797d", - "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-06-06 11:51:55" - } - ], - "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 new file mode 100644 index 0000000..9dce4ff --- /dev/null +++ b/apps/benchmark/.gitignore @@ -0,0 +1 @@ +/composer.lock \ No newline at end of file diff --git a/apps/benchmark/composer.lock b/apps/benchmark/composer.lock deleted file mode 100644 index bc8c472..0000000 --- a/apps/benchmark/composer.lock +++ /dev/null @@ -1,119 +0,0 @@ -{ - "_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": "25a338a613af40ef87f2e280057f0d8c", - "packages": [ - { - "name": "yiisoft/yii2", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "2d93f20ba6044ac3f1957300c4ae85fd98ecf47d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/2d93f20ba6044ac3f1957300c4ae85fd98ecf47d", - "reference": "2d93f20ba6044ac3f1957300c4ae85fd98ecf47d", - "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-29 02:55:14" - } - ], - "packages-dev": [ - - ], - "aliases": [ - - ], - "minimum-stability": "dev", - "stability-flags": { - "yiisoft/yii2": 20 - }, - "platform": { - "php": ">=5.3.0" - }, - "platform-dev": [ - - ] -}