diff --git a/UPGRADE.md b/UPGRADE.md deleted file mode 100644 index 470e375..0000000 --- a/UPGRADE.md +++ /dev/null @@ -1,45 +0,0 @@ -Upgrading Instructions for Yii Framework v2 -=========================================== - -!!!IMPORTANT!!! - -The following upgrading instructions are cumulative. That is, -if you want to upgrade from version A to version C and there is -version B between A and C, you need to following the instructions -for both A and B. - - -General upgrade instructions ----------------------------- - -- Make a backup. -- Clean up your 'assets' folder. -- Replace 'framework' dir with the new one or point Git to a fresh - release tag and checkout. -- Check if everything is OK, if not — revert to previous stable version and post - issues to [Yii issue tracker](https://github.com/yiisoft/yii2/issues). - - -Upgrading from v1.1.x ---------------------- - -- All framework classes are now namespaced, and the name prefix `C` is removed. - -- The format of path alias is changed to `@yii/base/Component`. - In 1.x, this would be `system.base.CComponent`. See guide for more details. - -- The root alias `@yii` now represents the framework installation directory. - In 1.x, this is named as `system`. We also removed `zii` root alias. - -- `Object` serves as the base class that supports properties. And `Component` extends - from `Object` and supports events and behaviors. Behaviors declared in - `Component::behaviors()` are attached on demand. - -- All collection classes are dropped in favor of SPL classes. - -- `CFormModel` is removed. Please use `yii\base\Model` instead. - -- `CDbCriteria` is replaced by `yii\db\Query` which includes methods for - building a query. `CDbCommandBuilder` is replaced by `yii\db\QueryBuilder` - which has cleaner and more complete support of query building capabilities. - diff --git a/apps/bootstrap/composer.json b/apps/bootstrap/composer.json index c59c11b..86e399b 100644 --- a/apps/bootstrap/composer.json +++ b/apps/bootstrap/composer.json @@ -16,24 +16,6 @@ "vendor-dir": "vendor" }, "minimum-stability": "dev", - "repositories": [ - { - "type": "package", - "package": { - "name": "bestiejs/punycode.js", - "version": "1.2.1", - "dist": { - "url": "https://github.com/bestiejs/punycode.js/archive/1.2.1.zip", - "type": "zip" - }, - "source": { - "url": "https://github.com/bestiejs/punycode.js.git", - "type": "git", - "reference": "tags/1.2.1" - } - } - } - ], "require": { "php": ">=5.3.0", "yiisoft/yii2": "dev-master" diff --git a/apps/bootstrap/www/index.php b/apps/bootstrap/www/index.php index e354dbb..7938c85 100644 --- a/apps/bootstrap/www/index.php +++ b/apps/bootstrap/www/index.php @@ -3,7 +3,7 @@ // comment out the following line to disable debug mode defined('YII_DEBUG') or define('YII_DEBUG', true); -require(__DIR__ . '/../vendor/yiisoft/yii2/yii/yii.php'); +require(__DIR__ . '/../vendor/yiisoft/yii2/yii.php'); require(__DIR__ . '/../vendor/autoload.php'); $config = require(__DIR__ . '/../config/main.php'); diff --git a/composer.lock b/composer.lock deleted file mode 100644 index aff0bdb..0000000 --- a/composer.lock +++ /dev/null @@ -1,212 +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": "a8f949e337a229a4cfb41496a0071ef6", - "packages": [ - { - "name": "ezyang/htmlpurifier", - "version": "v4.5.0", - "source": { - "type": "git", - "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "v4.5.0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/v4.5.0", - "reference": "v4.5.0", - "shasum": "" - }, - "require": { - "php": ">=5.2" - }, - "type": "library", - "autoload": { - "psr-0": { - "HTMLPurifier": "library/" - }, - "files": [ - "library/HTMLPurifier.composer.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL" - ], - "authors": [ - { - "name": "Edward Z. Yang", - "email": "admin@htmlpurifier.org", - "homepage": "http://ezyang.com" - } - ], - "description": "Standards compliant HTML filter written in PHP", - "homepage": "http://htmlpurifier.org/", - "keywords": [ - "html" - ], - "time": "2013-02-18 00:04:08" - }, - { - "name": "michelf/php-markdown", - "version": "1.3", - "source": { - "type": "git", - "url": "https://github.com/michelf/php-markdown.git", - "reference": "1.3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/1.3", - "reference": "1.3", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-lib": "1.3.x-dev" - } - }, - "autoload": { - "psr-0": { - "Michelf": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Michel Fortin", - "email": "michel.fortin@michelf.ca", - "homepage": "http://michelf.ca/", - "role": "Developer" - }, - { - "name": "John Gruber", - "homepage": "http://daringfireball.net/" - } - ], - "description": "PHP Markdown", - "homepage": "http://michelf.ca/projects/php-markdown/", - "keywords": [ - "markdown" - ], - "time": "2013-04-11 18:53:11" - }, - { - "name": "smarty/smarty", - "version": "v3.1.13", - "source": { - "type": "svn", - "url": "http://smarty-php.googlecode.com/svn", - "reference": "/tags/v3.1.13/@4699" - }, - "require": { - "php": ">=5.2" - }, - "type": "library", - "autoload": { - "classmap": [ - "distribution/libs/Smarty.class.php", - "distribution/libs/SmartyBC.class.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL-3.0" - ], - "authors": [ - { - "name": "Monte Ohrt", - "email": "monte@ohrt.com" - }, - { - "name": "Uwe Tews", - "email": "uwe.tews@googlemail.com" - }, - { - "name": "Rodney Rehm", - "email": "rodney.rehm@medialize.de" - } - ], - "description": "Smarty - the compiling PHP template engine", - "homepage": "http://www.smarty.net", - "keywords": [ - "templating" - ], - "time": "2013-01-26 12:03:52" - }, - { - "name": "twig/twig", - "version": "v1.12.3", - "source": { - "type": "git", - "url": "https://github.com/fabpot/Twig.git", - "reference": "v1.12.3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.12.3", - "reference": "v1.12.3", - "shasum": "" - }, - "require": { - "php": ">=5.2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.12-dev" - } - }, - "autoload": { - "psr-0": { - "Twig_": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com" - } - ], - "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", - "keywords": [ - "templating" - ], - "time": "2013-04-08 12:40:11" - } - ], - "packages-dev": [ - - ], - "aliases": [ - - ], - "minimum-stability": "stable", - "stability-flags": [ - - ], - "platform": { - "php": ">=5.3.0" - }, - "platform-dev": [ - - ] -} diff --git a/CHANGELOG.md b/yii/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to yii/CHANGELOG.md diff --git a/yii/LICENSE.md b/yii/LICENSE.md new file mode 100644 index 0000000..6edcc4f --- /dev/null +++ b/yii/LICENSE.md @@ -0,0 +1,32 @@ +The Yii framework is free software. It is released under the terms of +the following BSD License. + +Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com) +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name of Yii Software LLC nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/yii/README.md b/yii/README.md new file mode 100644 index 0000000..1cbfdf8 --- /dev/null +++ b/yii/README.md @@ -0,0 +1,21 @@ +Yii 2.0 Public Preview +====================== + +Thank you for choosing Yii - a high-performance component-based PHP framework. + +If you are looking for a production-ready PHP framework, please use +[Yii v1.1](https://github.com/yiisoft/yii). + +Yii 2.0 is still under heavy development. We may make significant changes +without prior notices. **Yii 2.0 is not ready for production use yet.** + +[![Build Status](https://secure.travis-ci.org/yiisoft/yii2.png)](http://travis-ci.org/yiisoft/yii2) + + + +REQUIREMENTS +------------ + +The minimum requirement by Yii is that your Web server supports PHP 5.3.?. + + diff --git a/yii/UPGRADE.md b/yii/UPGRADE.md new file mode 100644 index 0000000..99aced0 --- /dev/null +++ b/yii/UPGRADE.md @@ -0,0 +1,9 @@ +Upgrading Instructions for Yii Framework v2 +=========================================== + +!!!IMPORTANT!!! + +The following upgrading instructions are cumulative. That is, +if you want to upgrade from version A to version C and there is +version B between A and C, you need to following the instructions +for both A and B. diff --git a/composer.json b/yii/composer.json similarity index 96% rename from composer.json rename to yii/composer.json index ea3d14d..eb4c734 100644 --- a/composer.json +++ b/yii/composer.json @@ -63,12 +63,6 @@ "irc": "irc://irc.freenode.net/yii", "source": "https://github.com/yiisoft/yii2" }, - "config": { - "vendor-dir": "yii/vendor" - }, - "bin": [ - "yii/yii" - ], "require": { "php": ">=5.3.0", "michelf/php-markdown": "1.3",