scores/odea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update Zend Framework to version 1.12.11

Browse Source
This commit is contained in:
Michael RICOIS 2015-04-08 11:51:16 +00:00
parent 6553dd8d78
commit 2247249b35
13 changed files with 59 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/classmap_generator.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Loader
* @subpackage Exception
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -192,7 +192,7 @@ if ($appending) {
$content = var_export((array) $map, true) . ';';
// Prefix with dirname(__FILE__); modify the generated content
$content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '", $content);
$content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '/", $content);
// Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
$content = str_replace("\\'", "'", $content);
@ -215,7 +215,7 @@ if ($appending) {
. 'return ' . var_export((array) $map, true) . ';';
// Prefix with dirname(__FILE__); modify the generated content
$content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '", $content);
$content = preg_replace("#(=> ')#", "=> dirname(__FILE__) . '/", $content);
// Fix \' strings from injected DIRECTORY_SEPARATOR usage in iterator_apply op
$content = str_replace("\\'", "'", $content);

2
bin/zf.bat
View File

@ -12,7 +12,7 @@ REM obtain it through the world-wide-web, please send an email
REM to license@zend.com so we can send you a copy immediately.
REM
REM Zend
REM Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
REM Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
REM http://framework.zend.com/license/new-bsd New BSD License

4
bin/zf.php
View File

@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Tool
* @subpackage Framework
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
@ -26,7 +26,7 @@
* @category Zend
* @package Zend_Tool
* @subpackage Framework
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class ZF

2
bin/zf.sh
View File

@ -14,7 +14,7 @@
# to license@zend.com so we can send you a copy immediately.
#
# Zend
# Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
# Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
# http://framework.zend.com/license/new-bsd New BSD License
#############################################################################

9
library/Zend/Controller/Action/Helper/ViewRenderer.php
View File

@ -842,11 +842,12 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_
$request = $this->getRequest();
$dispatcher = $this->getFrontController()->getDispatcher();
$module = $dispatcher->formatModuleName($request->getModuleName());
$controller = substr(
$dispatcher->formatControllerName($request->getControllerName()),
0,
-10
$controller = $dispatcher->formatControllerName(
$request->getControllerName()
);
if ('Controller' == substr($controller, -10)) {
$controller = substr($controller, 0, -10);
}
$action = $dispatcher->formatActionName($request->getActionName());
$params = compact('module', 'controller', 'action');

8
library/Zend/Translate.php
View File

@ -63,7 +63,9 @@ class Zend_Translate {
/**
* Generates the standard translation object
*
* @param array|Zend_Config $options Options to use
* @param array|Zend_Config|Zend_Translate_Adapter $options Options to use
* @param string|array [$content] Path to content, or content itself
* @param string|Zend_Locale [$locale]
* @throws Zend_Translate_Exception
*/
public function __construct($options = array())
@ -96,7 +98,9 @@ class Zend_Translate {
/**
* Sets a new adapter
*
* @param array|Zend_Config $options Options to use
* @param array|Zend_Config|Zend_Translate_Adapter $options Options to use
* @param string|array [$content] Path to content, or content itself
* @param string|Zend_Locale [$locale]
* @throws Zend_Translate_Exception
*/
public function setAdapter($options = array())

4
library/Zend/Translate/Adapter.php
View File

@ -119,7 +119,9 @@ abstract class Zend_Translate_Adapter {
/**
* Generates the adapter
*
* @param array|Zend_Config $options Translation options for this adapter
* @param string|array|Zend_Config $options Translation options for this adapter
* @param string|array [$content]
* @param string|Zend_Locale [$locale]
* @throws Zend_Translate_Exception
* @return void
*/

2
library/Zend/Version.php
View File

@ -32,7 +32,7 @@ final class Zend_Version
/**
* Zend Framework version identification - see compareVersion()
*/
const VERSION = '1.12.10';
const VERSION = '1.12.11';
/**
* The latest stable version Zend Framework available

8
library/Zend/View/Helper/HeadLink.php
View File

@ -32,6 +32,14 @@ require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
* @subpackage Helper
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @method $this appendAlternate($href, $type, $title, $extras)
* @method $this appendStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array())
* @method $this offsetSetAlternate($index, $href, $type, $title, $extras)
* @method $this offsetSetStylesheet($index, $href, $media = 'screen', $conditionalStylesheet = false, array $extras = array())
* @method $this prependAlternate($href, $type, $title, $extras)
* @method $this prependStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array())
* @method $this setAlternate($href, $type, $title, $extras)
* @method $this setStylesheet($href, $media = 'screen', $conditionalStylesheet = false, array $extras = array())
*/
class Zend_View_Helper_HeadLink extends Zend_View_Helper_Placeholder_Container_Standalone
{

13
library/Zend/View/Helper/HeadMeta.php
View File

@ -32,6 +32,19 @@ require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
* @subpackage Helper
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @method $this appendHttpEquiv($keyValue, $content, $conditionalHttpEquiv)
* @method $this appendName($keyValue, $content, $conditionalName)
* @method $this appendProperty($property, $content, $modifiers)
* @method $this offsetSetHttpEquiv($index, $keyValue, $content, $conditionalHttpEquiv)
* @method $this offsetSetName($index, $keyValue, $content, $conditionalName)
* @method $this offsetSetProperty($index, $property, $content, $modifiers)
* @method $this prependHttpEquiv($keyValue, $content, $conditionalHttpEquiv)
* @method $this prependName($keyValue, $content, $conditionalName)
* @method $this prependProperty($property, $content, $modifiers)
* @method $this setCharset($charset)
* @method $this setHttpEquiv($keyValue, $content, $modifiers)
* @method $this setName($keyValue, $content, $modifiers)
* @method $this setProperty($property, $content, $modifiers)
*/
class Zend_View_Helper_HeadMeta extends Zend_View_Helper_Placeholder_Container_Standalone
{

8
library/Zend/View/Helper/HeadScript.php
View File

@ -31,6 +31,14 @@ require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
* @subpackage Helper
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @method $this appendFile($src, $type = 'text/javascript', array $attrs = array())
* @method $this appendScript($script, $type = 'text/javascript', array $attrs = array())
* @method $this offsetSetFile($index, $src, $type = 'text/javascript', array $attrs = array())
* @method $this offsetSetScript($index, $script, $type = 'text/javascript', array $attrs = array())
* @method $this prependFile($src, $type = 'text/javascript', array $attrs = array())
* @method $this prependScript($script, $type = 'text/javascript', array $attrs = array())
* @method $this setFile($src, $type = 'text/javascript', array $attrs = array())
* @method $this setScript($script, $type = 'text/javascript', array $attrs = array())
*/
class Zend_View_Helper_HeadScript extends Zend_View_Helper_Placeholder_Container_Standalone
{

4
library/Zend/View/Helper/HeadStyle.php
View File

@ -31,6 +31,10 @@ require_once 'Zend/View/Helper/Placeholder/Container/Standalone.php';
* @subpackage Helper
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @method $this appendStyle($content, array $attributes = array())
* @method $this offsetSetStyle($index, $content, array $attributes = array())
* @method $this prependStyle($content, array $attributes = array())
* @method $this setStyle($content, array $attributes = array())
*/
class Zend_View_Helper_HeadStyle extends Zend_View_Helper_Placeholder_Container_Standalone
{

4
library/Zend/View/Helper/Navigation.php
View File

@ -33,6 +33,10 @@ require_once 'Zend/View/Helper/Navigation/HelperAbstract.php';
* @subpackage Helper
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @method Zend_View_Helper_Navigation_Breadcrumbs breadcrumbs
* @method Zend_View_Helper_Navigation_Links links
* @method Zend_View_Helper_Navigation_Menu menu
* @method Zend_View_Helper_Navigation_Sitemap sitemap
*/
class Zend_View_Helper_Navigation
extends Zend_View_Helper_Navigation_HelperAbstract