wangjun083
diff --git a/‎.gitignore
Lines changed: 3 additions & 0 deletions b/‎.gitignore
Lines changed: 3 additions & 0 deletions
diff --git a/‎.travis.yml
Lines changed: 69 additions & 0 deletions b/‎.travis.yml
Lines changed: 69 additions & 0 deletions
diff --git a/‎README.md
Lines changed: 16 additions & 0 deletions b/‎README.md
Lines changed: 16 additions & 0 deletions
diff --git a/‎build/build
Lines changed: 7 additions & 0 deletions b/‎build/build
Lines changed: 7 additions & 0 deletions
diff --git a/‎build/controllers/DevController.php
Lines changed: 34 additions & 0 deletions b/‎build/controllers/DevController.php
Lines changed: 34 additions & 0 deletions
@@ -30,7 +30,10 @@ composer.phar
 phpunit.phar
 # local phpunit config
 /phpunit.xml
+<<<<<<< HEAD
 
 # ignore sub directory for dev installed apps and extensions
 /apps
 /extensions
+=======
+>>>>>>> official/master
@@ -4,7 +4,10 @@ php:
   - 5.4
   - 5.5
   - 5.6
+<<<<<<< HEAD
   - 7.0
+=======
+>>>>>>> official/master
   - hhvm
   - hhvm-nightly
 
@@ -17,18 +20,31 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm-nightly
+<<<<<<< HEAD
     - php: 7.0
 
 services:
   - memcached
+=======
+
+services:
+  - redis-server
+  - memcached
+  - elasticsearch
+  - mongodb
+>>>>>>> official/master
 
 # faster builds on new travis setup not using sudo
 sudo: false
 
 # cache vendor dirs
 cache:
   directories:
+<<<<<<< HEAD
 #    - cubrid/9.3.0
+=======
+#    - cubrid # caching cubrid breaks the build on a regular basis and has nearly no speedup
+>>>>>>> official/master
     - vendor
     - $HOME/.composer/cache
 
@@ -38,6 +54,7 @@ addons:
 
 install:
   - travis_retry composer self-update && composer --version
+<<<<<<< HEAD
   - travis_retry composer global require "fxp/composer-asset-plugin:~1.0.0"
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
 # core framework:
@@ -71,3 +88,55 @@ after_script:
       travis_retry wget https://scrutinizer-ci.com/ocular.phar
       php ocular.phar code-coverage:upload --format=php-clover coverage.clover
     fi
+=======
+  - travis_retry composer global require "fxp/composer-asset-plugin:1.0.0-beta4"
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
+# core framework:
+  - travis_retry composer install --prefer-dist --no-interaction
+  - tests/unit/data/travis/mongodb-setup.sh
+# TODO: APC currently fails composer. https://github.com/composer/composer/issues/3405
+#  - tests/unit/data/travis/apc-setup.sh
+  - tests/unit/data/travis/memcache-setup.sh
+  - tests/unit/data/travis/cubrid-setup.sh
+# print elasticsearch version
+  - curl http://localhost:9200
+# codeception
+  - travis_retry composer global require "codeception/codeception=2.0.*" "codeception/specify=*" "codeception/verify=*"
+# basic and advanced application:
+  - tests/unit/data/travis/setup-apps.sh
+
+before_script:
+  - echo 'elasticsearch version ' && curl http://localhost:9200/
+  - mysql -e 'CREATE DATABASE yiitest;';
+  - psql -U postgres -c 'CREATE DATABASE yiitest;';
+  - tests/unit/data/travis/sphinx-setup.sh
+  - mongo yii2test --eval 'db.addUser("travis", "test");'
+# 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
+  - |
+    if (php --version | grep -i HipHop > /dev/null); then
+      echo "Skipping basic application tests on HHVM"
+    else
+      cd apps/basic/web
+      php -S localhost:8080 > /dev/null 2>&1 &
+      cd ../tests
+      codecept run
+    fi
+  - |
+    if (php --version | grep -i HipHop > /dev/null); then
+      echo "Skipping advanced application tests on HHVM"
+    else
+      cd apps/advanced
+      php -S localhost:8080 > /dev/null 2>&1 &
+      cd tests
+      codecept run
+    fi
+
+after_script:
+  - cd ../../..
+  - travis_retry wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+>>>>>>> official/master
@@ -11,12 +11,21 @@ Yii 2 requires PHP 5.4 and embraces the best practices and protocols found in mo
 [![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)
 [![Reference Status](https://www.versioneye.com/php/yiisoft:yii2/reference_badge.svg)](https://www.versioneye.com/php/yiisoft:yii2/references)
+<<<<<<< HEAD
 [![Build Status](https://img.shields.io/travis/yiisoft/yii2.svg)](http://travis-ci.org/yiisoft/yii2)
 [![Dependency Status](https://www.versioneye.com/php/yiisoft:yii2/dev-master/badge.png)](https://www.versioneye.com/php/yiisoft:yii2/dev-master)
 [![HHVM Status](https://img.shields.io/hhvm/yiisoft/yii2-dev.svg)](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/)
 [![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://img.shields.io/codeclimate/github/yiisoft/yii2.svg)](https://codeclimate.com/github/yiisoft/yii2)
+=======
+[![Build Status](https://secure.travis-ci.org/yiisoft/yii2.png)](http://travis-ci.org/yiisoft/yii2)
+[![Dependency Status](https://www.versioneye.com/php/yiisoft:yii2/dev-master/badge.png)](https://www.versioneye.com/php/yiisoft:yii2/dev-master)
+[![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/)
+[![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)
+>>>>>>> official/master
 
 DIRECTORY STRUCTURE
 -------------------
@@ -51,7 +60,11 @@ to have a general idea of what has changed in 2.0.
 HOW TO PARTICIPATE
 ------------------
 
+<<<<<<< HEAD
 ### Your participation to Yii 2 development is very welcome!
+=======
+**Your participation to Yii 2 development is very welcome!**
+>>>>>>> official/master
 
 You may participate in the following ways:
 
@@ -60,6 +73,7 @@ You may participate in the following ways:
 - [Give us feedback or start a design discussion](http://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/)
 - [Contribute to the core code or fix bugs](docs/internals/git-workflow.md)
 
+<<<<<<< HEAD
 ### Acknowledging or citing Yii 2
 
 **In presentations**
@@ -79,3 +93,5 @@ If your code is hosted at GitHub, you can place the following in your README.md
 ```
 [![Yii2](https://img.shields.io/badge/Powered_by-Yii_Framework-green.svg?style=flat)](http://www.yiiframework.com/)
 ```
+=======
+>>>>>>> official/master
@@ -8,6 +8,13 @@
  * @license http://www.yiiframework.com/license/
  */
 
+<<<<<<< HEAD
+=======
+// fcgi doesn't have STDIN and STDOUT defined by default
+defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
+defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
+
+>>>>>>> official/master
 define('YII_DEBUG', true);
 
 $composerAutoload = [
 
@@ -26,11 +26,14 @@ class DevController extends Controller
 {
     public $defaultAction = 'all';
 
+<<<<<<< HEAD
     /**
      * @var bool whether to use HTTP when cloning github repositories
      */
     public $useHttp = false;
 
+=======
+>>>>>>> official/master
     public $apps = [
         'basic' => '[email protected]:yiisoft/yii2-app-basic.git',
         'advanced' => '[email protected]:yiisoft/yii2-app-advanced.git',
@@ -68,14 +71,22 @@ public function actionAll()
         }
 
         foreach($this->extensions as $ext => $repo) {
+<<<<<<< HEAD
             $ret = $this->actionExt($ext);
+=======
+            $ret = $this->actionExt($ext, $repo);
+>>>>>>> official/master
             if ($ret !== 0) {
                 return $ret;
             }
         }
 
         foreach($this->apps as $app => $repo) {
+<<<<<<< HEAD
             $ret = $this->actionApp($app);
+=======
+            $ret = $this->actionApp($app, $repo);
+>>>>>>> official/master
             if ($ret !== 0) {
                 return $ret;
             }
@@ -141,9 +152,12 @@ public function actionApp($app, $repo = null)
             if (empty($repo)) {
                 if (isset($this->apps[$app])) {
                     $repo = $this->apps[$app];
+<<<<<<< HEAD
                     if ($this->useHttp) {
                         $repo = str_replace('[email protected]:', 'https://github.com/', $repo);
                     }
+=======
+>>>>>>> official/master
                 } else {
                     $this->stderr("Repo argument is required for app '$app'.\n", Console::FG_RED);
                     return 1;
@@ -179,8 +193,11 @@ public function actionApp($app, $repo = null)
      *
      * @param string $extension the application name e.g. `basic` or `advanced`.
      * @param string $repo url of the git repo to clone if it does not already exist.
+<<<<<<< HEAD
      *
      * @return int
+=======
+>>>>>>> official/master
      */
     public function actionExt($extension, $repo = null)
     {
@@ -192,9 +209,12 @@ public function actionExt($extension, $repo = null)
             if (empty($repo)) {
                 if (isset($this->extensions[$extension])) {
                     $repo = $this->extensions[$extension];
+<<<<<<< HEAD
                     if ($this->useHttp) {
                         $repo = str_replace('[email protected]:', 'https://github.com/', $repo);
                     }
+=======
+>>>>>>> official/master
                 } else {
                     $this->stderr("Repo argument is required for extension '$extension'.\n", Console::FG_RED);
                     return 1;
@@ -225,6 +245,7 @@ public function actionExt($extension, $repo = null)
         return 0;
     }
 
+<<<<<<< HEAD
     /**
      * @inheritdoc
      */
@@ -242,6 +263,9 @@ public function options($actionID)
      * Remove all symlinks in the vendor subdirectory of the directory specified
      * @param string $dir base directory
      */
+=======
+
+>>>>>>> official/master
     protected function cleanupVendorDir($dir)
     {
         if (is_link($link = "$dir/vendor/yiisoft/yii2")) {
@@ -257,13 +281,16 @@ protected function cleanupVendorDir($dir)
         }
     }
 
+<<<<<<< HEAD
     /**
      * Creates symlinks to freamework and extension sources for the application
      * @param string $dir application directory
      * @param string $base Yii sources base directory
      *
      * @return int
      */
+=======
+>>>>>>> official/master
     protected function linkFrameworkAndExtensions($dir, $base)
     {
         if (is_dir($link = "$dir/vendor/yiisoft/yii2")) {
@@ -303,12 +330,15 @@ protected function unlink($file)
         }
     }
 
+<<<<<<< HEAD
     /**
      * Get a list of subdirectories for directory specified
      * @param string $dir directory to read
      *
      * @return array list of subdirectories
      */
+=======
+>>>>>>> official/master
     protected function listSubDirs($dir)
     {
         $list = [];
@@ -357,7 +387,11 @@ protected function findDirs($dir)
         closedir($handle);
 
         foreach($list as $i => $e) {
+<<<<<<< HEAD
             if ($e === 'composer') { // skip composer to not break composer update
+=======
+            if ($e == 'composer') { // skip composer to not break composer update
+>>>>>>> official/master
                 unset($list[$i]);
             }
         }