Skip to content

Commit

Permalink
Fix CS errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ADmad committed Jul 14, 2013
1 parent d3b0754 commit 7162f8c
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 7 deletions.
1 change: 1 addition & 0 deletions lib/Cake/Console/Templates/skel/Config/email.default.php
Expand Up @@ -15,6 +15,7 @@
namespace App\Config;

use Cake\Core\Configure;

/**
* Email configuration.
*
Expand Down
5 changes: 3 additions & 2 deletions lib/Cake/Model/Permission.php
Expand Up @@ -19,6 +19,7 @@
namespace Cake\Model;

use Cake\Core\Configure;
use Cake\Error;
use Cake\Utility\Hash;

/**
Expand Down Expand Up @@ -166,7 +167,7 @@ public function check($aro, $aco, $action = "*") {
* @param string $actions Action (defaults to *) Invalid permissions will result in an exception
* @param integer $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
* @return boolean Success
* @throws AclException on Invalid permission key.
* @throws Cake\Error\AclException on Invalid permission key.
*/
public function allow($aro, $aco, $actions = "*", $value = 1) {
$perms = $this->getAclLink($aro, $aco);
Expand All @@ -192,7 +193,7 @@ public function allow($aro, $aco, $actions = "*", $value = 1) {
$action = '_' . $action;
}
if (!in_array($action, $permKeys, true)) {
throw new AclException(__d('cake_dev', 'Invalid permission key "%s"', $action));
throw new Error\AclException(__d('cake_dev', 'Invalid permission key "%s"', $action));
}
$save[$action] = $value;
}
Expand Down
8 changes: 5 additions & 3 deletions lib/Cake/Test/TestCase/Database/QueryTest.php
Expand Up @@ -1824,9 +1824,11 @@ public function testInsertFailureMixingTypesQueryFirst() {
*/
public function testSQLFunctions() {
$query = new Query($this->connection);
$result = $query->select(function($q) {
return ['total' => $q->count('*')];
})
$result = $query->select(
function($q) {
return ['total' => $q->count('*')];
}
)
->from('articles')
->execute();
$expected = [['total' => 3]];
Expand Down
1 change: 1 addition & 0 deletions lib/Cake/Test/TestCase/Event/EventManagerTest.php
Expand Up @@ -88,6 +88,7 @@ public function thirdListenerFunction() {
*
*/
class EventManagerTest extends TestCase {

/**
* Tests the attach() method for a single event key in multiple queues
*
Expand Down
Expand Up @@ -24,7 +24,6 @@
use Cake\Model\Model;
use Cake\TestSuite\TestCase;


require_once dirname(__DIR__) . DS . 'models.php';

/**
Expand Down
1 change: 1 addition & 0 deletions lib/Cake/Test/TestCase/View/HelperCollectionTest.php
Expand Up @@ -33,6 +33,7 @@ class HtmlAliasHelper extends HtmlHelper {

public function afterRender($viewFile) {
}

}

/**
Expand Down
1 change: 1 addition & 0 deletions lib/Cake/TestSuite/templates/footer.php
Expand Up @@ -18,6 +18,7 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
use Cake\View\View;

?> </div>
</div>
<div id="footer">
Expand Down
1 change: 0 additions & 1 deletion lib/Cake/View/HelperCollection.php
Expand Up @@ -45,7 +45,6 @@ class HelperCollection {
*/
protected $_View;


/**
* EventManager instance.
*
Expand Down

0 comments on commit 7162f8c

Please sign in to comment.