Error202
/
yii2-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/yiisoft/yii2

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
940ac808c9 0f7f193623
commit
909bbe62b0
6 changed files with 6191 additions and 138 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      build/build
  2. 7
      tests/unit/framework/caching/ApcCacheTest.php
  3. 4
      yii/requirements/requirements.php
  4. 6188
      yii/requirements/views/web/css.php
  5. 62
      yii/requirements/views/web/index.php

2
build/build
Unescape View File

@ -11,7 +11,7 @@
// fcgi doesn't have STDIN defined by default // fcgi doesn't have STDIN defined by default
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
require(__DIR__ . '/../framework/Yii.php'); require(__DIR__ . '/../yii/Yii.php');
$id = 'yiic-build'; $id = 'yiic-build';
$basePath = __DIR__; $basePath = __DIR__;

7
tests/unit/framework/caching/ApcCacheTest.php
Unescape View File

@ -31,7 +31,8 @@ class ApcCacheTest extends CacheTest
return $this->_cacheInstance; return $this->_cacheInstance;
} }
// TODO there seems to be a problem with APC returning cached value even if it is expired. public function testExpire()
// TODO makes test fail on PHP 5.3.10-1ubuntu3.6 with Suhosin-Patch (cli) -- cebe {
// TODO http://drupal.org/node/1278292 $this->markTestSkipped("APC keys are expiring only on the next request.");
}
} }

4
yii/requirements/requirements.php
Unescape View File

@ -7,9 +7,9 @@ return array(
array( array(
'name' => 'PHP version', 'name' => 'PHP version',
'mandatory' => true, 'mandatory' => true,
'condition' => version_compare(PHP_VERSION, '5.3.0', '>='), 'condition' => version_compare(PHP_VERSION, '5.3.3', '>='),
'by' => '<a href="http://www.yiiframework.com">Yii Framework</a>', 'by' => '<a href="http://www.yiiframework.com">Yii Framework</a>',
'memo' => 'PHP 5.3.0 or higher is required.', 'memo' => 'PHP 5.3.3 or higher is required.',
), ),
array( array(
'name' => 'Reflection extension', 'name' => 'Reflection extension',

6188
yii/requirements/views/web/css.php
View File

File diff suppressed because it is too large Load Diff

62
yii/requirements/views/web/index.php
Unescape View File

@ -3,26 +3,22 @@
/* @var $summary array */ /* @var $summary array */
/* @var $requirements array[] */ /* @var $requirements array[] */
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta charset="utf-8"/>
<meta http-equiv="content-language" content="en"/>
<style type="text/css">
<?php $this->renderViewFile(dirname(__FILE__).DIRECTORY_SEPARATOR.'css.php'); ?>
</style>
<title>Yii Application Requirement Checker</title> <title>Yii Application Requirement Checker</title>
<?php $this->renderViewFile(dirname(__FILE__).DIRECTORY_SEPARATOR.'css.php'); ?>
</head> </head>
<body> <body>
<div id="page"> <div class="container">
<div class="header">
<div id="header">
<h1>Yii Application Requirement Checker</h1> <h1>Yii Application Requirement Checker</h1>
</div><!-- header--> </div>
<hr>
<div id="content"> <div class="content">
<h2>Description</h2> <h3>Description</h3>
<p> <p>
This script checks if your server configuration meets the requirements This script checks if your server configuration meets the requirements
for running Yii application. for running Yii application.
@ -30,27 +26,25 @@ It checks if the server is running the right version of PHP,
if appropriate PHP extensions have been loaded, and if php.ini file settings are correct. if appropriate PHP extensions have been loaded, and if php.ini file settings are correct.
</p> </p>
<h2>Conclusion</h2> <h3>Conclusion</h3>
<p>
<?php if ($summary['errors']>0): ?> <?php if ($summary['errors']>0): ?>
Unfortunately your server configuration does not satisfy the requirements by this application. <strong class="text-error">Unfortunately your server configuration does not satisfy the requirements by this application.</strong>
<?php elseif ($summary['warnings']>0): ?> <?php elseif ($summary['warnings']>0): ?>
Your server configuration satisfies the minimum requirements by this application. Please pay attention to the warnings listed below if your application will use the corresponding features. <strong class="text-warning">Your server configuration satisfies the minimum requirements by this application. Please pay attention to the warnings listed below if your application will use the corresponding features.</strong>
<?php else: ?> <?php else: ?>
Congratulations! Your server configuration satisfies all requirements. <strong class="text-success">Congratulations! Your server configuration satisfies all requirements.</strong>
<?php endif; ?> <?php endif; ?>
</p>
<h2>Details</h2> <h3>Details</h3>
<table class="result"> <table class="table table-bordered">
<tr><th>Name</th><th>Result</th><th>Required By</th><th>Memo</th></tr> <tr><th>Name</th><th>Result</th><th>Required By</th><th>Memo</th></tr>
<?php foreach($requirements as $requirement): ?> <?php foreach($requirements as $requirement): ?>
<tr> <tr class="<?php echo $requirement['condition'] ? 'success' : ($requirement['mandatory'] ? 'error' : 'warning'); ?>">
<td> <td>
<?php echo $requirement['name']; ?> <?php echo $requirement['name']; ?>
</td> </td>
<td class="<?php echo $requirement['condition'] ? 'passed' : ($requirement['mandatory'] ? 'failed' : 'warning'); ?>"> <td >
<?php echo $requirement['condition'] ? 'Passed' : ($requirement['mandatory'] ? 'Failed' : 'Warning'); ?> <?php echo $requirement['condition'] ? 'Passed' : ($requirement['mandatory'] ? 'Failed' : 'Warning'); ?>
</td> </td>
<td> <td>
@ -63,20 +57,14 @@ Congratulations! Your server configuration satisfies all requirements.
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
<table> </div>
<tr>
<td class="passed">&nbsp;</td><td>passed</td>
<td class="failed">&nbsp;</td><td>failed</td>
<td class="warning">&nbsp;</td><td>warning</td>
</tr>
</table>
</div><!-- content -->
<div id="footer"> <hr>
<?php echo $this->getServerInfo().' '.$this->getNowDate(); ?>
</div><!-- footer -->
</div><!-- page --> <div class="footer">
<p>Server: <?php echo $this->getServerInfo().' '.$this->getNowDate(); ?></p>
<p>Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a></p>
</div>
</div>
</body> </body>
</html> </html>
Write Preview
Loading…
Cancel
Save