Merge branch '3-maj-fichier-propore-a-cake-dans-app' into 'master'

Resolve "MAJ fichier propore à Cake dans app"

Closes #3

See merge request web-DPO/web-DPO!5

app/Config/Schema/db_acl.php

@@ -4,35 +4,48 @@
  *
  * Use it to configure database for ACL
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://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 (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
-/*
- *
+/**
  * Using the Schema command line utility
  * cake schema run create DbAcl
- *
  */
 class DbAclSchema extends CakeSchema {
 
+/**
+ * Before event.
+ *
+ * @param array $event The event data.
+ * @return bool Success
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After event.
+ *
+ * @param array $event The event data.
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 
+/**
+ * ACO - Access Control Object - Something that is wanted
+ */
 	public $acos = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
@@ -41,9 +54,16 @@ class DbAclSchema extends CakeSchema {
 		'alias' => array('type' => 'string', 'null' => true),
 		'lft' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
 		'rght' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
-		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+		'indexes' => array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'idx_acos_lft_rght' => array('column' => array('lft', 'rght'), 'unique' => 0),
+			'idx_acos_alias' => array('column' => 'alias', 'unique' => 0)
+		)
 	);
 
+/**
+ * ARO - Access Request Object - Something that wants something
+ */
 	public $aros = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
@@ -52,9 +72,17 @@ class DbAclSchema extends CakeSchema {
 		'alias' => array('type' => 'string', 'null' => true),
 		'lft' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
 		'rght' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
-		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+		'indexes' => array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'idx_aros_lft_rght' => array('column' => array('lft', 'rght'), 'unique' => 0),
+			'idx_aros_alias' => array('column' => 'alias', 'unique' => 0)
+		)
 	);
 
+/**
+ * Used by the Cake::Model:Permission class.
+ * Checks if the given $aro has access to action $action in $aco.
+ */
 	public $aros_acos = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'aro_id' => array('type' => 'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
@@ -63,7 +91,11 @@ class DbAclSchema extends CakeSchema {
 		'_read' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
 		'_update' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
 		'_delete' => array('type' => 'string', 'null' => false, 'default' => '0', 'length' => 2),
-		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1))
+		'indexes' => array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1),
+			'idx_aco_id' => array('column' => 'aco_id', 'unique' => 0)
+		)
 	);
 
 }

app/Config/Schema/db_acl.sql

 # $Id$
 #
-# Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+# Copyright (c) Cake Software Foundation, Inc. (https://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.
-# MIT License (http://www.opensource.org/licenses/mit-license.php)
+# MIT License (https://opensource.org/licenses/mit-license.php)
 
 CREATE TABLE acos (
   id INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -38,4 +38,15 @@ CREATE TABLE aros (
   lft INTEGER(10) DEFAULT NULL,
   rght INTEGER(10) DEFAULT NULL,
   PRIMARY KEY  (id)
-);
\ No newline at end of file
+);
+
+/* this indexes will improve acl perfomance */
+CREATE INDEX idx_acos_lft_rght ON `acos` (`lft`, `rght`);
+
+CREATE INDEX idx_acos_alias ON `acos` (`alias`);
+
+CREATE INDEX idx_aros_lft_rght ON `aros` (`lft`, `rght`);
+
+CREATE INDEX idx_aros_alias ON `aros` (`alias`);
+
+CREATE INDEX idx_aco_id ON `aros_acos` (`aco_id`);

app/Config/Schema/i18n.php

@@ -4,22 +4,21 @@
  *
  * Use it to configure database for i18n
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://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 (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
- *
  * Using the Schema command line utility
  *
  * Use it to configure database for i18n
@@ -28,15 +27,37 @@
  */
 class I18nSchema extends CakeSchema {
 
+/**
+ * The name property
+ *
+ * @var string
+ */
 	public $name = 'i18n';
 
+/**
+ * Before callback.
+ *
+ * @param array $event Schema object properties
+ * @return bool Should process continue
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After callback.
+ *
+ * @param array $event Schema object properties
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 
+/**
+ * The i18n table definition
+ *
+ * @var array
+ */
 	public $i18n = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'locale' => array('type' => 'string', 'null' => false, 'length' => 6, 'key' => 'index'),

app/Config/Schema/i18n.sql

 # $Id$
 #
-# Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+# Copyright (c) Cake Software Foundation, Inc. (https://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.
-# MIT License (http://www.opensource.org/licenses/mit-license.php)
+# MIT License (https://opensource.org/licenses/mit-license.php)
 
 CREATE TABLE i18n (
 	id int(10) NOT NULL auto_increment,

app/Config/Schema/sessions.php

@@ -4,37 +4,57 @@
  *
  * Use it to configure database for Sessions
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://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 (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
-/*
- *
+/**
  * Using the Schema command line utility
  * cake schema run create Sessions
- *
  */
 class SessionsSchema extends CakeSchema {
 
+/**
+ * Name property
+ *
+ * @var string
+ */
 	public $name = 'Sessions';
 
+/**
+ * Before callback.
+ *
+ * @param array $event Schema object properties
+ * @return bool Should process continue
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After callback.
+ *
+ * @param array $event Schema object properties
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 
+/**
+ * The cake_sessions table definition
+ *
+ * @var array
+ */
 	public $cake_sessions = array(
 		'id' => array('type' => 'string', 'null' => false, 'key' => 'primary'),
 		'data' => array('type' => 'text', 'null' => true, 'default' => null),

app/Config/acl.ini.php

@@ -2,20 +2,20 @@
 ;/**
 ; * ACL Configuration
 ; *
-; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
-; * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+; * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+; * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
 ; *
 ; *  Licensed under The MIT License
 ; *  Redistributions of files must retain the above copyright notice.
 ; *
-; * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
-; * @link          http://cakephp.org CakePHP(tm) Project
+; * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+; * @link          https://cakephp.org CakePHP(tm) Project
 ; * @package       app.Config
 ; * @since         CakePHP(tm) v 0.10.0.1076
-; * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+; * @license       https://opensource.org/licenses/mit-license.php MIT License
 ; */
 
-; acl.ini.php - Cake ACL Configuration
+; acl.ini.php - CakePHP ACL Configuration
 ; ---------------------------------------------------------------------
 ; Use this file to specify user permissions.
 ; aco = access control object (something in your application)

app/Config/acl.php

@@ -4,18 +4,18 @@
  *
  * Use it to configure access control of your CakePHP application.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://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 (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Config
  * @since         CakePHP(tm) v 2.1
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
@@ -34,60 +34,72 @@
  * will ask the configured ACL interface if access is granted. Under the assumptions 1. and 2. this will be
  * done via a call to Acl->check() with
  *
- *    array('User' => array('username' => 'jeff', 'group_id' => 4, ...))
+ * ```
+ * array('User' => array('username' => 'jeff', 'group_id' => 4, ...))
+ * ```
  *
  * as ARO and
  *
- *    '/controllers/invoices/delete'
+ * ```
+ * '/controllers/invoices/delete'
+ * ```
  *
  * as ACO.
  *
  * If the configured map looks like
  *
- *    $config['map'] = array(
- *       'User' => 'User/username',
- *       'Role' => 'User/group_id',
- *    );
+ * ```
+ * $config['map'] = array(
+ *    'User' => 'User/username',
+ *    'Role' => 'User/group_id',
+ * );
+ * ```
  *
  * then PhpAcl will lookup if we defined a role like User/jeff. If that role is not found, PhpAcl will try to
  * find a definition for Role/4. If the definition isn't found then a default role (Role/default) will be used to
  * check rules for the given ACO. The search can be expanded by defining aliases in the alias configuration.
  * E.g. if you want to use a more readable name than Role/4 in your definitions you can define an alias like
  *
- *    $config['alias'] = array(
- *       'Role/4' => 'Role/editor',
- *    );
+ * ```
+ * $config['alias'] = array(
+ *    'Role/4' => 'Role/editor',
+ * );
+ * ```
  *
  * In the roles configuration you can define roles on the lhs and inherited roles on the rhs:
  *
- *    $config['roles'] = array(
- *       'Role/admin' => null,
- *       'Role/accountant' => null,
- *       'Role/editor' => null,
- *       'Role/manager' => 'Role/editor, Role/accountant',
- *       'User/jeff' => 'Role/manager',
- *    );
+ * ```
+ * $config['roles'] = array(
+ *    'Role/admin' => null,
+ *    'Role/accountant' => null,
+ *    'Role/editor' => null,
+ *    'Role/manager' => 'Role/editor, Role/accountant',
+ *    'User/jeff' => 'Role/manager',
+ * );
+ * ```
  *
  * In this example manager inherits all rules from editor and accountant. Role/admin doesn't inherit from any role.
  * Lets define some rules:
  *
- *    $config['rules'] = array(
- *       'allow' => array(
- *       	'*' => 'Role/admin',
- *       	'controllers/users/(dashboard|profile)' => 'Role/default',
- *       	'controllers/invoices/*' => 'Role/accountant',
- *       	'controllers/articles/*' => 'Role/editor',
- *       	'controllers/users/*'  => 'Role/manager',
- *       	'controllers/invoices/delete'  => 'Role/manager',
- *       ),
- *       'deny' => array(
- *       	'controllers/invoices/delete' => 'Role/accountant, User/jeff',
- *       	'controllers/articles/(delete|publish)' => 'Role/editor',
- *       ),
- *    );
+ * ```
+ * $config['rules'] = array(
+ *    'allow' => array(
+ *        '*' => 'Role/admin',
+ *        'controllers/users/(dashboard|profile)' => 'Role/default',
+ *        'controllers/invoices/*' => 'Role/accountant',
+ *        'controllers/articles/*' => 'Role/editor',
+ *        'controllers/users/*'  => 'Role/manager',
+ *        'controllers/invoices/delete'  => 'Role/manager',
+ *    ),
+ *    'deny' => array(
+ *        'controllers/invoices/delete' => 'Role/accountant, User/jeff',
+ *        'controllers/articles/(delete|publish)' => 'Role/editor',
+ *    ),
+ * );
+ * ```
  *
  * Ok, so as jeff inherits from Role/manager he's matched every rule that references User/jeff, Role/manager,
- * Role/editor, Role/accountant and Role/default. However, for jeff, rules for User/jeff are more specific than
+ * Role/editor, and Role/accountant. However, for jeff, rules for User/jeff are more specific than
  * rules for Role/manager, rules for Role/manager are more specific than rules for Role/editor and so on.
  * This is important when allow and deny rules match for a role. E.g. Role/accountant is allowed
  * controllers/invoices/* but at the same time controllers/invoices/delete is denied. But there is a more

app/Console/Command/AppShell.php

@@ -2,17 +2,17 @@
 /**
  * AppShell file
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://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 (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @since         CakePHP(tm) v 2.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 App::uses('Shell', 'Console');

app/Console/cake

@@ -3,18 +3,18 @@
 #
 # Bake is a shell script for running CakePHP bake script
 #
-# CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
-# Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+# CakePHP(tm) :  Rapid Development Framework (https://cakephp.org)
+# Copyright (c) Cake Software Foundation, Inc. (https://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 (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
-# @link          http://cakephp.org CakePHP(tm) Project
+# @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+# @link          https://cakephp.org CakePHP(tm) Project
 # @package       app.Console
 # @since         CakePHP(tm) v 1.2.0.5012
-# @license       http://www.opensource.org/licenses/mit-license.php MIT License
+# @license       https://opensource.org/licenses/mit-license.php MIT License
 #
 ################################################################################
 

app/Console/cake.bat

@@ -2,17 +2,17 @@
 ::
 :: Bake is a shell script for running CakePHP bake script
 ::
-:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
-:: Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+:: CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+:: Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
 ::
 :: Licensed under The MIT License
 :: Redistributions of files must retain the above copyright notice.
 ::
-:: @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
-:: @link          http://cakephp.org CakePHP(tm) Project
+:: @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+:: @link          https://cakephp.org CakePHP(tm) Project
 :: @package       app.Console
 :: @since         CakePHP(tm) v 2.0
-:: @license       http://www.opensource.org/licenses/mit-license.php MIT License
+:: @license       https://opensource.org/licenses/mit-license.php MIT License
 ::
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 

app/Console/cake.php

@@ -3,34 +3,45 @@
 /**
  * Command-line code generation utility to automate programmer chores.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://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 (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Console
  * @since         CakePHP(tm) v 2.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
-$ds = DIRECTORY_SEPARATOR;
-$dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
+if (!defined('DS')) {
+	define('DS', DIRECTORY_SEPARATOR);
+}
+
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
+	$appDir = basename(dirname(dirname(__FILE__)));
+	$install = $root . DS . 'lib';
+	$composerInstall = $root . DS . $appDir . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
 
-	// the following line differs from its sibling
+	// the following lines differ from its sibling
 	// /lib/Cake/Console/Templates/skel/Console/cake.php
-	ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+	if (file_exists($composerInstall . DS . $dispatcher)) {
+		$install = $composerInstall;
+	}
+
+	ini_set('include_path', $install . PATH_SEPARATOR . ini_get('include_path'));
+	unset($root, $appDir, $install, $composerInstall);
 }
 
 if (!include $dispatcher) {
 	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
-unset($paths, $path, $dispatcher, $root, $ds);
+unset($dispatcher);
 
 return ShellDispatcher::run($argv);