adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix CS errors

Browse source
This commit is contained in:
ADmad 2013-04-01 02:16:52 +05:30
parent d681a191db
commit d809b1480e
6 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Behavior/TreeBehavior.php
View file

@ -673,7 +673,7 @@ class TreeBehavior extends ModelBehavior {
$hasChildren = (bool)$children; $hasChildren = (bool)$children;
if (!is_null($parentId)) { if (!is_null($parentId)) {
if($hasChildren) { if ($hasChildren) {
$Model->updateAll( $Model->updateAll(
array($this->settings[$Model->alias]['left'] => $counter), array($this->settings[$Model->alias]['left'] => $counter),
array($Model->escapeField() => $parentId) array($Model->escapeField() => $parentId)

3
lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php
View file

@ -139,7 +139,8 @@ class BasicAuthenticateTest extends CakeTestCase {
try { try {
$this->auth->unauthenticated($request, $this->response); $this->auth->unauthenticated($request, $this->response);
} catch (UnauthorizedException $e) {} } catch (UnauthorizedException $e) {
}
$this->assertNotEmpty($e); $this->assertNotEmpty($e);

3
lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php
View file

@ -137,7 +137,8 @@ DIGEST;
try { try {
$this->auth->unauthenticated($request, $this->response); $this->auth->unauthenticated($request, $this->response);
} catch (UnauthorizedException $e) {} } catch (UnauthorizedException $e) {
}
$this->assertNotEmpty($e); $this->assertNotEmpty($e);

20
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
View file

@ -345,24 +345,24 @@ class TextHelperTest extends CakeTestCase {
<p>This is a test text</p> <p>This is a test text</p>
TEXT; TEXT;
$result = $this->Text->autoParagraph($text); $result = $this->Text->autoParagraph($text);
$text = 'This is a <br/> <BR> test text'; $text = 'This is a <br/> <BR> test text';
$expected = <<<TEXT $expected = <<<TEXT
<p>This is a </p> <p>This is a </p>
<p> test text</p> <p> test text</p>
TEXT; TEXT;
$result = $this->Text->autoParagraph($text); $result = $this->Text->autoParagraph($text);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = $this->Text->autoParagraph($text); $result = $this->Text->autoParagraph($text);
$text = 'This is a <BR id="test"/><br class="test"> test text'; $text = 'This is a <BR id="test"/><br class="test"> test text';
$expected = <<<TEXT $expected = <<<TEXT
<p>This is a </p> <p>This is a </p>
<p> test text</p> <p> test text</p>
TEXT; TEXT;
$result = $this->Text->autoParagraph($text); $result = $this->Text->autoParagraph($text);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$text = <<<TEXT $text = <<<TEXT
This is a test text. This is a test text.
This is a line return. This is a line return.

3
lib/Cake/Utility/Validation.php
View file

@ -618,8 +618,7 @@ class Validation {
switch ($country) { switch ($country) {
case 'us': case 'us':
case 'ca': case 'ca':
// deprecated three-letter-code case 'can': // deprecated three-letter-code
case 'can':
case 'all': case 'all':
// includes all NANPA members. // includes all NANPA members.
// see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories // see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories