Merge with master

.gitignore

@@ -19,6 +19,8 @@ Thumbs.db
 composer.phar
 # composer.lock should not be committed as we always want the latest versions
 /composer.lock
+# composer.lock in applications is ignored in dev repo, will be committed in checked out app repos
+/apps/*/composer.lock
 
 # Mac DS_Store Files
 .DS_Store

.travis.yml

@@ -5,14 +5,15 @@ php:
   - 5.5
   - 5.6
   - hhvm
+  - hhvm-nightly
 
-# run build against PHP 5.6 and hhvm but allow them to fail
+# run build against hhvm but allow them to fail
 # http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
 matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
-    - php: 5.6
+    - php: hhvm-nightly
 
 services:
   - redis-server
@@ -20,6 +21,10 @@ services:
   - elasticsearch
   - mongodb
 
+# try running against postgres 9.3
+addons:
+  postgresql: "9.3"
+
 install:
   - composer self-update && composer --version
 # core framework:
@@ -28,20 +33,8 @@ install:
   - tests/unit/data/travis/apc-setup.sh
   - tests/unit/data/travis/memcache-setup.sh
   - tests/unit/data/travis/cubrid-setup.sh
-# basic application:
-  - composer install --dev --prefer-dist -d apps/basic
-  - cd apps/basic && composer require --dev codeception/codeception:1.8.*@dev codeception/specify:* codeception/verify:*
-  - php vendor/bin/codecept build && cd ../..
-# advanced application:
-  - composer install --dev --prefer-dist -d apps/advanced
-  - cd apps/advanced && composer require --dev codeception/codeception:1.8.*@dev codeception/specify:* codeception/verify:*
-  - ./init --env=Development
-  - sed -i s/root/travis/ common/config/main-local.php
-  - cd backend && php ../vendor/bin/codecept build
-  - cd ../common && php ../vendor/bin/codecept build
-  - cd ../frontend && php ../vendor/bin/codecept build && cd ../../..
- # boot server
-  - cd apps && php -S localhost:8080 > /dev/null 2>&1 &
+# basic and advanced application:
+  - tests/unit/data/travis/setup-apps.sh
 
 before_script:
   - echo 'elasticsearch version ' && curl http://localhost:9200/
@@ -49,12 +42,8 @@ before_script:
   - psql -U postgres -c 'CREATE DATABASE yiitest;';
   - tests/unit/data/travis/sphinx-setup.sh
   - mongo yii2test --eval 'db.addUser("travis", "test");'
-  - mysql -e 'CREATE DATABASE yii2_advanced_acceptance;';
-  - mysql -e 'CREATE DATABASE yii2_advanced_functional;';
-  - mysql -e 'CREATE DATABASE yii2_advanced_unit;';
-  - cd apps/advanced/frontend/tests/acceptance && php yii migrate --interactive=0
-  - cd ../functional && php yii migrate --interactive=0
-  - cd ../unit && php yii migrate --interactive=0 && cd ../../../../..
+# basic and advanced application:
+  - tests/unit/data/travis/init-apps.sh
 
 script:
   - vendor/bin/phpunit --verbose --coverage-clover=coverage.clover --exclude-group mssql,oci,wincache,xcache,zenddata

CONTRIBUTING.md

@@ -2,5 +2,5 @@ Contributing to Yii2
 ====================
 
 - [Report an issue](docs/internals/report-an-issue.md)
-- [Translate documentation or messages](docs/internals/translations.md)
+- [Translate documentation or messages](docs/internals/translation-workflow.md)
 - [Contribute to the core code or fix bugs](docs/internals/getting-started.md)

README.md

@@ -20,10 +20,13 @@ which is the latest stable release of Yii.
 
 [![Latest Stable Version](https://poser.pugx.org/yiisoft/yii2/v/stable.png)](https://packagist.org/packages/yiisoft/yii2)
 [![Total Downloads](https://poser.pugx.org/yiisoft/yii2/downloads.png)](https://packagist.org/packages/yiisoft/yii2)
+[![Dependency Status](https://www.versioneye.com/php/yiisoft:yii2/dev-master/badge.png)](https://www.versioneye.com/php/yiisoft:yii2/dev-master)
 [![Build Status](https://secure.travis-ci.org/yiisoft/yii2.png)](http://travis-ci.org/yiisoft/yii2)
+[![HHVM Status](http://hhvm.h4cc.de/badge/yiisoft/yii2-dev.png)](http://hhvm.h4cc.de/package/yiisoft/yii2-dev)  
 [![Code Coverage](https://scrutinizer-ci.com/g/yiisoft/yii2/badges/coverage.png?s=31d80f1036099e9d6a3e4d7738f6b000b3c3d10e)](https://scrutinizer-ci.com/g/yiisoft/yii2/)
-[![Dependency Status](https://www.versioneye.com/php/yiisoft:yii2/dev-master/badge.png)](https://www.versioneye.com/php/yiisoft:yii2/dev-master)
 [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/yiisoft/yii2/badges/quality-score.png?s=b1074a1ff6d0b214d54fa5ab7abbb90fc092471d)](https://scrutinizer-ci.com/g/yiisoft/yii2/)
+[![Code Climate](https://codeclimate.com/github/yiisoft/yii2.png)](https://codeclimate.com/github/yiisoft/yii2)
+[![Reference Status](https://www.versioneye.com/php/yiisoft:yii2/reference_badge.svg)](https://www.versioneye.com/php/yiisoft:yii2/references)
 
 DIRECTORY STRUCTURE
 -------------------
@@ -53,7 +56,11 @@ DOCUMENTATION
 A draft of the [Definitive Guide](docs/guide/README.md) is available.
 
 API docs and a rendering of the definitive guide are currently
-available at http://stuff.cebe.cc/yii2docs/ (updated four times per hour) and at http://www.yiiframework.com/doc-2.0/guide-index.html.
+available under the following urls:
+
+- http://stuff.cebe.cc/yii2docs/ API and Definitive Guide (updated every 15 minutes from the github source)
+- http://www.yiiframework.com/doc-2.0/guide-index.html API and Definitive Guide (last updated for the beta release)
+- http://stuff.cebe.cc/yii2-guide.pdf The PDF version of the Guide
 
 For 1.1 users, you may refer to [Upgrading from Yii 1.1](docs/guide/intro-upgrade-from-v1.md)
 to have a general idea of what has changed in 2.0.

apps/advanced/README.md

@@ -100,7 +100,7 @@ TESTING
 -------
 
 Install additional composer packages:
-* `php composer.phar require --dev "codeception/codeception: 1.8.*@dev" "codeception/specify: *" "codeception/verify: *"`
+* `php composer.phar require --dev codeception/codeception:2.0.* codeception/specify:* codeception/verify:* yiisoft/yii2-faker:*`
 
 This application boilerplate use database in testing, so you should create three databases that are used in tests:
 * `yii2_advanced_unit` - database for unit tests;
@@ -113,7 +113,7 @@ it will upgrade your database to the last state according migrations.
 
 To be able to run acceptance tests you need a running webserver. For this you can use the php builtin server and run it in the directory where your main project folder is located. For example if your application is located in `/www/advanced` all you need to is:
 `cd /www` and then `php -S 127.0.0.1:8080` because the default configuration of acceptance tests expects the url of the application to be `/advanced/`.
-If you already have a server configured or your application is not located in a folder called `advanced`, you may need to adjust the `TEST_ENTRY_URL` in `frontend/tests/_bootstrap.php` and `backend/tests/_bootstrap.php`.
+If you already have a server configured or your application is not located in a folder called `advanced`, you may need to adjust the `test_entry_url` in `backend/codeception.yml` and `frontend/codeception.yml`.
 
 After that is done you should be able to run your tests, for example to run `frontend` tests do:
 
@@ -123,4 +123,7 @@ After that is done you should be able to run your tests, for example to run `fro
 
 In similar way you can run tests for other application tiers - `backend`, `console`, `common`.
 
+If you already have run `../vendor/bin/codecept build` for each application, you can run all tests by one command: `vendor/bin/codecept run`
+
 You also can adjust you application suite configs and `_bootstrap.php` settings to use other urls and files, as it is can be done in `yii2-basic`.
+Current template also includes [yii2-faker](https://github.com/yiisoft/yii2/tree/master/extensions/faker) extension, that is correctly setup for each application tier.

apps/advanced/backend/codeception.yml

+namespace: backend
+actor: Tester
 paths:
     tests: tests
     log: tests/_log
@@ -16,3 +18,7 @@ modules:
             user: ''
             password: ''
             dump: tests/_data/dump.sql
+config:
+    # the entry script URL (without host info) for functional and acceptance tests
+    # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
+    test_entry_url: /advanced/backend/web/index-test.php

apps/advanced/backend/tests/_bootstrap.php

 <?php
 
-// the entry script URL (without host info) for functional and acceptance tests
-// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/advanced/backend/web/index-test.php');
-
-// the entry script file path for functional and acceptance tests
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
@@ -18,6 +11,8 @@ require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 require(__DIR__ . '/../../common/config/aliases.php');
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+
+// the entry script file path for functional and acceptance tests
+$_SERVER['SCRIPT_FILENAME'] = dirname(__DIR__) . '/web/index-test.php';
+$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];
 $_SERVER['SERVER_NAME'] = 'localhost';

apps/advanced/backend/tests/_config.php

@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [

apps/advanced/backend/tests/_helpers/CodeHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for CodeGuy
-
-class CodeHelper extends \Codeception\Module
-{
-}

apps/advanced/backend/tests/_helpers/TestHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for TestGuy
-
-class TestHelper extends \Codeception\Module
-{
-}

apps/advanced/backend/tests/_helpers/WebHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for WebGuy
-
-class WebHelper extends \Codeception\Module
-{
-}

apps/advanced/backend/tests/acceptance.suite.yml

@@ -11,7 +11,6 @@
 class_name: WebGuy
 modules:
     enabled:
-        - WebHelper
         - PhpBrowser
         - common\tests\_helpers\FixtureHelper
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.

apps/advanced/backend/tests/acceptance/LoginCept.php

 <?php
 
 use common\tests\_pages\LoginPage;
+use backend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/backend/tests/functional.suite.yml

@@ -10,7 +10,6 @@ class_name: TestGuy
 modules:
     enabled:
       - Filesystem
-      - TestHelper
       - Yii2
       - common\tests\_helpers\FixtureHelper
     config:

apps/advanced/backend/tests/functional/LoginCept.php

 <?php
 
 use common\tests\_pages\LoginPage;
+use backend\TestGuy;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/backend/tests/functional/_config.php

 <?php
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SCRIPT_FILENAME'] = dirname(dirname(__DIR__)) . '/web/index-test.php';
+$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];;
 
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../config/main.php'),

apps/advanced/backend/tests/unit.suite.yml

@@ -4,5 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled: [CodeHelper]

apps/advanced/backend/tests/unit/_console.php

@@ -11,5 +11,12 @@ return yii\helpers\ArrayHelper::merge(
                 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
             ],
         ],
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => '@backend/tests/unit/fixtures/data',
+                'templatePath' => '@commmon/tests/templates/fixtures'
+            ],
+        ],
     ]
 );

apps/advanced/backend/views/layouts/main.php

@@ -5,10 +5,9 @@ use yii\bootstrap\Nav;
 use yii\bootstrap\NavBar;
 use yii\widgets\Breadcrumbs;
 
-/**
- * @var \yii\web\View $this
- * @var string $content
- */
+/* @var $this \yii\web\View */
+/* @var $content string */
+
 AppAsset::register($this);
 ?>
 <?php $this->beginPage() ?>
@@ -17,6 +16,7 @@ AppAsset::register($this);
 <head>
     <meta charset="<?= Yii::$app->charset ?>"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <?= Html::csrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
 </head>

apps/advanced/backend/views/site/error.php

@@ -2,12 +2,10 @@
 
 use yii\helpers\Html;
 
-/**
- * @var yii\web\View $this
- * @var string $name
- * @var string $message
- * @var Exception $exception
- */
+/* @var $this yii\web\View */
+/* @var $name string */
+/* @var $message string */
+/* @var $exception Exception */
 
 $this->title = $name;
 ?>

apps/advanced/backend/views/site/index.php

 <?php
-/**
- * @var yii\web\View $this
- */
+/* @var $this yii\web\View */
+
 $this->title = 'My Yii Application';
 ?>
 <div class="site-index">

apps/advanced/backend/views/site/login.php

@@ -2,11 +2,10 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var \common\models\LoginForm $model
- */
+/* @var $this yii\web\View */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $model \common\models\LoginForm */
+
 $this->title = 'Login';
 $this->params['breadcrumbs'][] = $this->title;
 ?>

apps/advanced/backend/web/css/site.css

 html,
 body {
-	height: 100%;
+    height: 100%;
 }
 
 .wrap {
-	min-height: 100%;
-	height: auto;
-	margin: 0 auto -60px;
-	padding: 0 0 60px;
+    min-height: 100%;
+    height: auto;
+    margin: 0 auto -60px;
+    padding: 0 0 60px;
 }
 
 .wrap > .container {
@@ -15,61 +15,61 @@ body {
 }
 
 .footer {
-	height: 60px;
-	background-color: #f5f5f5;
-	border-top: 1px solid #ddd;
-	padding-top: 20px;
+    height: 60px;
+    background-color: #f5f5f5;
+    border-top: 1px solid #ddd;
+    padding-top: 20px;
 }
 
 .jumbotron {
-	text-align: center;
-	background-color: transparent;
+    text-align: center;
+    background-color: transparent;
 }
 
 .jumbotron .btn {
-	font-size: 21px;
-	padding: 14px 24px;
+    font-size: 21px;
+    padding: 14px 24px;
 }
 
 .not-set {
-	color: #c55;
-	font-style: italic;
+    color: #c55;
+    font-style: italic;
 }
 
 /* add sorting icons to gridview sort links */
 a.asc:after, a.desc:after {
-	position: relative;
-	top: 1px;
-	display: inline-block;
-	font-family: 'Glyphicons Halflings';
-	font-style: normal;
-	font-weight: normal;
-	line-height: 1;
-	padding-left: 5px;
+    position: relative;
+    top: 1px;
+    display: inline-block;
+    font-family: 'Glyphicons Halflings';
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1;
+    padding-left: 5px;
 }
 
 a.asc:after {
-	content: /*"\e113"*/ "\e151";
+    content: /*"\e113"*/ "\e151";
 }
 
 a.desc:after {
-	content: /*"\e114"*/ "\e152";
+    content: /*"\e114"*/ "\e152";
 }
 
 .sort-numerical a.asc:after {
-	content: "\e153";
+    content: "\e153";
 }
 
 .sort-numerical a.desc:after {
-	content: "\e154";
+    content: "\e154";
 }
 
 .sort-ordinal a.asc:after {
-	content: "\e155";
+    content: "\e155";
 }
 
 .sort-ordinal a.desc:after {
-	content: "\e156";
+    content: "\e156";
 }
 
 .grid-view th {
@@ -77,15 +77,15 @@ a.desc:after {
 }
 
 .hint-block {
-	display: block;
-	margin-top: 5px;
-	color: #999;
+    display: block;
+    margin-top: 5px;
+    color: #999;
 }
 
 .error-summary {
-	color: #a94442;
-	background: #fdf7f7;
-	border-left: 3px solid #eed3d7;
-	padding: 10px 20px;
-	margin: 0 0 15px 0;
+    color: #a94442;
+    background: #fdf7f7;
+    border-left: 3px solid #eed3d7;
+    padding: 10px 20px;
+    margin: 0 0 15px 0;
 }

apps/advanced/codeception.yml

+include:
+  - common
+  - console
+  - backend
+  - frontend
+
+paths:
+  log: tests/_log
+
+settings:
+  colors: true

apps/advanced/common/codeception.yml

+namespace: common
+actor: Tester
 paths:
     tests: tests
     log: tests/_log

apps/advanced/common/config/main.php

 <?php
 return [
     'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
-    'extensions' => require(__DIR__ . '/../../vendor/yiisoft/extensions.php'),
     'components' => [
         'cache' => [
             'class' => 'yii\caching\FileCache',

apps/advanced/common/mail/layouts/html.php

 <?php
 use yii\helpers\Html;
 
-/**
- * @var \yii\web\View $this
- * @var \yii\mail\BaseMessage $content
- */
+/* @var $this \yii\web\View view component instance */
+/* @var $message \yii\mail\MessageInterface the message being composed */
+/* @var $content string main view render result */
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

apps/advanced/common/mail/passwordResetToken.php

 <?php
 use yii\helpers\Html;
 
-/**
- * @var yii\web\View $this
- * @var common\models\User $user
- */
+/* @var $this yii\web\View */
+/* @var $user common\models\User */
 
 $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]);
 ?>

apps/advanced/common/models/LoginForm.php

@@ -33,13 +33,16 @@ class LoginForm extends Model
     /**
      * Validates the password.
      * This method serves as the inline validation for password.
+     *
+     * @param string $attribute the attribute currently being validated
+     * @param array $params the additional name-value pairs given in the rule
      */
-    public function validatePassword()
+    public function validatePassword($attribute, $params)
     {
         if (!$this->hasErrors()) {
             $user = $this->getUser();
             if (!$user || !$user->validatePassword($this->password)) {
-                $this->addError('password', 'Incorrect username or password.');
+                $this->addError($attribute, 'Incorrect username or password.');
             }
         }
     }

apps/advanced/common/models/User.php

 <?php
 namespace common\models;
 
+use Yii;
 use yii\base\NotSupportedException;
+use yii\behaviors\TimestampBehavior;
 use yii\db\ActiveRecord;
-use yii\helpers\Security;
 use yii\web\IdentityInterface;
 
 /**
@@ -25,45 +26,46 @@ class User extends ActiveRecord implements IdentityInterface
 {
     const STATUS_DELETED = 0;
     const STATUS_ACTIVE = 10;
-
     const ROLE_USER = 10;
 
     /**
      * @inheritdoc
      */
+    public static function tableName()
+    {
+        return '{{%user}}';
+    }
+
+    /**
+     * @inheritdoc
+     */
     public function behaviors()
     {
         return [
-            'timestamp' => [
-                'class' => 'yii\behaviors\TimestampBehavior',
-                'attributes' => [
-                    ActiveRecord::EVENT_BEFORE_INSERT => ['created_at', 'updated_at'],
-                    ActiveRecord::EVENT_BEFORE_UPDATE => ['updated_at'],
-                ],
-            ],
+            TimestampBehavior::className(),
         ];
     }
 
     /**
       * @inheritdoc
       */
-     public function rules()
-     {
-         return [
-             ['status', 'default', 'value' => self::STATUS_ACTIVE],
-             ['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]],
+    public function rules()
+    {
+        return [
+            ['status', 'default', 'value' => self::STATUS_ACTIVE],
+            ['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]],
 
-             ['role', 'default', 'value' => self::ROLE_USER],
-             ['role', 'in', 'range' => [self::ROLE_USER]],
-         ];
-     }
+            ['role', 'default', 'value' => self::ROLE_USER],
+            ['role', 'in', 'range' => [self::ROLE_USER]],
+        ];
+    }
 
     /**
      * @inheritdoc
      */
     public static function findIdentity($id)
     {
-        return static::findOne($id);
+        return static::findOne(['id' => $id, 'status' => self::STATUS_ACTIVE]);
     }
 
     /**
@@ -77,7 +79,7 @@ class User extends ActiveRecord implements IdentityInterface
     /**
      * Finds user by username
      *
-     * @param  string      $username
+     * @param string $username
      * @return static|null
      */
     public static function findByUsername($username)
@@ -88,12 +90,12 @@ class User extends ActiveRecord implements IdentityInterface
     /**
      * Finds user by password reset token
      *
-     * @param  string      $token password reset token
+     * @param string $token password reset token
      * @return static|null
      */
     public static function findByPasswordResetToken($token)
     {
-        $expire = \Yii::$app->params['user.passwordResetTokenExpire'];
+        $expire = Yii::$app->params['user.passwordResetTokenExpire'];
         $parts = explode('_', $token);
         $timestamp = (int) end($parts);
         if ($timestamp + $expire < time()) {
@@ -134,12 +136,12 @@ class User extends ActiveRecord implements IdentityInterface
     /**
      * Validates password
      *
-     * @param  string  $password password to validate
+     * @param string $password password to validate
      * @return boolean if password provided is valid for current user
      */
     public function validatePassword($password)
     {
-        return Security::validatePassword($password, $this->password_hash);
+        return Yii::$app->security->validatePassword($password, $this->password_hash);
     }
 
     /**
@@ -149,7 +151,7 @@ class User extends ActiveRecord implements IdentityInterface
      */
     public function setPassword($password)
     {
-        $this->password_hash = Security::generatePasswordHash($password);
+        $this->password_hash = Yii::$app->security->generatePasswordHash($password);
     }
 
     /**
@@ -157,7 +159,7 @@ class User extends ActiveRecord implements IdentityInterface
      */
     public function generateAuthKey()
     {
-        $this->auth_key = Security::generateRandomKey();
+        $this->auth_key = Yii::$app->security->generateRandomString();
     }
 
     /**
@@ -165,7 +167,7 @@ class User extends ActiveRecord implements IdentityInterface
      */
     public function generatePasswordResetToken()
     {
-        $this->password_reset_token = Security::generateRandomKey() . '_' . time();
+        $this->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
     }
 
     /**

apps/advanced/common/tests/.gitignore

+# these files are auto generated by codeception build
+/unit/CodeGuy.php
+/functional/TestGuy.php
+/acceptance/WebGuy.php

apps/advanced/common/tests/_bootstrap.php

 <?php
 
-// the entry script URL (without host info) for functional and acceptance tests
-// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/index-test.php');
-
-// the entry script file path for functional and acceptance tests
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/index-test.php');
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
@@ -18,6 +11,4 @@ require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 require(__DIR__ . '/../../common/config/aliases.php');
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';

apps/advanced/common/tests/_config.php

@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [

apps/advanced/common/tests/_helpers/CodeHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for CodeGuy
-
-class CodeHelper extends \Codeception\Module
-{
-}

apps/advanced/common/tests/_helpers/TestHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for TestGuy
-
-class TestHelper extends \Codeception\Module
-{
-}

apps/advanced/common/tests/_helpers/WebHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for WebGuy
-
-class WebHelper extends \Codeception\Module
-{
-}

apps/advanced/common/tests/templates/fixtures/user.php

 <?php
+/**
+ * @var $faker \Faker\Generator
+ * @var $index integer
+ */
 
-use yii\helpers\Security;
+$security = Yii::$app->getSecurity();
 
 return [
-    'username' => 'userName',
-    'auth_key' => function ($fixture, $faker, $index) {
-        $fixture['auth_key'] = Security::generateRandomKey();
-
-        return $fixture;
-    },
-    'password_hash' => function ($fixture, $faker, $index) {
-        $fixture['password_hash'] = Security::generatePasswordHash('password_' . $index);
-
-        return $fixture;
-    },
-    'password_reset_token' => function ($fixture, $faker, $index) {
-        $fixture['password_reset_token'] = Security::generateRandomKey() . '_' . time();
-
-        return $fixture;
-    },
-    'created_at' => function ($fixture, $faker, $index) {
-        $fixture['created_at'] = time();
-
-        return $fixture;
-    },
-    'updated_at' => function ($fixture, $faker, $index) {
-        $fixture['updated_at'] = time();
-
-        return $fixture;
-    },
-    'email' => 'email',
+    'username' => $faker->userName,
+    'email' => $faker->email,
+    'auth_key' => $security->generateRandomString(),
+    'password_hash' => $security->generatePasswordHash('password_' . $index),
+    'password_reset_token' => $security->generateRandomString() . '_' . time(),
+    'created_at' => time(),
+    'updated_at' => time(),
 ];

apps/advanced/common/tests/unit.suite.yml

@@ -4,6 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled:
-      - CodeHelper

apps/advanced/common/tests/unit/DbTestCase.php

@@ -4,5 +4,5 @@ namespace common\tests\unit;
 
 class DbTestCase extends \yii\codeception\DbTestCase
 {
-    public $appConfig = '@frontend/tests/unit/_config.php';
+    public $appConfig = '@common/tests/unit/_config.php';
 }

apps/advanced/common/tests/unit/_console.php

@@ -11,5 +11,12 @@ return yii\helpers\ArrayHelper::merge(
                 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
             ],
         ],
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => '@common/tests/unit/fixtures/data',
+                'templatePath' => '@common/tests/templates/fixtures'
+            ],
+        ],
     ]
 );

apps/advanced/common/tests/unit/fixtures/data/models/user.php

+<?php
+
+return [
+    [
+        'username' => 'bayer.hudson',
+        'auth_key' => 'HP187Mvq7Mmm3CTU80dLkGmni_FUH_lR',
+        //password_0
+        'password_hash' => '$2y$13$EjaPFBnZOQsHdGuHI.xvhuDp1fHpo8hKRSk6yshqa9c5EG8s3C3lO',
+        'password_reset_token' => 'ExzkCOaYc1L8IOBs4wdTGGbgNiG3Wz1I_1402312317',
+        'created_at' => '1402312317',
+        'updated_at' => '1402312317',
+        'email' => 'nicole.paucek@schultz.info',
+    ],
+];

apps/advanced/common/tests/unit/models/LoginFormTest.php

@@ -3,14 +3,29 @@
 namespace common\tests\unit\models;
 
 use Yii;
-use frontend\tests\unit\TestCase;
-use common\models\User;
-use yii\helpers\Security;
+use common\tests\unit\DbTestCase;
+use Codeception\Specify;
+use common\models\LoginForm;
+use common\tests\fixtures\UserFixture;
 
-class LoginFormTest extends TestCase
+class LoginFormTest extends DbTestCase
 {
 
-    use \Codeception\Specify;
+    use Specify;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        Yii::configure(Yii::$app, [
+            'components' => [
+                'user' => [
+                    'class' => 'yii\web\User',
+                    'identityClass' => 'common\models\User',
+                ],
+            ],
+        ]);
+    }
 
     protected function tearDown()
     {
@@ -20,10 +35,10 @@ class LoginFormTest extends TestCase
 
     public function testLoginNoUser()
     {
-        $model = $this->mockUser(null);
-
-        $model->username = 'some_username';
-        $model->password = 'some_password';
+        $model = new LoginForm([
+            'username' => 'not_existing_username',
+            'password' => 'not_existing_password',
+        ]);
 
         $this->specify('user should not be able to login, when there is no identity', function () use ($model) {
             expect('model should not login user', $model->login())->false();
@@ -33,10 +48,10 @@ class LoginFormTest extends TestCase
 
     public function testLoginWrongPassword()
     {
-        $model = $this->mockUser(new User(['password_hash' => Security::generatePasswordHash('will-not-match')]));
-
-        $model->username = 'demo';
-        $model->password = 'wrong-password';
+        $model = new LoginForm([
+            'username' => 'bayer.hudson',
+            'password' => 'wrong_password',
+        ]);
 
         $this->specify('user should not be able to login with wrong password', function () use ($model) {
             expect('model should not login user', $model->login())->false();
@@ -47,10 +62,11 @@ class LoginFormTest extends TestCase
 
     public function testLoginCorrect()
     {
-        $model = $this->mockUser(new User(['password_hash' => Security::generatePasswordHash('demo')]));
 
-        $model->username = 'demo';
-        $model->password = 'demo';
+        $model = new LoginForm([
+            'username' => 'bayer.hudson',
+            'password' => 'password_0',
+        ]);
 
         $this->specify('user should be able to login with correct credentials', function () use ($model) {
             expect('model should login user', $model->login())->true();
@@ -59,11 +75,14 @@ class LoginFormTest extends TestCase
         });
     }
 
-    private function mockUser($user)
+    public function fixtures()
     {
-        $loginForm = $this->getMock('common\models\LoginForm', ['getUser']);
-        $loginForm->expects($this->any())->method('getUser')->will($this->returnValue($user));
-
-        return $loginForm;
+        return [
+            'user' => [
+                'class' => UserFixture::className(),
+                'dataFile' => '@common/tests/unit/fixtures/data/models/user.php'
+            ],
+        ];
     }
+
 }

apps/advanced/composer.json

 {
-	"name": "yiisoft/yii2-app-advanced",
-	"description": "Yii 2 Advanced Application Template",
-	"keywords": ["yii2", "framework", "advanced", "application template"],
-	"homepage": "http://www.yiiframework.com/",
-	"type": "project",
-	"license": "BSD-3-Clause",
-	"support": {
-		"issues": "https://github.com/yiisoft/yii2/issues?state=open",
-		"forum": "http://www.yiiframework.com/forum/",
-		"wiki": "http://www.yiiframework.com/wiki/",
-		"irc": "irc://irc.freenode.net/yii",
-		"source": "https://github.com/yiisoft/yii2"
-	},
-	"minimum-stability": "dev",
-	"require": {
-		"php": ">=5.4.0",
-		"yiisoft/yii2": "*",
-		"yiisoft/yii2-bootstrap": "*",
-		"yiisoft/yii2-swiftmailer": "*"
-	},
-	"require-dev": {
-		"yiisoft/yii2-codeception": "*",
-		"yiisoft/yii2-debug": "*",
-		"yiisoft/yii2-gii": "*"
-	},
-	"suggest": {
-		"codeception/codeception": "Codeception, 1.8.*@dev is currently works well with Yii.",
-		"codeception/specify": "BDD style code blocks for PHPUnit and Codeception",
-		"codeception/verify": "BDD Assertions for PHPUnit and Codeception",
-		"yiisoft/yii2-faker": "Fixtures generator for Yii2 based on Faker lib"
-	},
-	"scripts": {
-		"post-create-project-cmd": [
-			"yii\\composer\\Installer::setPermission"
-		]
-	},
-	"config": {
-		"process-timeout": 1800
-	},
-	"extra": {
-		"writable": [
-			"backend/runtime",
-			"backend/web/assets",
+    "name": "yiisoft/yii2-app-advanced",
+    "description": "Yii 2 Advanced Application Template",
+    "keywords": ["yii2", "framework", "advanced", "application template"],
+    "homepage": "http://www.yiiframework.com/",
+    "type": "project",
+    "license": "BSD-3-Clause",
+    "support": {
+        "issues": "https://github.com/yiisoft/yii2/issues?state=open",
+        "forum": "http://www.yiiframework.com/forum/",
+        "wiki": "http://www.yiiframework.com/wiki/",
+        "irc": "irc://irc.freenode.net/yii",
+        "source": "https://github.com/yiisoft/yii2"
+    },
+    "minimum-stability": "dev",
+    "require": {
+        "php": ">=5.4.0",
+        "yiisoft/yii2": "*",
+        "yiisoft/yii2-bootstrap": "*",
+        "yiisoft/yii2-swiftmailer": "*"
+    },
+    "require-dev": {
+        "yiisoft/yii2-codeception": "*",
+        "yiisoft/yii2-debug": "*",
+        "yiisoft/yii2-gii": "*"
+    },
+    "suggest": {
+        "codeception/codeception": "Codeception, 2.0.* is currently works well with Yii.",
+        "codeception/specify": "BDD style code blocks for PHPUnit and Codeception",
+        "codeception/verify": "BDD Assertions for PHPUnit and Codeception",
+        "yiisoft/yii2-faker": "Fixtures generator for Yii2 based on Faker lib"
+    },
+    "scripts": {
+        "post-create-project-cmd": [
+            "yii\\composer\\Installer::setPermission"
+        ]
+    },
+    "config": {
+        "process-timeout": 1800
+    },
+    "extra": {
+        "writable": [
+            "backend/runtime",
+            "backend/web/assets",
 
-			"frontend/runtime",
-			"frontend/web/assets"
-		]
-	}
+            "frontend/runtime",
+            "frontend/web/assets"
+        ]
+    }
 }

apps/advanced/console/codeception.yml

+namespace: console
+actor: Tester
 paths:
     tests: tests
     log: tests/_log

apps/advanced/console/migrations/m130524_201442_init.php

 <?php
 
 use yii\db\Schema;
+use yii\db\Migration;
 
-class m130524_201442_init extends \yii\db\Migration
+class m130524_201442_init extends Migration
 {
     public function up()
     {

apps/advanced/console/tests/_bootstrap.php

 <?php
 
-// the entry script URL (without host info) for functional and acceptance tests
-// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/index-test.php');
-
-// the entry script file path for functional and acceptance tests
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/index-test.php');
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
@@ -18,6 +11,4 @@ require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 require(__DIR__ . '/../../common/config/aliases.php');
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';

apps/advanced/console/tests/_config.php

@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [

apps/advanced/console/tests/_helpers/CodeHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for CodeGuy
-
-class CodeHelper extends \Codeception\Module
-{
-}

apps/advanced/console/tests/_helpers/TestHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for TestGuy
-
-class TestHelper extends \Codeception\Module
-{
-}

apps/advanced/console/tests/_helpers/WebHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for WebGuy
-
-class WebHelper extends \Codeception\Module
-{
-}

apps/advanced/console/tests/unit.suite.yml

@@ -4,5 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled: [CodeHelper]

apps/advanced/console/tests/unit/_config.php

 <?php
 
 return yii\helpers\ArrayHelper::merge(
+    require(__DIR__ . '/../../../common/config/main.php'),
+    require(__DIR__ . '/../../../common/config/main-local.php'),
     require(__DIR__ . '/../../config/main.php'),
     require(__DIR__ . '/../../config/main-local.php'),
     require(__DIR__ . '/../_config.php'),

apps/advanced/console/tests/unit/_console.php

@@ -11,5 +11,12 @@ return yii\helpers\ArrayHelper::merge(
                 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
             ],
         ],
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => '@console/tests/unit/fixtures/data',
+                'templatePath' => '@common/tests/templates/fixtures'
+            ],
+        ],
     ]
 );

apps/advanced/environments/dev/backend/config/main-local.php

 <?php
 
-$config = [];
+$config = [
+    'components' => [
+        'request' => [
+            // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
+            'cookieValidationKey' => '',
+        ],
+    ],
+];
 
 if (!YII_ENV_TEST) {
     // configuration adjustments for 'dev' environment

apps/advanced/environments/dev/common/config/main-local.php

@@ -8,9 +8,12 @@ return [
             'password' => '',
             'charset' => 'utf8',
         ],
-        'mail' => [
+        'mailer' => [
             'class' => 'yii\swiftmailer\Mailer',
             'viewPath' => '@common/mail',
+            // send all mails to a file by default. You have to set
+            // 'useFileTransport' to false and configure a transport
+            // for the mailer to send real emails.
             'useFileTransport' => true,
         ],
     ],

apps/advanced/environments/dev/frontend/config/main-local.php

 <?php
 
-$config = [];
+$config = [
+    'components' => [
+        'request' => [
+            // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
+            'cookieValidationKey' => '',
+        ],
+    ],
+];
 
 if (!YII_ENV_TEST) {
     // configuration adjustments for 'dev' environment

apps/advanced/environments/index.php

@@ -9,9 +9,15 @@
  * return [
  *     'environment name' => [
  *         'path' => 'directory storing the local files',
- *         'writable' => [
+ *         'setWritable' => [
  *             // list of directories that should be set writable
  *         ],
+ *         'setExecutable' => [
+ *             // list of directories that should be set executable
+ *         ],
+ *         'setCookieValidationKey' => [
+ *             // list of config files that need to be inserted with automatically generated cookie validation keys
+ *         ],
  *     ],
  * ];
  * ```
@@ -19,26 +25,34 @@
 return [
     'Development' => [
         'path' => 'dev',
-        'writable' => [
+        'setWritable' => [
             'backend/runtime',
             'backend/web/assets',
             'frontend/runtime',
             'frontend/web/assets',
         ],
-        'executable' => [
+        'setExecutable' => [
             'yii',
         ],
+        'setCookieValidationKey' => [
+            'backend/config/main-local.php',
+            'frontend/config/main-local.php',
+        ],
     ],
     'Production' => [
         'path' => 'prod',
-        'writable' => [
+        'setWritable' => [
             'backend/runtime',
             'backend/web/assets',
             'frontend/runtime',
             'frontend/web/assets',
         ],
-        'executable' => [
+        'setExecutable' => [
             'yii',
         ],
+        'setCookieValidationKey' => [
+            'backend/config/main-local.php',
+            'frontend/config/main-local.php',
+        ],
     ],
 ];

apps/advanced/environments/prod/backend/config/main-local.php

 <?php
 return [
+    'components' => [
+        'request' => [
+            // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
+            'cookieValidationKey' => '',
+        ],
+    ],
 ];

apps/advanced/environments/prod/common/config/main-local.php

@@ -8,7 +8,7 @@ return [
             'password' => '',
             'charset' => 'utf8',
         ],
-        'mail' => [
+        'mailer' => [
             'class' => 'yii\swiftmailer\Mailer',
             'viewPath' => '@common/mail',
         ],

apps/advanced/environments/prod/frontend/config/main-local.php

 <?php
 return [
+    'components' => [
+        'request' => [
+            // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
+            'cookieValidationKey' => '',
+        ],
+    ],
 ];

apps/advanced/frontend/codeception.yml

+namespace: frontend
+actor: Tester
 paths:
     tests: tests
     log: tests/_log
@@ -16,3 +18,7 @@ modules:
             user: ''
             password: ''
             dump: tests/_data/dump.sql
+config:
+    # the entry script URL (without host info) for functional and acceptance tests
+    # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
+    test_entry_url: /advanced/frontend/web/index-test.php

apps/advanced/frontend/models/ContactForm.php

@@ -49,7 +49,7 @@ class ContactForm extends Model
      */
     public function sendEmail($email)
     {
-        return Yii::$app->mail->compose()
+        return Yii::$app->mailer->compose()
             ->setTo($email)
             ->setFrom([$this->email => $this->name])
             ->setSubject($this->subject)

apps/advanced/frontend/models/PasswordResetRequestForm.php

@@ -35,7 +35,7 @@ class PasswordResetRequestForm extends Model
      */
     public function sendEmail()
     {
-        /** @var User $user */
+        /* @var $user User */
         $user = User::findOne([
             'status' => User::STATUS_ACTIVE,
             'email' => $this->email,
@@ -44,7 +44,7 @@ class PasswordResetRequestForm extends Model
         if ($user) {
             $user->generatePasswordResetToken();
             if ($user->save()) {
-                return \Yii::$app->mail->compose('passwordResetToken', ['user' => $user])
+                return \Yii::$app->mailer->compose('passwordResetToken', ['user' => $user])
                     ->setFrom([\Yii::$app->params['supportEmail'] => \Yii::$app->name . ' robot'])
                     ->setTo($this->email)
                     ->setSubject('Password reset for ' . \Yii::$app->name)

apps/advanced/frontend/tests/_bootstrap.php

 <?php
 
-// the entry script URL (without host info) for functional and acceptance tests
-// PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/advanced/frontend/web/index-test.php');
-
-// the entry script file path for functional and acceptance tests
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
@@ -18,6 +11,8 @@ require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 require(__DIR__ . '/../../common/config/aliases.php');
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+
+// the entry script file path for functional and acceptance tests
+$_SERVER['SCRIPT_FILENAME'] = dirname(__DIR__) . '/web/index-test.php';
+$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];
 $_SERVER['SERVER_NAME'] = 'localhost';

apps/advanced/frontend/tests/_config.php

@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [

apps/advanced/frontend/tests/_helpers/CodeHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for CodeGuy
-
-class CodeHelper extends \Codeception\Module
-{
-}

apps/advanced/frontend/tests/_helpers/TestHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for TestGuy
-
-class TestHelper extends \Codeception\Module
-{
-}

apps/advanced/frontend/tests/_helpers/WebHelper.php

-<?php
-namespace Codeception\Module;
-
-// here you can define custom functions for WebGuy
-
-class WebHelper extends \Codeception\Module
-{
-}

apps/advanced/frontend/tests/acceptance.suite.yml

@@ -11,7 +11,6 @@
 class_name: WebGuy
 modules:
     enabled:
-        - WebHelper
         - PhpBrowser
         - common\tests\_helpers\FixtureHelper
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.

apps/advanced/frontend/tests/acceptance/AboutCept.php

 <?php
 
 use frontend\tests\_pages\AboutPage;
+use frontend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that about works');

apps/advanced/frontend/tests/acceptance/ContactCept.php

 <?php
 
 use frontend\tests\_pages\ContactPage;
+use frontend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that contact works');

apps/advanced/frontend/tests/acceptance/HomeCept.php

 <?php
 
+use frontend\WebGuy;
+
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);

apps/advanced/frontend/tests/acceptance/LoginCept.php

 <?php
 
 use common\tests\_pages\LoginPage;
+use frontend\WebGuy;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/frontend/tests/functional.suite.yml

@@ -10,7 +10,6 @@ class_name: TestGuy
 modules:
     enabled:
       - Filesystem
-      - TestHelper
       - Yii2
       - common\tests\_helpers\FixtureHelper
     config:

apps/advanced/frontend/tests/functional/AboutCept.php

 <?php
 
 use frontend\tests\_pages\AboutPage;
+use frontend\TestGuy;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that about works');

apps/advanced/frontend/tests/functional/ContactCept.php

 <?php
 
 use frontend\tests\_pages\ContactPage;
+use frontend\TestGuy;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that contact works');

apps/advanced/frontend/tests/functional/HomeCept.php

 <?php
 
+use frontend\TestGuy;
+
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);

apps/advanced/frontend/tests/functional/LoginCept.php

 <?php
 
 use common\tests\_pages\LoginPage;
+use frontend\TestGuy;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure login page works');

apps/advanced/frontend/tests/functional/_config.php

 <?php
 
 // set correct script paths
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SCRIPT_FILENAME'] = dirname(dirname(__DIR__)) . '/web/index-test.php';
+$_SERVER['SCRIPT_NAME'] = \Codeception\Configuration::config()['config']['test_entry_url'];;
 
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../config/main.php'),

apps/advanced/frontend/tests/unit.suite.yml

@@ -4,5 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled: [CodeHelper]

apps/advanced/frontend/tests/unit/_console.php

@@ -11,5 +11,12 @@ return yii\helpers\ArrayHelper::merge(
                 'dsn' => 'mysql:host=localhost;dbname=yii2_advanced_unit',
             ],
         ],
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => '@frontend/tests/unit/fixtures/data',
+                'templatePath' => '@common/tests/templates/fixtures'
+            ],
+        ],
     ]
 );

apps/advanced/frontend/tests/unit/fixtures/data/user.php → apps/advanced/frontend/tests/unit/fixtures/data/models/user.php

@@ -5,7 +5,7 @@ return [
         'username' => 'okirlin',
         'auth_key' => 'iwTNae9t34OmnK6l4vT4IeaTk-YWI2Rv',
         'password_hash' => '$2y$13$CXT0Rkle1EMJ/c1l5bylL.EylfmQ39O5JlHJVFpNn618OUS1HwaIi',
-        'password_reset_token' => 't5GU9NwpuGYSfb7FEZMAxqtuz2PkEvv_1391885313',
+        'password_reset_token' => 't5GU9NwpuGYSfb7FEZMAxqtuz2PkEvv_' . time(),
         'created_at' => '1391885313',
         'updated_at' => '1391885313',
         'email' => 'brady.renner@rutherford.com',
@@ -14,7 +14,7 @@ return [
         'username' => 'troy.becker',
         'auth_key' => 'EdKfXrx88weFMV0vIxuTMWKgfK2tS3Lp',
         'password_hash' => '$2y$13$g5nv41Px7VBqhS3hVsVN2.MKfgT3jFdkXEsMC4rQJLfaMa7VaJqL2',
-        'password_reset_token' => '4BSNyiZNAuxjs5Mty990c47sVrgllIi_1391885313',
+        'password_reset_token' => '4BSNyiZNAuxjs5Mty990c47sVrgllIi_' . time(),
         'created_at' => '1391885313',
         'updated_at' => '1391885313',
         'email' => 'nicolas.dianna@hotmail.com',

apps/advanced/frontend/tests/unit/models/ContactFormTest.php

@@ -14,7 +14,7 @@ class ContactFormTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        Yii::$app->mail->fileTransportCallback = function ($mailer, $message) {
+        Yii::$app->mailer->fileTransportCallback = function ($mailer, $message) {
             return 'testing_message.eml';
         };
     }
@@ -54,6 +54,6 @@ class ContactFormTest extends TestCase
 
     private function getMessageFile()
     {
-        return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml';
+        return Yii::getAlias(Yii::$app->mailer->fileTransportPath) . '/testing_message.eml';
     }
 }

apps/advanced/frontend/tests/unit/models/PasswordResetRequestFormTest.php

@@ -7,15 +7,17 @@ use frontend\tests\unit\DbTestCase;
 use frontend\models\PasswordResetRequestForm;
 use common\tests\fixtures\UserFixture;
 use common\models\User;
+use Codeception\Specify;
 
 class PasswordResetRequestFormTest extends DbTestCase
 {
-    use \Codeception\Specify;
+    use Specify;
 
     protected function setUp()
     {
         parent::setUp();
-        Yii::$app->mail->fileTransportCallback = function ($mailer, $message) {
+
+        Yii::$app->mailer->fileTransportCallback = function ($mailer, $message) {
             return 'testing_message.eml';
         };
     }
@@ -23,23 +25,28 @@ class PasswordResetRequestFormTest extends DbTestCase
     protected function tearDown()
     {
         @unlink($this->getMessageFile());
+
         parent::tearDown();
     }
 
     public function testSendEmailWrongUser()
     {
         $this->specify('no user with such email, message should not be send', function () {
+
             $model = new PasswordResetRequestForm();
             $model->email = 'not-existing-email@example.com';
 
             expect('email not send', $model->sendEmail())->false();
+
         });
 
         $this->specify('user is not active, message should not be send', function () {
+
             $model = new PasswordResetRequestForm();
             $model->email = $this->user[1]['email'];
 
             expect('email not send', $model->sendEmail())->false();
+
         });
     }
 
@@ -53,11 +60,13 @@ class PasswordResetRequestFormTest extends DbTestCase
         expect('user has valid token', $user->password_reset_token)->notNull();
 
         $this->specify('message has correct format', function () use ($model) {
+
             expect('message file exists', file_exists($this->getMessageFile()))->true();
 
             $message = file_get_contents($this->getMessageFile());
             expect('message "from" is correct', $message)->contains(Yii::$app->params['supportEmail']);
             expect('message "to" is correct', $message)->contains($model->email);
+
         });
     }
 
@@ -66,13 +75,14 @@ class PasswordResetRequestFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@frontend/tests/unit/fixtures/data/user.php'
+                'dataFile' => '@frontend/tests/unit/fixtures/data/models/user.php'
             ],
         ];
     }
 
     private function getMessageFile()
     {
-        return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml';
+        return Yii::getAlias(Yii::$app->mailer->fileTransportPath) . '/testing_message.eml';
     }
+
 }

apps/advanced/frontend/tests/unit/models/ResetPasswordFormTest.php

@@ -9,19 +9,26 @@ use frontend\models\ResetPasswordForm;
 class ResetPasswordFormTest extends DbTestCase
 {
 
-    use \Codeception\Specify;
+    /**
+     * @expectedException yii\base\InvalidParamException
+     */
+    public function testResetWrongToken()
+    {
+        new ResetPasswordForm('notexistingtoken_1391882543');
+    }
+
+    /**
+     * @expectedException yii\base\InvalidParamException
+     */
+    public function testResetEmptyToken()
+    {
+        new ResetPasswordForm('');
+    }
 
-    public function testResetPassword()
+    public function testResetCorrectToken()
     {
-        $this->specify('wrong reset token', function () {
-            $this->setExpectedException('\Exception', 'Wrong password reset token.');
-            new ResetPasswordForm('notexistingtoken_1391882543');
-        });
-
-        $this->specify('not correct token', function () {
-            $this->setExpectedException('yii\base\InvalidParamException', 'Password reset token cannot be blank.');
-            new ResetPasswordForm('');
-        });
+        $form = new ResetPasswordForm($this->user[0]['password_reset_token']);
+        expect('password should be resetted', $form->resetPassword())->true();
     }
 
     public function fixtures()
@@ -29,8 +36,9 @@ class ResetPasswordFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => '@frontend/tests/unit/fixtures/data/user.php'
+                'dataFile' => '@frontend/tests/unit/fixtures/data/models/user.php'
             ],
         ];
     }
+
 }

apps/advanced/frontend/tests/unit/models/SignupFormTest.php

@@ -4,23 +4,26 @@ namespace frontend\tests\unit\models;
 
 use frontend\tests\unit\DbTestCase;
 use common\tests\fixtures\UserFixture;
+use Codeception\Specify;
+use frontend\models\SignupForm;
 
 class SignupFormTest extends DbTestCase
 {
 
-    use \Codeception\Specify;
+    use Specify;
 
     public function testCorrectSignup()
     {
-        $model = $this->getMock('frontend\models\SignupForm', ['validate']);
-        $model->expects($this->once())->method('validate')->will($this->returnValue(true));
-
-        $model->username = 'some_username';
-        $model->email = 'some_email@example.com';
-        $model->password = 'some_password';
+        $model = new SignupForm([
+            'username' => 'some_username',
+            'email' => 'some_email@example.com',
+            'password' => 'some_password',
+        ]);
 
         $user = $model->signup();
-        $this->assertInstanceOf('common\models\User', $user);
+
+        $this->assertInstanceOf('common\models\User', $user, 'user should be valid');
+
         expect('username should be correct', $user->username)->equals('some_username');
         expect('email should be correct', $user->email)->equals('some_email@example.com');
         expect('password should be correct', $user->validatePassword('some_password'))->true();
@@ -28,10 +31,13 @@ class SignupFormTest extends DbTestCase
 
     public function testNotCorrectSignup()
     {
-        $model = $this->getMock('frontend\models\SignupForm', ['validate']);
-        $model->expects($this->once())->method('validate')->will($this->returnValue(false));
+        $model = new SignupForm([
+            'username' => 'troy.becker',
+            'email' => 'nicolas.dianna@hotmail.com',
+            'password' => 'some_password',
+        ]);
 
-        expect('user should not be created', $model->signup())->null();
+        expect('username and email are in use, user should not be created', $model->signup())->null();
     }
 
     public function fixtures()
@@ -39,8 +45,9 @@ class SignupFormTest extends DbTestCase
         return [
             'user' => [
                 'class' => UserFixture::className(),
-                'dataFile' => false, //do not load test data, only table cleanup
+                'dataFile' => '@frontend/tests/unit/fixtures/data/models/user.php',
             ],
         ];
     }
+
 }

apps/advanced/frontend/views/layouts/main.php

@@ -6,10 +6,9 @@ use yii\widgets\Breadcrumbs;
 use frontend\assets\AppAsset;
 use frontend\widgets\Alert;
 
-/**
- * @var \yii\web\View $this
- * @var string $content
- */
+/* @var $this \yii\web\View */
+/* @var $content string */
+
 AppAsset::register($this);
 ?>
 <?php $this->beginPage() ?>
@@ -18,6 +17,7 @@ AppAsset::register($this);
 <head>
     <meta charset="<?= Yii::$app->charset ?>"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <?= Html::csrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
 </head>

apps/advanced/frontend/views/site/about.php

 <?php
 use yii\helpers\Html;
 
-/**
- * @var yii\web\View $this
- */
+/* @var $this yii\web\View */
 $this->title = 'About';
 $this->params['breadcrumbs'][] = $this->title;
 ?>

apps/advanced/frontend/views/site/contact.php

@@ -3,11 +3,10 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use yii\captcha\Captcha;
 
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var \frontend\models\ContactForm $model
- */
+/* @var $this yii\web\View */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $model \frontend\models\ContactForm */
+
 $this->title = 'Contact';
 $this->params['breadcrumbs'][] = $this->title;
 ?>

apps/advanced/frontend/views/site/error.php

@@ -2,12 +2,10 @@
 
 use yii\helpers\Html;
 
-/**
- * @var yii\web\View $this
- * @var string $name
- * @var string $message
- * @var Exception $exception
- */
+/* @var $this yii\web\View */
+/* @var $name string */
+/* @var $message string */
+/* @var $exception Exception */
 
 $this->title = $name;
 ?>

apps/advanced/frontend/views/site/index.php

 <?php
-/**
- * @var yii\web\View $this
- */
+/* @var $this yii\web\View */
 $this->title = 'My Yii Application';
 ?>
 <div class="site-index">

apps/advanced/frontend/views/site/login.php

@@ -2,11 +2,10 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var \common\models\LoginForm $model
- */
+/* @var $this yii\web\View */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $model \common\models\LoginForm */
+
 $this->title = 'Login';
 $this->params['breadcrumbs'][] = $this->title;
 ?>

apps/advanced/frontend/views/site/requestPasswordResetToken.php

@@ -2,11 +2,10 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var \frontend\models\PasswordResetRequestForm $model
- */
+/* @var $this yii\web\View */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $model \frontend\models\PasswordResetRequestForm */
+
 $this->title = 'Request password reset';
 $this->params['breadcrumbs'][] = $this->title;
 ?>

apps/advanced/frontend/views/site/resetPassword.php

@@ -2,11 +2,10 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var \frontend\models\ResetPasswordForm $model
- */
+/* @var $this yii\web\View */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $model \frontend\models\ResetPasswordForm */
+
 $this->title = 'Reset password';
 $this->params['breadcrumbs'][] = $this->title;
 ?>

apps/advanced/frontend/views/site/signup.php

@@ -2,11 +2,10 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var \frontend\models\SignupForm $model
- */
+/* @var $this yii\web\View */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $model \frontend\models\SignupForm */
+
 $this->title = 'Signup';
 $this->params['breadcrumbs'][] = $this->title;
 ?>

apps/advanced/frontend/web/css/site.css

 html,
 body {
-	height: 100%;
+    height: 100%;
 }
 
 .wrap {
-	min-height: 100%;
-	height: auto;
-	margin: 0 auto -60px;
-	padding: 0 0 60px;
+    min-height: 100%;
+    height: auto;
+    margin: 0 auto -60px;
+    padding: 0 0 60px;
 }
 
 .wrap > .container {
@@ -15,61 +15,61 @@ body {
 }
 
 .footer {
-	height: 60px;
-	background-color: #f5f5f5;
-	border-top: 1px solid #ddd;
-	padding-top: 20px;
+    height: 60px;
+    background-color: #f5f5f5;
+    border-top: 1px solid #ddd;
+    padding-top: 20px;
 }
 
 .jumbotron {
-	text-align: center;
-	background-color: transparent;
+    text-align: center;
+    background-color: transparent;
 }
 
 .jumbotron .btn {
-	font-size: 21px;
-	padding: 14px 24px;
+    font-size: 21px;
+    padding: 14px 24px;
 }
 
 .not-set {
-	color: #c55;
-	font-style: italic;
+    color: #c55;
+    font-style: italic;
 }
 
 /* add sorting icons to gridview sort links */
 a.asc:after, a.desc:after {
-	position: relative;
-	top: 1px;
-	display: inline-block;
-	font-family: 'Glyphicons Halflings';
-	font-style: normal;
-	font-weight: normal;
-	line-height: 1;
-	padding-left: 5px;
+    position: relative;
+    top: 1px;
+    display: inline-block;
+    font-family: 'Glyphicons Halflings';
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1;
+    padding-left: 5px;
 }
 
 a.asc:after {
-	content: /*"\e113"*/ "\e151";
+    content: /*"\e113"*/ "\e151";
 }
 
 a.desc:after {
-	content: /*"\e114"*/ "\e152";
+    content: /*"\e114"*/ "\e152";
 }
 
 .sort-numerical a.asc:after {
-	content: "\e153";
+    content: "\e153";
 }
 
 .sort-numerical a.desc:after {
-	content: "\e154";
+    content: "\e154";
 }
 
 .sort-ordinal a.asc:after {
-	content: "\e155";
+    content: "\e155";
 }
 
 .sort-ordinal a.desc:after {
-	content: "\e156";
+    content: "\e156";
 }
 
 .grid-view th {
@@ -77,15 +77,15 @@ a.desc:after {
 }
 
 .hint-block {
-	display: block;
-	margin-top: 5px;
-	color: #999;
+    display: block;
+    margin-top: 5px;
+    color: #999;
 }
 
 .error-summary {
-	color: #a94442;
-	background: #fdf7f7;
-	border-left: 3px solid #eed3d7;
-	padding: 10px 20px;
-	margin: 0 0 15px 0;
+    color: #a94442;
+    background: #fdf7f7;
+    border-left: 3px solid #eed3d7;
+    padding: 10px 20px;
+    margin: 0 0 15px 0;
 }

apps/advanced/frontend/widgets/Alert.php

@@ -11,9 +11,17 @@ namespace frontend\widgets;
  * Alert widget renders a message from session flash. All flash messages are displayed
  * in the sequence they were assigned using setFlash. You can set message as following:
  *
- * - \Yii::$app->getSession()->setFlash('error', 'This is the message');
- * - \Yii::$app->getSession()->setFlash('success', 'This is the message');
- * - \Yii::$app->getSession()->setFlash('info', 'This is the message');
+ * ```php
+ * \Yii::$app->getSession()->setFlash('error', 'This is the message');
+ * \Yii::$app->getSession()->setFlash('success', 'This is the message');
+ * \Yii::$app->getSession()->setFlash('info', 'This is the message');
+ * ```
+ *
+ * Multiple messages could be set as follows:
+ *
+ * ```php
+ * \Yii::$app->getSession()->setFlash('error', ['Error 1', 'Error 2']);
+ * ```
  *
  * @author Kartik Visweswaran <kartikv2@gmail.com>
  * @author Alexander Makarov <sam@rmcreative.ru>
@@ -47,19 +55,22 @@ class Alert extends \yii\bootstrap\Widget
         $flashes = $session->getAllFlashes();
         $appendCss = isset($this->options['class']) ? ' ' . $this->options['class'] : '';
 
-        foreach ($flashes as $type => $message) {
+        foreach ($flashes as $type => $data) {
             if (isset($this->alertTypes[$type])) {
-                /* initialize css class for each alert box */
-                $this->options['class'] = $this->alertTypes[$type] . $appendCss;
+                $data = (array) $data;
+                foreach ($data as $message) {
+                    /* initialize css class for each alert box */
+                    $this->options['class'] = $this->alertTypes[$type] . $appendCss;
 
-                /* assign unique id to each alert box */
-                $this->options['id'] = $this->getId() . '-' . $type;
+                    /* assign unique id to each alert box */
+                    $this->options['id'] = $this->getId() . '-' . $type;
 
-                echo \yii\bootstrap\Alert::widget([
-                    'body' => $message,
-                    'closeButton' => $this->closeButton,
-                    'options' => $this->options,
-                ]);
+                    echo \yii\bootstrap\Alert::widget([
+                        'body' => $message,
+                        'closeButton' => $this->closeButton,
+                        'options' => $this->options,
+                    ]);
+                }
 
                 $session->removeFlash($type);
             }

apps/advanced/init

@@ -14,6 +14,10 @@
  * @license http://www.yiiframework.com/license/
  */
 
+if (!extension_loaded('mcrypt')) {
+    die('The mcrypt PHP extension is required by Yii2.');
+}
+
 $params = getParams();
 $root = str_replace('\\', '/', __DIR__);
 $envs = require("$root/environments/index.php");
@@ -23,147 +27,169 @@ echo "Yii Application Initialization Tool v1.0\n\n";
 
 $envName = null;
 if (empty($params['env']) || $params['env'] === '1') {
-	echo "Which environment do you want the application to be initialized in?\n\n";
-	foreach ($envNames as $i => $name) {
-		echo "  [$i] $name\n";
-	}
-	echo "\n  Your choice [0-" . (count($envs) - 1) . ', or "q" to quit] ';
-	$answer = trim(fgets(STDIN));
-
-	if (!ctype_digit($answer) || !in_array($answer, range(0, count($envs) - 1))) {
-		echo "\n  Quit initialization.\n";
-		exit(0);
-	}
-
-	if (isset($envNames[$answer])) {
-		$envName = $envNames[$answer];
-	}
+    echo "Which environment do you want the application to be initialized in?\n\n";
+    foreach ($envNames as $i => $name) {
+        echo "  [$i] $name\n";
+    }
+    echo "\n  Your choice [0-" . (count($envs) - 1) . ', or "q" to quit] ';
+    $answer = trim(fgets(STDIN));
+
+    if (!ctype_digit($answer) || !in_array($answer, range(0, count($envs) - 1))) {
+        echo "\n  Quit initialization.\n";
+        exit(0);
+    }
+
+    if (isset($envNames[$answer])) {
+        $envName = $envNames[$answer];
+    }
 } else {
-	$envName = $params['env'];
+    $envName = $params['env'];
 }
 
 if (!in_array($envName, $envNames)) {
-	$envsList = implode(', ', $envNames);
-	echo "\n  $envName is not a valid environment. Try one of the following: $envsList. \n";
-	exit(2);
+    $envsList = implode(', ', $envNames);
+    echo "\n  $envName is not a valid environment. Try one of the following: $envsList. \n";
+    exit(2);
 }
 
 $env = $envs[$envName];
 
 if (empty($params['env'])) {
-	echo "\n  Initialize the application under '{$envNames[$answer]}' environment? [yes|no] ";
-	$answer = trim(fgets(STDIN));
-	if (strncasecmp($answer, 'y', 1)) {
-		echo "\n  Quit initialization.\n";
-		exit(0);
-	}
+    echo "\n  Initialize the application under '{$envNames[$answer]}' environment? [yes|no] ";
+    $answer = trim(fgets(STDIN));
+    if (strncasecmp($answer, 'y', 1)) {
+        echo "\n  Quit initialization.\n";
+        exit(0);
+    }
 }
 
 echo "\n  Start initialization ...\n\n";
 $files = getFileList("$root/environments/{$env['path']}");
 $all = false;
 foreach ($files as $file) {
-	if (!copyFile($root, "environments/{$env['path']}/$file", $file, $all, $params)) {
-		break;
-	}
-}
-
-if (isset($env['writable'])) {
-	foreach ($env['writable'] as $writable) {
-		echo "      chmod 0777 $writable\n";
-		@chmod("$root/$writable", 0777);
-	}
+    if (!copyFile($root, "environments/{$env['path']}/$file", $file, $all, $params)) {
+        break;
+    }
 }
 
-if (isset($env['executable'])) {
-	foreach ($env['executable'] as $executable) {
-		echo "      chmod 0755 $executable\n";
-		@chmod("$root/$executable", 0755);
-	}
+$callbacks = ['setCookieValidationKey', 'setWritable', 'setExecutable'];
+foreach ($callbacks as $callback) {
+    if (!empty($env[$callback])) {
+        $callback($root, $env[$callback]);
+    }
 }
 
 echo "\n  ... initialization completed.\n\n";
 
 function getFileList($root, $basePath = '')
 {
-	$files = [];
-	$handle = opendir($root);
-	while (($path = readdir($handle)) !== false) {
-		if ($path === '.svn' || $path === '.' || $path === '..') {
-			continue;
-		}
-		$fullPath = "$root/$path";
-		$relativePath = $basePath === '' ? $path : "$basePath/$path";
-		if (is_dir($fullPath)) {
-			$files = array_merge($files, getFileList($fullPath, $relativePath));
-		} else {
-			$files[] = $relativePath;
-		}
-	}
-	closedir($handle);
-	return $files;
+    $files = [];
+    $handle = opendir($root);
+    while (($path = readdir($handle)) !== false) {
+        if ($path === '.svn' || $path === '.' || $path === '..') {
+            continue;
+        }
+        $fullPath = "$root/$path";
+        $relativePath = $basePath === '' ? $path : "$basePath/$path";
+        if (is_dir($fullPath)) {
+            $files = array_merge($files, getFileList($fullPath, $relativePath));
+        } else {
+            $files[] = $relativePath;
+        }
+    }
+    closedir($handle);
+    return $files;
 }
 
 function copyFile($root, $source, $target, &$all, $params)
 {
-	if (!is_file($root . '/' . $source)) {
-		echo "       skip $target ($source not exist)\n";
-		return true;
-	}
-	if (is_file($root . '/' . $target)) {
-		if (file_get_contents($root . '/' . $source) === file_get_contents($root . '/' . $target)) {
-			echo "  unchanged $target\n";
-			return true;
-		}
-		if ($all) {
-			echo "  overwrite $target\n";
-		} else {
-			echo "      exist $target\n";
-			echo "            ...overwrite? [Yes|No|All|Quit] ";
-
-
-			$answer = !empty($params['overwrite']) ? $params['overwrite'] : trim(fgets(STDIN));
-			if (!strncasecmp($answer, 'q', 1)) {
-				return false;
-			} else {
-				if (!strncasecmp($answer, 'y', 1)) {
-					echo "  overwrite $target\n";
-				} else {
-					if (!strncasecmp($answer, 'a', 1)) {
-						echo "  overwrite $target\n";
-						$all = true;
-					} else {
-						echo "       skip $target\n";
-						return true;
-					}
-				}
-			}
-		}
-		file_put_contents($root . '/' . $target, file_get_contents($root . '/' . $source));
-		return true;
-	}
-	echo "   generate $target\n";
-	@mkdir(dirname($root . '/' . $target), 0777, true);
-	file_put_contents($root . '/' . $target, file_get_contents($root . '/' . $source));
-	return true;
+    if (!is_file($root . '/' . $source)) {
+        echo "       skip $target ($source not exist)\n";
+        return true;
+    }
+    if (is_file($root . '/' . $target)) {
+        if (file_get_contents($root . '/' . $source) === file_get_contents($root . '/' . $target)) {
+            echo "  unchanged $target\n";
+            return true;
+        }
+        if ($all) {
+            echo "  overwrite $target\n";
+        } else {
+            echo "      exist $target\n";
+            echo "            ...overwrite? [Yes|No|All|Quit] ";
+
+
+            $answer = !empty($params['overwrite']) ? $params['overwrite'] : trim(fgets(STDIN));
+            if (!strncasecmp($answer, 'q', 1)) {
+                return false;
+            } else {
+                if (!strncasecmp($answer, 'y', 1)) {
+                    echo "  overwrite $target\n";
+                } else {
+                    if (!strncasecmp($answer, 'a', 1)) {
+                        echo "  overwrite $target\n";
+                        $all = true;
+                    } else {
+                        echo "       skip $target\n";
+                        return true;
+                    }
+                }
+            }
+        }
+        file_put_contents($root . '/' . $target, file_get_contents($root . '/' . $source));
+        return true;
+    }
+    echo "   generate $target\n";
+    @mkdir(dirname($root . '/' . $target), 0777, true);
+    file_put_contents($root . '/' . $target, file_get_contents($root . '/' . $source));
+    return true;
 }
 
 function getParams()
 {
-	$rawParams = [];
-	if (isset($_SERVER['argv'])) {
-		$rawParams = $_SERVER['argv'];
-		array_shift($rawParams);
-	}
-
-	$params = [];
-	foreach ($rawParams as $param) {
-		if (preg_match('/^--(\w+)(=(.*))?$/', $param, $matches)) {
-			$name = $matches[1];
-			$params[$name] = isset($matches[3]) ? $matches[3] : true;
-		} else {
-			$params[] = $param;
-		}
-	}
-	return $params;
+    $rawParams = [];
+    if (isset($_SERVER['argv'])) {
+        $rawParams = $_SERVER['argv'];
+        array_shift($rawParams);
+    }
+
+    $params = [];
+    foreach ($rawParams as $param) {
+        if (preg_match('/^--(\w+)(=(.*))?$/', $param, $matches)) {
+            $name = $matches[1];
+            $params[$name] = isset($matches[3]) ? $matches[3] : true;
+        } else {
+            $params[] = $param;
+        }
+    }
+    return $params;
+}
+
+function setWritable($root, $paths)
+{
+    foreach ($paths as $writable) {
+        echo "      chmod 0777 $writable\n";
+        @chmod("$root/$writable", 0777);
+    }
+}
+
+function setExecutable($root, $paths)
+{
+    foreach ($paths as $executable) {
+        echo "      chmod 0755 $executable\n";
+        @chmod("$root/$executable", 0755);
+    }
+}
+
+function setCookieValidationKey($root, $paths)
+{
+    foreach ($paths as $file) {
+        echo "   generate cookie validation key in $file\n";
+        $file = $root . '/' . $file;
+        $length = 32;
+        $bytes = mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
+        $key = strtr(substr(base64_encode($bytes), 0, $length), '+/=', '_-.');
+        $content = preg_replace('/(("|\')cookieValidationKey("|\')\s*=>\s*)(""|\'\')/', "\\1'$key'", file_get_contents($file));
+        file_put_contents($file, $content);
+    }
 }