Skip to content

Y
yii2
Commit 909bbe62 by Qiang Xue
Options

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

parents 940ac808 0f7f1936
Showing with 50 additions and 60 deletions
build/build
...@@ -11,7 +11,7 @@ ...@@ -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__;
......
tests/unit/framework/caching/ApcCacheTest.php
...@@ -31,7 +31,8 @@ class ApcCacheTest extends CacheTest ...@@ -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.");
}
} }
yii/requirements/requirements.php
...@@ -7,9 +7,9 @@ return array( ...@@ -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',
......
yii/requirements/views/web/css.php
This source diff could not be displayed because it is too large. You can view the blob instead.
yii/requirements/views/web/index.php
...@@ -3,54 +3,48 @@ ...@@ -3,54 +3,48 @@
/* @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"/> <title>Yii Application Requirement Checker</title>
<style type="text/css"> <?php $this->renderViewFile(dirname(__FILE__).DIRECTORY_SEPARATOR.'css.php'); ?>
<?php $this->renderViewFile(dirname(__FILE__).DIRECTORY_SEPARATOR.'css.php'); ?>
</style>
<title>Yii Application Requirement Checker</title>
</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>
</div><!-- header--> <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.
It checks if the server is running the right version of PHP, 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): ?> <strong class="text-error">Unfortunately your server configuration does not satisfy the requirements by this application.</strong>
Unfortunately your server configuration does not satisfy the requirements by this application. <?php elseif ($summary['warnings']>0): ?>
<?php elseif ($summary['warnings']>0): ?> <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>
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. <?php else: ?>
<?php else: ?> <strong class="text-success">Congratulations! Your server configuration satisfies all requirements.</strong>
Congratulations! Your server configuration satisfies all requirements. <?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>
...@@ -59,24 +53,18 @@ Congratulations! Your server configuration satisfies all requirements. ...@@ -59,24 +53,18 @@ Congratulations! Your server configuration satisfies all requirements.
<td> <td>
<?php echo $requirement['memo']; ?> <?php echo $requirement['memo']; ?>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
<table>
<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>
<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>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment