Browse Source

Merge pull request #122 from mynameiszanders/master

Added Newlines
tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
9880d1fa51
  1. 2
      app/protected/config/assets.php
  2. 2
      app/protected/config/main.php
  3. 2
      app/protected/controllers/SiteController.php
  4. 2
      app/protected/models/ContactForm.php
  5. 2
      app/protected/models/LoginForm.php
  6. 2
      app/protected/models/User.php
  7. 2
      app/protected/views/layouts/main.php
  8. 2
      app/protected/views/site/contact.php
  9. 2
      app/protected/views/site/login.php
  10. 2
      framework/assets.php
  11. 2
      framework/base/ActionFilter.php
  12. 2
      framework/base/Exception.php
  13. 2
      framework/base/View.php
  14. 2
      framework/base/ViewEvent.php
  15. 2
      framework/base/Widget.php
  16. 2
      framework/caching/Cache.php
  17. 2
      framework/caching/Dependency.php
  18. 2
      framework/caching/MemCacheServer.php
  19. 2
      framework/caching/WinCache.php
  20. 2
      framework/console/Controller.php
  21. 2
      framework/console/controllers/AppController.php
  22. 2
      framework/console/controllers/AssetController.php
  23. 2
      framework/console/controllers/HelpController.php
  24. 2
      framework/console/webapp/config.php
  25. 2
      framework/console/webapp/default/index.php
  26. 2
      framework/console/webapp/default/protected/config/main.php
  27. 2
      framework/console/webapp/default/protected/controllers/SiteController.php
  28. 2
      framework/console/webapp/default/protected/views/layouts/main.php
  29. 2
      framework/console/webapp/default/protected/views/site/index.php
  30. 2
      framework/db/Exception.php
  31. 2
      framework/db/Expression.php
  32. 2
      framework/db/Migration.php
  33. 2
      framework/db/StaleObjectException.php
  34. 2
      framework/helpers/ArrayHelper.php
  35. 2
      framework/helpers/FileHelper.php
  36. 2
      framework/helpers/JsExpression.php
  37. 2
      framework/helpers/Json.php
  38. 2
      framework/helpers/SecurityHelper.php
  39. 2
      framework/helpers/VarDumper.php
  40. 2
      framework/helpers/base/ArrayHelper.php
  41. 2
      framework/helpers/base/FileHelper.php
  42. 2
      framework/helpers/base/Json.php
  43. 2
      framework/helpers/base/VarDumper.php
  44. 2
      framework/i18n/PhpMessageSource.php
  45. 2
      framework/i18n/data/plurals.php
  46. 2
      framework/logging/EmailTarget.php
  47. 2
      framework/logging/ProfileTarget.php
  48. 2
      framework/logging/WebTarget.php
  49. 2
      framework/renderers/SmartyViewRenderer.php
  50. 2
      framework/validators/InlineValidator.php
  51. 2
      framework/validators/NumberValidator.php
  52. 2
      framework/validators/UniqueValidator.php
  53. 2
      framework/views/error.php
  54. 2
      framework/web/AccessControl.php
  55. 2
      framework/web/AccessRule.php
  56. 2
      framework/web/AssetBundle.php
  57. 2
      framework/web/AssetConverter.php
  58. 2
      framework/web/Controller.php
  59. 2
      framework/web/HttpCache.php
  60. 2
      framework/web/IAssetConverter.php
  61. 2
      framework/web/Identity.php
  62. 2
      framework/web/PageCache.php
  63. 2
      framework/web/Pagination.php
  64. 2
      framework/web/Sort.php
  65. 2
      framework/web/UserEvent.php
  66. 2
      framework/widgets/ActiveField.php
  67. 2
      framework/widgets/Block.php
  68. 2
      framework/widgets/FragmentCache.php
  69. 2
      tests/unit/MysqlTestCase.php
  70. 2
      tests/unit/TestCase.php
  71. 2
      tests/unit/data/ar/ActiveRecord.php
  72. 2
      tests/unit/data/ar/Customer.php
  73. 2
      tests/unit/data/ar/Item.php
  74. 2
      tests/unit/data/ar/Order.php
  75. 2
      tests/unit/data/ar/OrderItem.php
  76. 2
      tests/unit/data/base/Singer.php
  77. 2
      tests/unit/framework/base/ComponentTest.php
  78. 2
      tests/unit/framework/base/ObjectTest.php
  79. 2
      tests/unit/framework/caching/ApcCacheTest.php
  80. 2
      tests/unit/framework/caching/DbCacheTest.php
  81. 2
      tests/unit/framework/caching/FileCacheTest.php
  82. 2
      tests/unit/framework/caching/MemCacheTest.php
  83. 2
      tests/unit/framework/caching/MemCachedTest.php
  84. 2
      tests/unit/framework/caching/WinCacheTest.php
  85. 2
      tests/unit/framework/caching/XCacheTest.php
  86. 2
      tests/unit/framework/caching/ZendDataCacheTest.php
  87. 2
      tests/unit/framework/db/ActiveRecordTest.php
  88. 2
      tests/unit/framework/db/CommandTest.php
  89. 2
      tests/unit/framework/db/QueryTest.php
  90. 2
      tests/unit/framework/helpers/JsonTest.php
  91. 2
      tests/unit/framework/helpers/StringHelperTest.php
  92. 2
      tests/unit/framework/helpers/VarDumperTest.php
  93. 2
      tests/unit/framework/validators/EmailValidatorTest.php
  94. 2
      tests/web/app/protected/config/main.php
  95. 2
      tests/web/app/protected/controllers/SiteController.php
  96. 2
      tests/web/app/protected/views/site/index.php

2
app/protected/config/assets.php

@ -16,4 +16,4 @@ return array(
'yii',
),
),
);
);

2
app/protected/config/main.php

@ -18,4 +18,4 @@ return array(
'params' => array(
'adminEmail' => 'admin@example.com',
),
);
);

2
app/protected/controllers/SiteController.php

@ -46,4 +46,4 @@ class SiteController extends Controller
{
echo $this->render('about');
}
}
}

2
app/protected/models/ContactForm.php

@ -60,4 +60,4 @@ class ContactForm extends Model
return false;
}
}
}
}

2
app/protected/models/LoginForm.php

@ -55,4 +55,4 @@ class LoginForm extends Model
return false;
}
}
}
}

2
app/protected/models/User.php

@ -58,4 +58,4 @@ class User extends \yii\base\Object implements \yii\web\Identity
{
return $this->password === $password;
}
}
}

2
app/protected/views/layouts/main.php

@ -54,4 +54,4 @@ $this->registerAssetBundle('app');
</div>
</body>
</html>
<?php $this->endPage(); ?>
<?php $this->endPage(); ?>

2
app/protected/views/site/contact.php

@ -30,4 +30,4 @@ $this->title = 'Contact';
<div class="form-actions">
<?php echo Html::submitButton('Submit', null, null, array('class' => 'btn btn-primary')); ?>
</div>
<?php $this->endWidget(); ?>
<?php $this->endWidget(); ?>

2
app/protected/views/site/login.php

@ -18,4 +18,4 @@ $this->title = 'Login';
<div class="form-actions">
<?php echo Html::submitButton('Login', null, null, array('class' => 'btn btn-primary')); ?>
</div>
<?php $this->endWidget(); ?>
<?php $this->endWidget(); ?>

2
framework/assets.php

@ -28,4 +28,4 @@ return array(
),
'depends' => array('yii', 'yii/validation'),
),
);
);

2
framework/base/ActionFilter.php

@ -87,4 +87,4 @@ class ActionFilter extends Behavior
{
return !in_array($action->id, $this->except, true) && (empty($this->only) || in_array($action->id, $this->only, true));
}
}
}

2
framework/base/Exception.php

@ -22,4 +22,4 @@ class Exception extends \Exception
{
return \Yii::t('yii|Exception');
}
}
}

2
framework/base/View.php

@ -797,4 +797,4 @@ class View extends Component
}
return implode("\n", $lines);
}
}
}

2
framework/base/ViewEvent.php

@ -41,4 +41,4 @@ class ViewEvent extends Event
$this->viewFile = $viewFile;
parent::__construct($config);
}
}
}

2
framework/base/Widget.php

@ -134,4 +134,4 @@ class Widget extends Component
return pathinfo($file, PATHINFO_EXTENSION) === '' ? $file . '.php' : $file;
}
}
}

2
framework/caching/Cache.php

@ -349,4 +349,4 @@ abstract class Cache extends Component implements \ArrayAccess
{
$this->delete($key);
}
}
}

2
framework/caching/Dependency.php

@ -49,4 +49,4 @@ abstract class Dependency extends \yii\base\Object
* @return mixed the data needed to determine if dependency has been changed.
*/
abstract protected function generateDependencyData();
}
}

2
framework/caching/MemCacheServer.php

@ -46,4 +46,4 @@ class MemCacheServer extends \yii\base\Object
* @var boolean if the server should be flagged as online upon a failure. This is used by memcache only.
*/
public $status = true;
}
}

2
framework/caching/WinCache.php

@ -89,4 +89,4 @@ class WinCache extends Cache
{
return wincache_ucache_clear();
}
}
}

2
framework/console/Controller.php

@ -147,4 +147,4 @@ class Controller extends \yii\base\Controller
{
return array();
}
}
}

2
framework/console/controllers/AppController.php

@ -321,4 +321,4 @@ class AppController extends Controller
closedir($handle);
return $list;
}
}
}

2
framework/console/controllers/AssetController.php

@ -350,4 +350,4 @@ return array(
EOD;
file_put_contents($configFile, $template);
}
}
}

2
framework/console/controllers/HelpController.php

@ -418,4 +418,4 @@ class HelpController extends Controller
$name = $required ? "$name (required)" : $name;
return $doc === '' ? $name : "$name: $doc";
}
}
}

2
framework/console/webapp/config.php

@ -14,4 +14,4 @@ return array(
'permissions' => 0755,
),
),
);
);

2
framework/console/webapp/default/index.php

@ -7,4 +7,4 @@ $config = require dirname(__DIR__).'/protected/config/main.php';
$config['basePath'] = dirname(__DIR__).'/protected';
$app = new \yii\web\Application($config);
$app->run();
$app->run();

2
framework/console/webapp/default/protected/config/main.php

@ -17,4 +17,4 @@ return array(
'class' => 'yii\caching\DummyCache',
),
),
);
);

2
framework/console/webapp/default/protected/controllers/SiteController.php

@ -12,4 +12,4 @@ class SiteController extends Controller
'name' => 'Qiang',
));
}
}
}

2
framework/console/webapp/default/protected/views/layouts/main.php

@ -14,4 +14,4 @@
<?php echo \Yii::powered()?>
</div>
</body>
</html>
</html>

2
framework/console/webapp/default/protected/views/site/index.php

@ -1 +1 @@
Hello, <?php echo $name?>!
Hello, <?php echo $name?>!

2
framework/db/Exception.php

@ -41,4 +41,4 @@ class Exception extends \yii\base\Exception
{
return \Yii::t('yii|Database Exception');
}
}
}

2
framework/db/Expression.php

@ -57,4 +57,4 @@ class Expression extends \yii\base\Object
{
return $this->expression;
}
}
}

2
framework/db/Migration.php

@ -368,4 +368,4 @@ class Migration extends \yii\base\Component
$this->db->createCommand()->dropIndex($name, $table)->execute();
echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";
}
}
}

2
framework/db/StaleObjectException.php

@ -20,4 +20,4 @@ class StaleObjectException extends Exception
{
return \Yii::t('yii|Stale Object Exception');
}
}
}

2
framework/helpers/ArrayHelper.php

@ -16,4 +16,4 @@ namespace yii\helpers;
*/
class ArrayHelper extends base\ArrayHelper
{
}
}

2
framework/helpers/FileHelper.php

@ -18,4 +18,4 @@ namespace yii\helpers;
*/
class FileHelper extends base\FileHelper
{
}
}

2
framework/helpers/JsExpression.php

@ -42,4 +42,4 @@ class JsExpression extends Object
{
return $this->expression;
}
}
}

2
framework/helpers/Json.php

@ -15,4 +15,4 @@ namespace yii\helpers;
class Json extends base\Json
{
}
}

2
framework/helpers/SecurityHelper.php

@ -26,4 +26,4 @@ namespace yii\helpers;
*/
class SecurityHelper extends base\SecurityHelper
{
}
}

2
framework/helpers/VarDumper.php

@ -25,4 +25,4 @@ namespace yii\helpers;
*/
class VarDumper extends base\VarDumper
{
}
}

2
framework/helpers/base/ArrayHelper.php

@ -349,4 +349,4 @@ class ArrayHelper
}
return $d;
}
}
}

2
framework/helpers/base/FileHelper.php

@ -169,4 +169,4 @@ class FileHelper
}
closedir($handle);
}
}
}

2
framework/helpers/base/Json.php

@ -104,4 +104,4 @@ class Json
return $data;
}
}
}
}

2
framework/helpers/base/VarDumper.php

@ -131,4 +131,4 @@ class VarDumper
break;
}
}
}
}

2
framework/i18n/PhpMessageSource.php

@ -76,4 +76,4 @@ class PhpMessageSource extends MessageSource
return array();
}
}
}
}

2
framework/i18n/data/plurals.php

@ -624,4 +624,4 @@ return array (
array (
0 => 'in_array(fmod($n,10),array(1,2))||fmod($n,20)==0',
),
);
);

2
framework/logging/EmailTarget.php

@ -69,4 +69,4 @@ class EmailTarget extends Target
}
mail($sentTo, $subject, $body, implode("\r\n", $headers));
}
}
}

2
framework/logging/ProfileTarget.php

@ -189,4 +189,4 @@ class CProfileLogRoute extends CWebLogRoute
$total += $delta;
return array($token, $calls, $min, $max, $total);
}
}
}

2
framework/logging/WebTarget.php

@ -58,4 +58,4 @@ class CWebLogRoute extends CLogRoute
$viewFile = YII_PATH . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . $view . '.php';
include($app->findLocalizedFile($viewFile, 'en'));
}
}
}

2
framework/renderers/SmartyViewRenderer.php

@ -102,4 +102,4 @@ class SmartyViewRenderer extends ViewRenderer
return $template->fetch();
}
}
}

2
framework/validators/InlineValidator.php

@ -96,4 +96,4 @@ class InlineValidator extends Validator
return null;
}
}
}
}

2
framework/validators/NumberValidator.php

@ -151,4 +151,4 @@ class NumberValidator extends Validator
return 'yii.validation.number(value, messages, ' . Json::encode($options) . ');';
}
}
}

2
framework/validators/UniqueValidator.php

@ -97,4 +97,4 @@ class UniqueValidator extends Validator
$this->addError($object, $attribute, $this->message);
}
}
}
}

2
framework/views/error.php

@ -64,4 +64,4 @@ $title = $context->htmlEncode($exception instanceof \yii\base\Exception ? $excep
<?php echo YII_DEBUG ? $context->versionInfo : ''?>
</div>
</body>
</html>
</html>

2
framework/web/AccessControl.php

@ -103,4 +103,4 @@ class AccessControl extends ActionFilter
throw new HttpException(403, Yii::t('yii|You are not allowed to perform this action.'));
}
}
}
}

2
framework/web/AccessRule.php

@ -185,4 +185,4 @@ class AccessRule extends Component
{
return empty($this->matchCallback) || call_user_func($this->matchCallback, $this, $action);
}
}
}

2
framework/web/AssetBundle.php

@ -173,4 +173,4 @@ class AssetBundle extends Object
}
}
}
}
}

2
framework/web/AssetConverter.php

@ -59,4 +59,4 @@ class AssetConverter extends Component implements IAssetConverter
}
return "$baseUrl/$asset";
}
}
}

2
framework/web/Controller.php

@ -40,4 +40,4 @@ class Controller extends \yii\base\Controller
}
return Yii::$app->getUrlManager()->createUrl($route, $params);
}
}
}

2
framework/web/HttpCache.php

@ -128,4 +128,4 @@ class HttpCache extends ActionFilter
{
return '"' . base64_encode(sha1($seed, true)) . '"';
}
}
}

2
framework/web/IAssetConverter.php

@ -24,4 +24,4 @@ interface IAssetConverter
* need conversion, "$baseUrl/$asset" should be returned.
*/
public function convert($asset, $basePath, $baseUrl);
}
}

2
framework/web/Identity.php

@ -78,4 +78,4 @@ interface Identity
* @see getAuthKey()
*/
public function validateAuthKey($authKey);
}
}

2
framework/web/PageCache.php

@ -101,4 +101,4 @@ class PageCache extends ActionFilter
{
$this->view->endCache();
}
}
}

2
framework/web/Pagination.php

@ -205,4 +205,4 @@ class Pagination extends \yii\base\Object
{
return $this->pageSize < 1 ? -1 : $this->pageSize;
}
}
}

2
framework/web/Sort.php

@ -333,4 +333,4 @@ class Sort extends \yii\base\Object
return false;
}
}
}
}

2
framework/web/UserEvent.php

@ -31,4 +31,4 @@ class UserEvent extends Event
* This property is only meaningful for [[User::EVENT_BEFORE_LOGIN]] and [[User::EVENT_BEFORE_LOGOUT]] events.
*/
public $isValid = true;
}
}

2
framework/widgets/ActiveField.php

@ -541,4 +541,4 @@ class ActiveField extends Component
. '</div>'
);
}
}
}

2
framework/widgets/Block.php

@ -46,4 +46,4 @@ class Block extends Widget
}
$this->view->blocks[$this->id] = $block;
}
}
}

2
framework/widgets/FragmentCache.php

@ -171,4 +171,4 @@ class FragmentCache extends Widget
}
return $this->cache->buildKey($factors);
}
}
}

2
tests/unit/MysqlTestCase.php

@ -33,4 +33,4 @@ class MysqlTestCase extends TestCase
}
return $db;
}
}
}

2
tests/unit/TestCase.php

@ -13,4 +13,4 @@ class TestCase extends \yii\test\TestCase
}
return isset(self::$params[$name]) ? self::$params[$name] : null;
}
}
}

2
tests/unit/data/ar/ActiveRecord.php

@ -23,4 +23,4 @@ class ActiveRecord extends \yii\db\ActiveRecord
{
return self::$db;
}
}
}

2
tests/unit/data/ar/Customer.php

@ -24,4 +24,4 @@ class Customer extends ActiveRecord
{
return $query->andWhere('status=1');
}
}
}

2
tests/unit/data/ar/Item.php

@ -8,4 +8,4 @@ class Item extends ActiveRecord
{
return 'tbl_item';
}
}
}

2
tests/unit/data/ar/Order.php

@ -43,4 +43,4 @@ class Order extends ActiveRecord
return false;
}
}
}
}

2
tests/unit/data/ar/OrderItem.php

@ -18,4 +18,4 @@ class OrderItem extends ActiveRecord
{
return $this->hasOne('Item', array('id' => 'item_id'));
}
}
}

2
tests/unit/data/base/Singer.php

@ -18,4 +18,4 @@ class Singer extends Model
array('underscore_style', 'yii\validators\CaptchaValidator'),
);
}
}
}

2
tests/unit/framework/base/ComponentTest.php

@ -387,4 +387,4 @@ class NewComponent2 extends Component
$this->b = $b;
$this->c = $c;
}
}
}

2
tests/unit/framework/base/ObjectTest.php

@ -181,4 +181,4 @@ class NewObject extends Object
{
return $this->_items;
}
}
}

2
tests/unit/framework/caching/ApcCacheTest.php

@ -26,4 +26,4 @@ class ApcCacheTest extends CacheTest
}
return $this->_cacheInstance;
}
}
}

2
tests/unit/framework/caching/DbCacheTest.php

@ -67,4 +67,4 @@ class DbCacheTest extends CacheTest
}
return $this->_cacheInstance;
}
}
}

2
tests/unit/framework/caching/FileCacheTest.php

@ -22,4 +22,4 @@ class FileCacheTest extends CacheTest
}
return $this->_cacheInstance;
}
}
}

2
tests/unit/framework/caching/MemCacheTest.php

@ -24,4 +24,4 @@ class MemCacheTest extends CacheTest
}
return $this->_cacheInstance;
}
}
}

2
tests/unit/framework/caching/MemCachedTest.php

@ -26,4 +26,4 @@ class MemCachedTest extends CacheTest
}
return $this->_cacheInstance;
}
}
}

2
tests/unit/framework/caching/WinCacheTest.php

@ -28,4 +28,4 @@ class WinCacheTest extends CacheTest
}
return $this->_cacheInstance;
}
}
}

2
tests/unit/framework/caching/XCacheTest.php

@ -24,4 +24,4 @@ class XCacheTest extends CacheTest
}
return $this->_cacheInstance;
}
}
}

2
tests/unit/framework/caching/ZendDataCacheTest.php

@ -24,4 +24,4 @@ class ZendDataCacheTest extends CacheTest
}
return $this->_cacheInstance;
}
}
}

2
tests/unit/framework/db/ActiveRecordTest.php

@ -356,4 +356,4 @@ class ActiveRecordTest extends \yiiunit\MysqlTestCase
$customers = Customer::find()->all();
$this->assertEquals(0, count($customers));
}
}
}

2
tests/unit/framework/db/CommandTest.php

@ -289,4 +289,4 @@ class CommandTest extends \yiiunit\MysqlTestCase
{
}
}
}

2
tests/unit/framework/db/QueryTest.php

@ -113,4 +113,4 @@ class QueryTest extends \yiiunit\MysqlTestCase
{
}
}
}

2
tests/unit/framework/helpers/JsonTest.php

@ -57,4 +57,4 @@ class JsonTest extends \yii\test\TestCase
$this->setExpectedException('yii\base\InvalidParamException');
Json::decode($json);
}
}
}

2
tests/unit/framework/helpers/StringHelperTest.php

@ -70,4 +70,4 @@ class StringHelperTest extends \yii\test\TestCase
$this->assertEquals('PostTag', StringHelper::id2camel('post-tag'));
$this->assertEquals('PostTag', StringHelper::id2camel('post_tag', '_'));
}
}
}

2
tests/unit/framework/helpers/VarDumperTest.php

@ -9,4 +9,4 @@ class VarDumperTest extends \yii\test\TestCase
$obj = new \StdClass();
VarDumper::dump($obj);
}
}
}

2
tests/unit/framework/validators/EmailValidatorTest.php

@ -25,4 +25,4 @@ class EmailValidatorTest extends TestCase
$this->assertTrue($validator->validateValue('sam@rmcreative.ru'));
$this->assertFalse($validator->validateValue('test@example.com'));
}
}
}

2
tests/web/app/protected/config/main.php

@ -1,3 +1,3 @@
<?php
return array();
return array();

2
tests/web/app/protected/controllers/SiteController.php

@ -27,4 +27,4 @@ class DefaultController extends \yii\web\Controller
echo Html::endForm();
print_r($_POST);
}
}
}

2
tests/web/app/protected/views/site/index.php

@ -5,4 +5,4 @@
* Date: 3/16/13
* Time: 10:41 AM
* To change this template use File | Settings | File Templates.
*/
*/

Loading…
Cancel
Save