mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
Fix CS errors
This commit is contained in:
parent
d681a191db
commit
d809b1480e
6 changed files with 17 additions and 16 deletions
|
@ -673,7 +673,7 @@ class TreeBehavior extends ModelBehavior {
|
|||
$hasChildren = (bool)$children;
|
||||
|
||||
if (!is_null($parentId)) {
|
||||
if($hasChildren) {
|
||||
if ($hasChildren) {
|
||||
$Model->updateAll(
|
||||
array($this->settings[$Model->alias]['left'] => $counter),
|
||||
array($Model->escapeField() => $parentId)
|
||||
|
|
|
@ -139,7 +139,8 @@ class BasicAuthenticateTest extends CakeTestCase {
|
|||
|
||||
try {
|
||||
$this->auth->unauthenticated($request, $this->response);
|
||||
} catch (UnauthorizedException $e) {}
|
||||
} catch (UnauthorizedException $e) {
|
||||
}
|
||||
|
||||
$this->assertNotEmpty($e);
|
||||
|
||||
|
|
|
@ -137,7 +137,8 @@ DIGEST;
|
|||
|
||||
try {
|
||||
$this->auth->unauthenticated($request, $this->response);
|
||||
} catch (UnauthorizedException $e) {}
|
||||
} catch (UnauthorizedException $e) {
|
||||
}
|
||||
|
||||
$this->assertNotEmpty($e);
|
||||
|
||||
|
|
|
@ -345,24 +345,24 @@ class TextHelperTest extends CakeTestCase {
|
|||
<p>This is a test text</p>
|
||||
|
||||
TEXT;
|
||||
$result = $this->Text->autoParagraph($text);
|
||||
$text = 'This is a <br/> <BR> test text';
|
||||
$expected = <<<TEXT
|
||||
$result = $this->Text->autoParagraph($text);
|
||||
$text = 'This is a <br/> <BR> test text';
|
||||
$expected = <<<TEXT
|
||||
<p>This is a </p>
|
||||
<p> test text</p>
|
||||
|
||||
TEXT;
|
||||
$result = $this->Text->autoParagraph($text);
|
||||
$this->assertEquals($expected, $result);
|
||||
$result = $this->Text->autoParagraph($text);
|
||||
$text = 'This is a <BR id="test"/><br class="test"> test text';
|
||||
$expected = <<<TEXT
|
||||
$result = $this->Text->autoParagraph($text);
|
||||
$this->assertEquals($expected, $result);
|
||||
$result = $this->Text->autoParagraph($text);
|
||||
$text = 'This is a <BR id="test"/><br class="test"> test text';
|
||||
$expected = <<<TEXT
|
||||
<p>This is a </p>
|
||||
<p> test text</p>
|
||||
|
||||
TEXT;
|
||||
$result = $this->Text->autoParagraph($text);
|
||||
$this->assertEquals($expected, $result);
|
||||
$result = $this->Text->autoParagraph($text);
|
||||
$this->assertEquals($expected, $result);
|
||||
$text = <<<TEXT
|
||||
This is a test text.
|
||||
This is a line return.
|
||||
|
|
|
@ -618,8 +618,7 @@ class Validation {
|
|||
switch ($country) {
|
||||
case 'us':
|
||||
case 'ca':
|
||||
// deprecated three-letter-code
|
||||
case 'can':
|
||||
case 'can': // deprecated three-letter-code
|
||||
case 'all':
|
||||
// includes all NANPA members.
|
||||
// see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories
|
||||
|
|
Loading…
Reference in a new issue