chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1012 from KingYes/master

Browse Source 
Convert to short syntax [2].
This commit is contained in:
Alexander Makarov 2013-10-18 02:08:15 -07:00
commit 65c64d4c70
10 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/console.php
View File

@ -3,7 +3,7 @@ $params = require(__DIR__ . '/params.php');
return [ return [
'id' => 'bootstrap-console', 'id' => 'bootstrap-console',
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
'preload' => array('log'), 'preload' => ['log'],
'controllerPath' => dirname(__DIR__) . '/commands', 'controllerPath' => dirname(__DIR__) . '/commands',
'controllerNamespace' => 'app\commands', 'controllerNamespace' => 'app\commands',
'modules' => [ 'modules' => [

44
requirements.php
View File

@ -26,78 +26,78 @@ $requirementsChecker = new YiiRequirementChecker();
/** /**
* Adjust requirements according to your application specifics. * Adjust requirements according to your application specifics.
*/ */
$requirements = array( $requirements = [
// Database : // Database :
array( [
'name' => 'PDO extension', 'name' => 'PDO extension',
'mandatory' => true, 'mandatory' => true,
'condition' => extension_loaded('pdo'), 'condition' => extension_loaded('pdo'),
'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>', 'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
), ],
array( [
'name' => 'PDO SQLite extension', 'name' => 'PDO SQLite extension',
'mandatory' => false, 'mandatory' => false,
'condition' => extension_loaded('pdo_sqlite'), 'condition' => extension_loaded('pdo_sqlite'),
'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>', 'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
'memo' => 'Required for SQLite database.', 'memo' => 'Required for SQLite database.',
), ],
array( [
'name' => 'PDO MySQL extension', 'name' => 'PDO MySQL extension',
'mandatory' => false, 'mandatory' => false,
'condition' => extension_loaded('pdo_mysql'), 'condition' => extension_loaded('pdo_mysql'),
'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>', 'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
'memo' => 'Required for MySQL database.', 'memo' => 'Required for MySQL database.',
), ],
// Cache : // Cache :
array( [
'name' => 'Memcache extension', 'name' => 'Memcache extension',
'mandatory' => false, 'mandatory' => false,
'condition' => extension_loaded('memcache') || extension_loaded('memcached'), 'condition' => extension_loaded('memcache') || extension_loaded('memcached'),
'by' => '<a href="http://www.yiiframework.com/doc/api/CMemCache">CMemCache</a>', 'by' => '<a href="http://www.yiiframework.com/doc/api/CMemCache">CMemCache</a>',
'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc/api/CMemCache#useMemcached-detail">CMemCache::useMemcached</a> to <code>true</code>.' : '' 'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc/api/CMemCache#useMemcached-detail">CMemCache::useMemcached</a> to <code>true</code>.' : ''
), ],
array( [
'name' => 'APC extension', 'name' => 'APC extension',
'mandatory' => false, 'mandatory' => false,
'condition' => extension_loaded('apc') || extension_loaded('apc'), 'condition' => extension_loaded('apc') || extension_loaded('apc'),
'by' => '<a href="http://www.yiiframework.com/doc/api/CApcCache">CApcCache</a>', 'by' => '<a href="http://www.yiiframework.com/doc/api/CApcCache">CApcCache</a>',
), ],
// Additional PHP extensions : // Additional PHP extensions :
array( [
'name' => 'Mcrypt extension', 'name' => 'Mcrypt extension',
'mandatory' => false, 'mandatory' => false,
'condition' => extension_loaded('mcrypt'), 'condition' => extension_loaded('mcrypt'),
'by' => '<a href="http://www.yiiframework.com/doc/api/CSecurityManager">CSecurityManager</a>', 'by' => '<a href="http://www.yiiframework.com/doc/api/CSecurityManager">CSecurityManager</a>',
'memo' => 'Required by encrypt and decrypt methods.' 'memo' => 'Required by encrypt and decrypt methods.'
), ],
// PHP ini : // PHP ini :
'phpSafeMode' => array( 'phpSafeMode' => [
'name' => 'PHP safe mode', 'name' => 'PHP safe mode',
'mandatory' => false, 'mandatory' => false,
'condition' => $requirementsChecker->checkPhpIniOff("safe_mode"), 'condition' => $requirementsChecker->checkPhpIniOff("safe_mode"),
'by' => 'File uploading and console command execution', 'by' => 'File uploading and console command execution',
'memo' => '"safe_mode" should be disabled at php.ini', 'memo' => '"safe_mode" should be disabled at php.ini',
), ],
'phpExposePhp' => array( 'phpExposePhp' => [
'name' => 'Expose PHP', 'name' => 'Expose PHP',
'mandatory' => false, 'mandatory' => false,
'condition' => $requirementsChecker->checkPhpIniOff("expose_php"), 'condition' => $requirementsChecker->checkPhpIniOff("expose_php"),
'by' => 'Security reasons', 'by' => 'Security reasons',
'memo' => '"expose_php" should be disabled at php.ini', 'memo' => '"expose_php" should be disabled at php.ini',
), ],
'phpAllowUrlInclude' => array( 'phpAllowUrlInclude' => [
'name' => 'PHP allow url include', 'name' => 'PHP allow url include',
'mandatory' => false, 'mandatory' => false,
'condition' => $requirementsChecker->checkPhpIniOff("allow_url_include"), 'condition' => $requirementsChecker->checkPhpIniOff("allow_url_include"),
'by' => 'Security reasons', 'by' => 'Security reasons',
'memo' => '"allow_url_include" should be disabled at php.ini', 'memo' => '"allow_url_include" should be disabled at php.ini',
), ],
'phpSmtp' => array( 'phpSmtp' => [
'name' => 'PHP mail SMTP', 'name' => 'PHP mail SMTP',
'mandatory' => false, 'mandatory' => false,
'condition' => strlen(ini_get('SMTP'))>0, 'condition' => strlen(ini_get('SMTP'))>0,
'by' => 'Email sending', 'by' => 'Email sending',
'memo' => 'PHP mail SMTP server required', 'memo' => 'PHP mail SMTP server required',
), ],
); ];
$requirementsChecker->checkYii()->check($requirements)->render(); $requirementsChecker->checkYii()->check($requirements)->render();

10
tests/acceptance/ContactCept.php
View File

@ -4,7 +4,7 @@ $I->wantTo('ensure that contact works');
$I->amOnPage('?r=site/contact'); $I->amOnPage('?r=site/contact');
$I->see('Contact', 'h1'); $I->see('Contact', 'h1');
$I->submitForm('#contact-form', array()); $I->submitForm('#contact-form', []);
$I->see('Contact', 'h1'); $I->see('Contact', 'h1');
$I->see('Name cannot be blank'); $I->see('Name cannot be blank');
$I->see('Email cannot be blank'); $I->see('Email cannot be blank');
@ -12,25 +12,25 @@ $I->see('Subject cannot be blank');
$I->see('Body cannot be blank'); $I->see('Body cannot be blank');
$I->see('The verification code is incorrect'); $I->see('The verification code is incorrect');
$I->submitForm('#contact-form', array( $I->submitForm('#contact-form', [
'ContactForm[name]' => 'tester', 'ContactForm[name]' => 'tester',
'ContactForm[email]' => 'tester.email', 'ContactForm[email]' => 'tester.email',
'ContactForm[subject]' => 'test subject', 'ContactForm[subject]' => 'test subject',
'ContactForm[body]' => 'test content', 'ContactForm[body]' => 'test content',
'ContactForm[verifyCode]' => 'testme', 'ContactForm[verifyCode]' => 'testme',
)); ]);
$I->dontSee('Name cannot be blank', '.help-inline'); $I->dontSee('Name cannot be blank', '.help-inline');
$I->see('Email is not a valid email address.'); $I->see('Email is not a valid email address.');
$I->dontSee('Subject cannot be blank', '.help-inline'); $I->dontSee('Subject cannot be blank', '.help-inline');
$I->dontSee('Body cannot be blank', '.help-inline'); $I->dontSee('Body cannot be blank', '.help-inline');
$I->dontSee('The verification code is incorrect', '.help-inline'); $I->dontSee('The verification code is incorrect', '.help-inline');
$I->submitForm('#contact-form', array( $I->submitForm('#contact-form', [
'ContactForm[name]' => 'tester', 'ContactForm[name]' => 'tester',
'ContactForm[email]' => 'tester@example.com', 'ContactForm[email]' => 'tester@example.com',
'ContactForm[subject]' => 'test subject', 'ContactForm[subject]' => 'test subject',
'ContactForm[body]' => 'test content', 'ContactForm[body]' => 'test content',
'ContactForm[verifyCode]' => 'testme', 'ContactForm[verifyCode]' => 'testme',
)); ]);
$I->dontSeeElement('#contact-form'); $I->dontSeeElement('#contact-form');
$I->see('Thank you for contacting us. We will respond to you as soon as possible.'); $I->see('Thank you for contacting us. We will respond to you as soon as possible.');

10
tests/acceptance/LoginCept.php
View File

@ -4,20 +4,20 @@ $I->wantTo('ensure that login works');
$I->amOnPage('?r=site/login'); $I->amOnPage('?r=site/login');
$I->see('Login', 'h1'); $I->see('Login', 'h1');
$I->submitForm('#login-form', array()); $I->submitForm('#login-form', []);
$I->dontSee('Logout (admin)'); $I->dontSee('Logout (admin)');
$I->see('Username cannot be blank'); $I->see('Username cannot be blank');
$I->see('Password cannot be blank'); $I->see('Password cannot be blank');
$I->submitForm('#login-form', array( $I->submitForm('#login-form', [
'LoginForm[username]' => 'admin', 'LoginForm[username]' => 'admin',
'LoginForm[password]' => 'wrong', 'LoginForm[password]' => 'wrong',
)); ]);
$I->dontSee('Logout (admin)'); $I->dontSee('Logout (admin)');
$I->see('Incorrect username or password'); $I->see('Incorrect username or password');
$I->submitForm('#login-form', array( $I->submitForm('#login-form', [
'LoginForm[username]' => 'admin', 'LoginForm[username]' => 'admin',
'LoginForm[password]' => 'admin', 'LoginForm[password]' => 'admin',
)); ]);
$I->see('Logout (admin)'); $I->see('Logout (admin)');

10
tests/functional/ContactCept.php
View File

@ -4,7 +4,7 @@ $I->wantTo('ensure that contact works');
$I->amOnPage('?r=site/contact'); $I->amOnPage('?r=site/contact');
$I->see('Contact', 'h1'); $I->see('Contact', 'h1');
$I->submitForm('#contact-form', array()); $I->submitForm('#contact-form', []);
$I->see('Contact', 'h1'); $I->see('Contact', 'h1');
$I->see('Name cannot be blank'); $I->see('Name cannot be blank');
$I->see('Email cannot be blank'); $I->see('Email cannot be blank');
@ -12,25 +12,25 @@ $I->see('Subject cannot be blank');
$I->see('Body cannot be blank'); $I->see('Body cannot be blank');
$I->see('The verification code is incorrect'); $I->see('The verification code is incorrect');
$I->submitForm('#contact-form', array( $I->submitForm('#contact-form', [
'ContactForm[name]' => 'tester', 'ContactForm[name]' => 'tester',
'ContactForm[email]' => 'tester.email', 'ContactForm[email]' => 'tester.email',
'ContactForm[subject]' => 'test subject', 'ContactForm[subject]' => 'test subject',
'ContactForm[body]' => 'test content', 'ContactForm[body]' => 'test content',
'ContactForm[verifyCode]' => 'testme', 'ContactForm[verifyCode]' => 'testme',
)); ]);
$I->dontSee('Name cannot be blank', '.help-inline'); $I->dontSee('Name cannot be blank', '.help-inline');
$I->see('Email is not a valid email address.'); $I->see('Email is not a valid email address.');
$I->dontSee('Subject cannot be blank', '.help-inline'); $I->dontSee('Subject cannot be blank', '.help-inline');
$I->dontSee('Body cannot be blank', '.help-inline'); $I->dontSee('Body cannot be blank', '.help-inline');
$I->dontSee('The verification code is incorrect', '.help-inline'); $I->dontSee('The verification code is incorrect', '.help-inline');
$I->submitForm('#contact-form', array( $I->submitForm('#contact-form', [
'ContactForm[name]' => 'tester', 'ContactForm[name]' => 'tester',
'ContactForm[email]' => 'tester@example.com', 'ContactForm[email]' => 'tester@example.com',
'ContactForm[subject]' => 'test subject', 'ContactForm[subject]' => 'test subject',
'ContactForm[body]' => 'test content', 'ContactForm[body]' => 'test content',
'ContactForm[verifyCode]' => 'testme', 'ContactForm[verifyCode]' => 'testme',
)); ]);
$I->dontSeeElement('#contact-form'); $I->dontSeeElement('#contact-form');
$I->see('Thank you for contacting us. We will respond to you as soon as possible.'); $I->see('Thank you for contacting us. We will respond to you as soon as possible.');

10
tests/functional/LoginCept.php
View File

@ -4,20 +4,20 @@ $I->wantTo('ensure that login works');
$I->amOnPage('?r=site/login'); $I->amOnPage('?r=site/login');
$I->see('Login', 'h1'); $I->see('Login', 'h1');
$I->submitForm('#login-form', array()); $I->submitForm('#login-form', []);
$I->dontSee('Logout (admin)'); $I->dontSee('Logout (admin)');
$I->see('Username cannot be blank'); $I->see('Username cannot be blank');
$I->see('Password cannot be blank'); $I->see('Password cannot be blank');
$I->submitForm('#login-form', array( $I->submitForm('#login-form', [
'LoginForm[username]' => 'admin', 'LoginForm[username]' => 'admin',
'LoginForm[password]' => 'wrong', 'LoginForm[password]' => 'wrong',
)); ]);
$I->dontSee('Logout (admin)'); $I->dontSee('Logout (admin)');
$I->see('Incorrect username or password'); $I->see('Incorrect username or password');
$I->submitForm('#login-form', array( $I->submitForm('#login-form', [
'LoginForm[username]' => 'admin', 'LoginForm[username]' => 'admin',
'LoginForm[password]' => 'admin', 'LoginForm[password]' => 'admin',
)); ]);
$I->see('Logout (admin)'); $I->see('Logout (admin)');

38
views/layouts/main.php
View File

@ -21,33 +21,33 @@ app\config\AppAsset::register($this);
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody(); ?>
<?php <?php
NavBar::begin(array( NavBar::begin([
'brandLabel' => 'My Company', 'brandLabel' => 'My Company',
'brandUrl' => Yii::$app->homeUrl, 'brandUrl' => Yii::$app->homeUrl,
'options' => array( 'options' => [
'class' => 'navbar-inverse navbar-fixed-top', 'class' => 'navbar-inverse navbar-fixed-top',
), ],
)); ]);
echo Nav::widget(array( echo Nav::widget([
'options' => array('class' => 'navbar-nav pull-right'), 'options' => ['class' => 'navbar-nav pull-right'],
'items' => array( 'items' => [
array('label' => 'Home', 'url' => array('/site/index')), ['label' => 'Home', 'url' => ['/site/index']],
array('label' => 'About', 'url' => array('/site/about')), ['label' => 'About', 'url' => ['/site/about']],
array('label' => 'Contact', 'url' => array('/site/contact')), ['label' => 'Contact', 'url' => ['/site/contact']],
Yii::$app->user->isGuest ? Yii::$app->user->isGuest ?
array('label' => 'Login', 'url' => array('/site/login')) : ['label' => 'Login', 'url' => ['/site/login']] :
array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , ['label' => 'Logout (' . Yii::$app->user->identity->username .')' ,
'url' => array('/site/logout'), 'url' => ['/site/logout'],
'linkOptions' => array('data-method' => 'post')), 'linkOptions' => ['data-method' => 'post']],
), ],
)); ]);
NavBar::end(); NavBar::end();
?> ?>
<div class="container"> <div class="container">
<?php echo Breadcrumbs::widget(array( <?php echo Breadcrumbs::widget([
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(), 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
)); ?> ]); ?>
<?php echo $content; ?> <?php echo $content; ?>
</div> </div>

12
views/site/contact.php
View File

@ -28,17 +28,17 @@ $this->params['breadcrumbs'][] = $this->title;
<div class="row"> <div class="row">
<div class="col-lg-5"> <div class="col-lg-5">
<?php $form = ActiveForm::begin(array('id' => 'contact-form')); ?> <?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
<?php echo $form->field($model, 'name'); ?> <?php echo $form->field($model, 'name'); ?>
<?php echo $form->field($model, 'email'); ?> <?php echo $form->field($model, 'email'); ?>
<?php echo $form->field($model, 'subject'); ?> <?php echo $form->field($model, 'subject'); ?>
<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?> <?php echo $form->field($model, 'body')->textArea(['rows' => 6]); ?>
<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array( <?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), [
'options' => array('class' => 'form-control'), 'options' => ['class' => 'form-control'],
'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>', 'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
)); ?> ]); ?>
<div class="form-group"> <div class="form-group">
<?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?> <?php echo Html::submitButton('Submit', ['class' => 'btn btn-primary']); ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div> </div>

18
views/site/login.php
View File

@ -15,26 +15,26 @@ $this->params['breadcrumbs'][] = $this->title;
<p>Please fill out the following fields to login:</p> <p>Please fill out the following fields to login:</p>
<?php $form = ActiveForm::begin(array( <?php $form = ActiveForm::begin([
'id' => 'login-form', 'id' => 'login-form',
'options' => array('class' => 'form-horizontal'), 'options' => ['class' => 'form-horizontal'],
'fieldConfig' => array( 'fieldConfig' => [
'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>", 'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
'labelOptions' => array('class' => 'col-lg-1 control-label'), 'labelOptions' => ['class' => 'col-lg-1 control-label'],
), ],
)); ?> ]); ?>
<?php echo $form->field($model, 'username'); ?> <?php echo $form->field($model, 'username'); ?>
<?php echo $form->field($model, 'password')->passwordInput(); ?> <?php echo $form->field($model, 'password')->passwordInput(); ?>
<?php echo $form->field($model, 'rememberMe', array( <?php echo $form->field($model, 'rememberMe', [
'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>", 'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
))->checkbox(); ?> ])->checkbox(); ?>
<div class="form-group"> <div class="form-group">
<div class="col-lg-offset-1 col-lg-11"> <div class="col-lg-offset-1 col-lg-11">
<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?> <?php echo Html::submitButton('Login', ['class' => 'btn btn-primary']); ?>
</div> </div>
</div> </div>

2
web/index-test.php
View File

@ -1,6 +1,6 @@
<?php <?php
if (!in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', '::1'))) { if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
die('You are not allowed to access this file.'); die('You are not allowed to access this file.');
} }