Upgrade CakePHP from 2.2.5 to 2.9.5

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

View file

@ -1,25 +1,23 @@
<?php
/**
*
* PHP 5
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* 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://cakephp.org CakePHP(tm) Project
* @package Cake.Observer
* @since CakePHP(tm) v 2.1
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
/**
* Represent the transport class of events across the system, it receives a name, and subject and an optional
* Represents the transport class of events across the system. It receives a name, subject and an optional
* payload. The name can be any string that uniquely identifies the event across the application, while the subject
* represents the object that the event is applying to.
* represents the object that the event applies to.
*
* @package Cake.Event
*/
@ -28,7 +26,7 @@ class CakeEvent {
/**
* Name of the event
*
* @var string $name
* @var string
*/
protected $_name = null;
@ -42,21 +40,21 @@ class CakeEvent {
/**
* Custom data for the method that receives the event
*
* @var mixed $data
* @var mixed
*/
public $data = null;
/**
* Property used to retain the result value of the event listeners
*
* @var mixed $result
* @var mixed
*/
public $result = null;
/**
* Flags an event as stopped or not, default is false
*
* @var boolean
* @var bool
*/
protected $_stopped = false;
@ -69,11 +67,10 @@ class CakeEvent {
*
* ## Examples of usage:
*
* {{{
* ```
* $event = new CakeEvent('Order.afterBuy', $this, array('buyer' => $userData));
* $event = new CakeEvent('User.afterRegister', $UserModel);
* }}}
*
* ```
*/
public function __construct($name, $subject = null, $data = null) {
$this->_name = $name;
@ -84,7 +81,7 @@ class CakeEvent {
/**
* Dynamically returns the name and subject if accessed directly
*
* @param string $attribute
* @param string $attribute Attribute name.
* @return mixed
*/
public function __get($attribute) {
@ -105,7 +102,7 @@ class CakeEvent {
/**
* Returns the subject of this event
*
* @return string
* @return object
*/
public function subject() {
return $this->_subject;
@ -123,7 +120,7 @@ class CakeEvent {
/**
* Check if the event is stopped
*
* @return boolean True if the event is stopped
* @return bool True if the event is stopped
*/
public function isStopped() {
return $this->_stopped;