Skip to content

fixes #591 - #592

Merged
markstory merged 5 commits into
cakephp:2.2from
gemal:2.2
Mar 5, 2018
Merged

markstory merged 5 commits into
cakephp:2.2from
gemal:2.2

Conversation

@gemal

@gemal gemal commented Mar 2, 2018 •

Copy link
Copy Markdown
Contributor

extract($settings);

$graphValue = ($value / $max) * $width;
$graphValue = ((float)$value / $max) * $width;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The stickler is configured for 3.x - for 2.x you should disregard.

$graphOffset = 0;
} else {
$graphOffset = ($offset / $max) * $width;
$graphOffset = ((float)$offset / $max) * $width;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

@dereuromark dereuromark left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests probably wont become green anymore easily. Too old PHP versions and stuff.

@dereuromark dereuromark added this to the 2.2.x milestone Mar 2, 2018
Comment thread View/Helper/SimpleGraphHelper.php Outdated
extract($settings);

$graphValue = ($value / $max) * $width;
$graphValue = ((float)$value / $max) * $width;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line indented incorrectly; expected at least 8 spaces, found 7

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should have ignored those false positive messages reported by CI.

Comment thread View/Helper/SimpleGraphHelper.php Outdated
$graphOffset = 0;
} else {
$graphOffset = ($offset / $max) * $width;
$graphOffset = ((float)$offset / $max) * $width;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line indented incorrectly; expected at least 12 spaces, found 11

@dereuromark dereuromark left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert last commit.

extract($settings);

$graphValue = ($value / $max) * $width;
$graphValue = ((float)$value / $max) * $width;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

@markstory markstory self-assigned this Mar 3, 2018

$result = DebugMemory::getAll(true);
$this->assertEquals(count($result), 1);
$this->assertCount(1, $result);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed


$result = DebugMemory::getAll();
$this->assertTrue(empty($result));
$this->assertEmpty($result);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

$result = DebugMemory::getAll();

$this->assertEquals(count($result), 2);
$this->assertCount(2, $result);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed


DebugTimer::start('test3');
$this->assertIdentical(DebugTimer::elapsedTime('test3'), 0);
$this->assertEquals(DebugTimer::elapsedTime('test3'), 0);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

$timers = DebugTimer::getAll();

$this->assertEquals(2, count($timers));
$this->assertCount(2, $timers);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

$this->Toolbar->panelStart('My Panel', 'my_panel');
$result = $this->firecake->sentHeaders;
$this->assertPattern('/GROUP_START.+My Panel/', $result['X-Wf-1-1-1-1']);
$this->assertRegexp('/GROUP_START.+My Panel/', $result['X-Wf-1-1-1-1']);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

$this->Toolbar->panelEnd();
$result = $this->firecake->sentHeaders;
$this->assertPattern('/GROUP_END/', $result['X-Wf-1-1-1-1']);
$this->assertRegexp('/GROUP_END/', $result['X-Wf-1-1-1-1']);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

$result = $this->Controller->render();
$result = str_replace(array("\n", "\r"), '', $result);
$this->assertPattern('#<div id\="debug-kit-toolbar">.+</div>.*</body>#', $result);
$this->assertRegexp('#<div id\="debug-kit-toolbar">.+</div>.*</body>#', $result);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

$result = $this->Controller->render();
$result = str_replace(array("\n", "\r"), '', $result);
$this->assertPattern('#<script\s*type="text/javascript"\s*src="/debug_kit/js/js_debug_toolbar.js(?:\?\d*?)?"\s*>\s?</script>#', $result);
$this->assertRegexp('#<script\s*type="text/javascript"\s*src="/debug_kit/js/js_debug_toolbar.js(?:\?\d*?)?"\s*>\s?</script>#', $result);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed
Line exceeds 120 characters; contains 144 characters

extract($settings);

$graphValue = ($value / $max) * $width;
$graphValue = ((float)$value / $max) * $width;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spaces must be used to indent lines; tabs are not allowed

@markstory
markstory merged commit fa381e2 into cakephp:2.2 Mar 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants