Skip to content

Y
yii2
Commit 52e2d037 by Carsten Brandt
Options

Merge pull request #1940 from lucianobaraglia/some-cs-fixes

Some code style fixes [skip ci]
parents 3e7cce23 cbf649b1
Showing with 34 additions and 32 deletions
extensions/apidoc/templates/offline/views/index.php
...@@ -11,20 +11,22 @@ use yii\apidoc\models\TraitDoc; ...@@ -11,20 +11,22 @@ use yii\apidoc\models\TraitDoc;
?><h1>Class Reference</h1> ?><h1>Class Reference</h1>
<table class="summaryTable docIndex"> <table class="summaryTable docIndex">
<colgroup> <colgroup>
<col class="col-package" /> <col class="col-package" />
<col class="col-class" /> <col class="col-class" />
<col class="col-description" /> <col class="col-description" />
</colgroup> </colgroup>
<tr> <tr>
<th>Class</th><th>Description</th> <th>Class</th>
</tr> <th>Description</th>
</tr>
<?php <?php
ksort($types); ksort($types);
foreach($types as $i=>$class): ?> foreach($types as $i=>$class):
<tr> ?>
<tr>
<td><?= $this->context->typeLink($class, $class->name) ?></td> <td><?= $this->context->typeLink($class, $class->name) ?></td>
<td><?= \yii\apidoc\helpers\Markdown::process($class->shortDescription, $class) ?></td> <td><?= \yii\apidoc\helpers\Markdown::process($class->shortDescription, $class) ?></td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>
extensions/apidoc/templates/offline/views/offline.php
...@@ -19,20 +19,20 @@ $this->beginPage(); ...@@ -19,20 +19,20 @@ $this->beginPage();
<body> <body>
<?php $this->beginBody(); ?> <?php $this->beginBody(); ?>
<div id="apiPage"> <div id="apiPage">
<div id="apiHeader"> <div id="apiHeader">
<a href="http://www.yiiframework.com">Yii Framework</a> v<?php echo Yii::getVersion(); ?> Class Reference <a href="http://www.yiiframework.com">Yii Framework</a> v<?php echo Yii::getVersion(); ?> Class Reference
</div><!-- end of header --> </div><!-- end of header -->
<div id="content"> <div id="content">
<?php echo $content; ?> <?php echo $content; ?>
</div><!-- end of content --> </div><!-- end of content -->
<div id="apiFooter"> <div id="apiFooter">
&copy; 2008-2013 by <a href="http://www.yiisoft.com">Yii Software LLC</a><br/> <p>&copy; 2008-2013 by <a href="http://www.yiisoft.com">Yii Software LLC</a></p>
All Rights Reserved.<br/> <p>All Rights Reserved.</p>
</div><!-- end of footer --> </div><!-- end of footer -->
<script type="text/javascript"> <script type="text/javascript">
/*<![CDATA[*/ /*<![CDATA[*/
...@@ -64,7 +64,7 @@ $("a.sourceLink").click(function(){ ...@@ -64,7 +64,7 @@ $("a.sourceLink").click(function(){
/*]]>*/ /*]]>*/
</script> </script>
</div><!-- end of page --> </div><!-- end of page -->
<?php $this->endBody(); ?> <?php $this->endBody(); ?>
</body> </body>
</html> </html>
......
tests/unit/extensions/redis/RedisCacheTest.php
...@@ -70,32 +70,32 @@ class RedisCacheTest extends CacheTestCase ...@@ -70,32 +70,32 @@ class RedisCacheTest extends CacheTestCase
{ {
$cache = $this->getCacheInstance(); $cache = $this->getCacheInstance();
$data=str_repeat('XX',8192); // http://www.php.net/manual/en/function.fread.php $data = str_repeat('XX', 8192); // http://www.php.net/manual/en/function.fread.php
$key='bigdata1'; $key = 'bigdata1';
$this->assertFalse($cache->get($key)); $this->assertFalse($cache->get($key));
$cache->set($key,$data); $cache->set($key, $data);
$this->assertTrue($cache->get($key)===$data); $this->assertTrue($cache->get($key) === $data);
// try with multibyte string // try with multibyte string
$data=str_repeat('ЖЫ',8192); // http://www.php.net/manual/en/function.fread.php $data = str_repeat('ЖЫ', 8192); // http://www.php.net/manual/en/function.fread.php
$key='bigdata2'; $key = 'bigdata2';
$this->assertFalse($cache->get($key)); $this->assertFalse($cache->get($key));
$cache->set($key,$data); $cache->set($key, $data);
$this->assertTrue($cache->get($key)===$data); $this->assertTrue($cache->get($key) === $data);
} }
public function testMultiByteGetAndSet() public function testMultiByteGetAndSet()
{ {
$cache = $this->getCacheInstance(); $cache = $this->getCacheInstance();
$data=['abc'=>'ежик',2=>'def']; $data = ['abc' => 'ежик', 2 => 'def'];
$key='data1'; $key = 'data1';
$this->assertFalse($cache->get($key)); $this->assertFalse($cache->get($key));
$cache->set($key,$data); $cache->set($key, $data);
$this->assertTrue($cache->get($key)===$data); $this->assertTrue($cache->get($key) === $data);
} }
} }
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