Merge branch '2.6' into 2.7

This commit is contained in:
mark_story 2015-06-14 21:52:53 -04:00
commit ebb01f0fac
2 changed files with 26 additions and 8 deletions

View file

@ -1,6 +1,7 @@
language: php language: php
php: php:
- 5.2
- 5.3 - 5.3
- 5.4 - 5.4
- 5.5 - 5.5

View file

@ -37,14 +37,29 @@ class CakePlugin {
* *
* Examples: * Examples:
* *
* `CakePlugin::load('DebugKit')` will load the DebugKit plugin and will not load any bootstrap nor route files * `CakePlugin::load('DebugKit')`
* `CakePlugin::load('DebugKit', array('bootstrap' => true, 'routes' => true))` will load the bootstrap.php and routes.php files
* `CakePlugin::load('DebugKit', array('bootstrap' => false, 'routes' => true))` will load routes.php file but not bootstrap.php
* `CakePlugin::load('DebugKit', array('bootstrap' => array('config1', 'config2')))` will load config1.php and config2.php files
* `CakePlugin::load('DebugKit', array('bootstrap' => 'aCallableMethod'))` will run the aCallableMethod function to initialize it
* *
* Bootstrap initialization functions can be expressed as a PHP callback type, including closures. Callbacks will receive two * Will load the DebugKit plugin and will not load any bootstrap nor route files
* parameters (plugin name, plugin configuration) *
* `CakePlugin::load('DebugKit', array('bootstrap' => true, 'routes' => true))`
*
* will load the bootstrap.php and routes.php files
*
* `CakePlugin::load('DebugKit', array('bootstrap' => false, 'routes' => true))`
*
* will load routes.php file but not bootstrap.php
*
* `CakePlugin::load('DebugKit', array('bootstrap' => array('config1', 'config2')))`
*
* will load config1.php and config2.php files
*
* `CakePlugin::load('DebugKit', array('bootstrap' => 'aCallableMethod'))`
*
* will run the aCallableMethod function to initialize it
*
* Bootstrap initialization functions can be expressed as a PHP callback type,
* including closures. Callbacks will receive two parameters
* (plugin name, plugin configuration)
* *
* It is also possible to load multiple plugins at once. Examples: * It is also possible to load multiple plugins at once. Examples:
* *
@ -63,7 +78,9 @@ class CakePlugin {
* ), array('bootstrap' => true)) * ), array('bootstrap' => true))
* ``` * ```
* *
* Will only load the bootstrap for ApiGenerator and only the routes for DebugKit * Will only load the bootstrap for ApiGenerator and only the routes for DebugKit.
* By using the `path` option you can specify an absolute path to the plugin. Make
* sure that the path is slash terminated or your plugin will not be located properly.
* *
* @param string|array $plugin name of the plugin to be loaded in CamelCase format or array or plugins to load * @param string|array $plugin name of the plugin to be loaded in CamelCase format or array or plugins to load
* @param array $config configuration options for the plugin * @param array $config configuration options for the plugin