brmlab/brmsklad
9
0
Fork 0
mirror of https://github.com/brmlab/brmsklad.git synced 2025-10-31 16:23:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade CakePHP from 2.2.5 to 2.9.5

Browse source
This commit is contained in:
Brm Ko 2017-02-26 15:29:44 +01:00
parent 5a580df460
commit 235a541597
793 changed files with 60746 additions and 23753 deletions
Download patch file Download diff file Expand all files Collapse all files

64
lib/Cake/Test/Case/Model/AclNodeTest.php
View file

@ -2,20 +2,20 @@
/**
* AclNodeTest file
*
* PHP 5
*
* CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
* Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice
*
* @copyright Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
* @package Cake.Test.Case.Model
* @since CakePHP(tm) v 1.2.0.4206
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
App::uses('DbAcl', 'Controller/Component/Acl');
App::uses('AclNode', 'Model');
@ -29,14 +29,14 @@ class DbAclNodeTestBase extends AclNode {
/**
* useDbConfig property
*
* @var string 'test'
* @var string
*/
public $useDbConfig = 'test';
/**
* cacheSources property
*
* @var bool false
* @var bool
*/
public $cacheSources = false;
}
@ -48,17 +48,10 @@ class DbAclNodeTestBase extends AclNode {
*/
class DbAroTest extends DbAclNodeTestBase {
/**
* name property
*
* @var string 'DbAroTest'
*/
public $name = 'DbAroTest';
/**
* useTable property
*
* @var string 'aros'
* @var string
*/
public $useTable = 'aros';
@ -77,17 +70,10 @@ class DbAroTest extends DbAclNodeTestBase {
*/
class DbAcoTest extends DbAclNodeTestBase {
/**
* name property
*
* @var string 'DbAcoTest'
*/
public $name = 'DbAcoTest';
/**
* useTable property
*
* @var string 'acos'
* @var string
*/
public $useTable = 'acos';
@ -106,24 +92,17 @@ class DbAcoTest extends DbAclNodeTestBase {
*/
class DbPermissionTest extends CakeTestModel {
/**
* name property
*
* @var string 'DbPermissionTest'
*/
public $name = 'DbPermissionTest';
/**
* useTable property
*
* @var string 'aros_acos'
* @var string
*/
public $useTable = 'aros_acos';
/**
* cacheQueries property
*
* @var bool false
* @var bool
*/
public $cacheQueries = false;
@ -142,17 +121,10 @@ class DbPermissionTest extends CakeTestModel {
*/
class DbAcoActionTest extends CakeTestModel {
/**
* name property
*
* @var string 'DbAcoActionTest'
*/
public $name = 'DbAcoActionTest';
/**
* useTable property
*
* @var string 'aco_actions'
* @var string
*/
public $useTable = 'aco_actions';
@ -174,14 +146,14 @@ class DbAroUserTest extends CakeTestModel {
/**
* name property
*
* @var string 'AuthUser'
* @var string
*/
public $name = 'AuthUser';
/**
* useTable property
*
* @var string 'auth_users'
* @var string
*/
public $useTable = 'auth_users';
@ -192,9 +164,9 @@ class DbAroUserTest extends CakeTestModel {
* @return void
*/
public function bindNode($ref = null) {
if (Configure::read('DbAclbindMode') == 'string') {
if (Configure::read('DbAclbindMode') === 'string') {
return 'ROOT/admins/Gandalf';
} elseif (Configure::read('DbAclbindMode') == 'array') {
} elseif (Configure::read('DbAclbindMode') === 'array') {
return array('DbAroTest' => array('DbAroTest.model' => 'AuthUser', 'DbAroTest.foreign_key' => 2));
}
}
@ -209,9 +181,7 @@ class DbAroUserTest extends CakeTestModel {
class TestDbAcl extends DbAcl {
/**
* construct method
*
* @return void
* Constructor
*/
public function __construct() {
$this->Aro = new DbAroTest();