Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
Update Zend Framework to 1.12.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed Jun 26, 2014
1 parent befe626 commit f1a0c26
Show file tree
Hide file tree
Showing 3,311 changed files with 476,500 additions and 89,731 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions library/Zend/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Acl.php 24772 2012-05-07 01:16:52Z adamlundrigan $
* @version $Id$
*/


Expand Down Expand Up @@ -53,7 +53,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Assert/Interface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/


Expand All @@ -41,7 +41,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Acl_Assert_Interface
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Exception.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/


Expand All @@ -29,7 +29,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Exception extends Zend_Exception
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Resource.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Resource.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/


Expand All @@ -29,7 +29,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Resource implements Zend_Acl_Resource_Interface
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Resource/Interface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/


/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Acl_Resource_Interface
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Role.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Role.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/


Expand All @@ -29,7 +29,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Role implements Zend_Acl_Role_Interface
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Role/Interface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Interface.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/


/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Acl_Role_Interface
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Role/Registry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Registry.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/


Expand All @@ -29,7 +29,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Role_Registry
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Acl/Role/Registry/Exception.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/


Expand All @@ -29,7 +29,7 @@
/**
* @category Zend
* @package Zend_Acl
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Acl_Role_Registry_Exception extends Zend_Acl_Exception
Expand Down
11 changes: 7 additions & 4 deletions library/Zend/Amf/Adobe/Auth.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Auth.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/

/** @see Zend_Amf_Auth_Abstract */
Expand All @@ -28,12 +28,15 @@
/** @see Zend_Auth_Result */
// require_once 'Zend/Auth/Result.php';

/** @see Zend_Xml_Security */
// require_once 'Zend/Xml/Security.php';

/**
* This class implements authentication against XML file with roles for Flex Builder.
*
* @package Zend_Amf
* @subpackage Adobe
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract
Expand Down Expand Up @@ -61,7 +64,7 @@ class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract
public function __construct($rolefile)
{
$this->_acl = new Zend_Acl();
$xml = simplexml_load_file($rolefile);
$xml = Zend_Xml_Security::scanFile($rolefile);
/*
Roles file format:
<roles>
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Amf/Adobe/DbInspector.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: DbInspector.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/

/**
* This class implements authentication against XML file with roles for Flex Builder.
*
* @package Zend_Amf
* @subpackage Adobe
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Adobe_DbInspector
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Amf/Adobe/Introspector.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Introspector.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/

/** @see Zend_Amf_Parse_TypeLoader */
Expand All @@ -33,7 +33,7 @@
*
* @package Zend_Amf
* @subpackage Adobe
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Adobe_Introspector
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Amf/Auth/Abstract.php
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Abstract.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/

/** @see Zend_Auth_Adapter_Interface */
Expand All @@ -27,7 +27,7 @@
*
* @package Zend_Amf
* @subpackage Auth
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Amf/Constants.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Constants.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/

/**
* The following constants are used throughout serialization and
* deserialization to detect the AMF marker and encoding types.
*
* @package Zend_Amf
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
final class Zend_Amf_Constants
Expand Down
6 changes: 3 additions & 3 deletions library/Zend/Amf/Exception.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*
* @category Zend
* @package Zend_Amf
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Exception.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/

/**
Expand All @@ -26,7 +26,7 @@

/**
* @package Zend_Amf
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Exception extends Zend_Exception
Expand Down
11 changes: 7 additions & 4 deletions library/Zend/Amf/Parse/Amf0/Deserializer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse_Amf0
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Deserializer.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/

/** Zend_Amf_Constants */
// require_once 'Zend/Amf/Constants.php';

/** Zend_Xml_Security */
// require_once 'Zend/Xml/Security.php';

/** @see Zend_Amf_Parse_Deserializer */
// require_once 'Zend/Amf/Parse/Deserializer.php';

Expand All @@ -33,7 +36,7 @@
* @todo Class could be implemented as Factory Class with each data type it's own class
* @package Zend_Amf
* @subpackage Parse_Amf0
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer
Expand Down Expand Up @@ -248,7 +251,7 @@ public function readDate()
public function readXmlString()
{
$string = $this->_stream->readLongUTF();
return simplexml_load_string($string);
return Zend_Xml_Security::scan($string); //simplexml_load_string($string);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions library/Zend/Amf/Parse/Amf0/Serializer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* @category Zend
* @package Zend_Amf
* @subpackage Parse_Amf0
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Serializer.php 24594 2012-01-05 21:27:01Z matthew $
* @version $Id$
*/

/** Zend_Amf_Constants */
Expand All @@ -32,7 +32,7 @@
* @uses Zend_Amf_Parse_Serializer
* @package Zend_Amf
* @subpackage Parse_Amf0
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer
Expand Down Expand Up @@ -127,7 +127,7 @@ public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false)
case (is_bool($data)):
$markerType = Zend_Amf_Constants::AMF0_BOOLEAN;
break;
case (is_string($data) && (strlen($data) > 65536)):
case (is_string($data) && (($this->_mbStringFunctionsOverloaded ? mb_strlen($data, '8bit') : strlen($data)) > 65536)):
$markerType = Zend_Amf_Constants::AMF0_LONGSTRING;
break;
case (is_string($data)):
Expand Down
Loading

0 comments on commit f1a0c26

Please sign in to comment.