Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit d8b4f54

Browse files
author
Maxim Shikula
committed
MAGETWO-37714: Update ZendFramework to 1.12.13
1 parent d8e95de commit d8b4f54

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

library/Zend/Console/Getopt.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ public function checkRequiredArguments()
743743
$defined = $defined === true ? true : array_key_exists($alias, $this->_options);
744744
}
745745
if ($defined === false) {
746-
require_once 'Zend/Console/Getopt/Exception.php';
746+
#require_once 'Zend/Console/Getopt/Exception.php';
747747
throw new Zend_Console_Getopt_Exception(
748748
'Option "$alias" requires a parameter.',
749749
$this->getUsageMessage()

library/Zend/Controller/Action/Helper/ViewRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ protected function _translateSpec(array $vars = array())
846846
$module = $dispatcher->formatModuleName($request->getModuleName());
847847

848848
// Format controller name
849-
require_once 'Zend/Filter/Word/CamelCaseToDash.php';
849+
#require_once 'Zend/Filter/Word/CamelCaseToDash.php';
850850
$filter = new Zend_Filter_Word_CamelCaseToDash();
851851
$controller = $filter->filter($request->getControllerName());
852852
$controller = $dispatcher->formatControllerName($controller);

library/Zend/Http/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1598,7 +1598,7 @@ protected function _validateHeaderValue($value, $recurse = true)
15981598
}
15991599

16001600
if (! is_string($value) && (! is_object($value) || ! method_exists($value, '__toString'))) {
1601-
require_once 'Zend/Http/Exception.php';
1601+
#require_once 'Zend/Http/Exception.php';
16021602
throw new Zend_Http_Exception('Invalid header value detected');
16031603
}
16041604

library/Zend/Http/Header/HeaderValue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static function isValid($value)
120120
public static function assertValid($value)
121121
{
122122
if (! self::isValid($value)) {
123-
require_once 'Zend/Http/Header/Exception/InvalidArgumentException.php';
123+
#require_once 'Zend/Http/Header/Exception/InvalidArgumentException.php';
124124
throw new Zend_Http_Header_Exception_InvalidArgumentException('Invalid header value');
125125
}
126126
}

library/Zend/Http/Header/SetCookie.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/**
3535
* @see Zend_Http_Header_HeaderValue
3636
*/
37-
require_once "Zend/Http/Header/HeaderValue.php";
37+
#require_once "Zend/Http/Header/HeaderValue.php";
3838

3939
/**
4040
* Zend_Http_Client is an implementation of an HTTP client in PHP. The client

library/Zend/Http/Response.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* @see Zend_Http_Header_HeaderValue
2626
*/
27-
require_once 'Zend/Http/Header/HeaderValue.php';
27+
#require_once 'Zend/Http/Header/HeaderValue.php';
2828

2929
/**
3030
* Zend_Http_Response represents an HTTP 1.0 / 1.1 response message. It
@@ -568,7 +568,7 @@ public static function extractHeaders($response_str)
568568
}
569569

570570
// Anything else is an error condition
571-
require_once 'Zend/Http/Exception.php';
571+
#require_once 'Zend/Http/Exception.php';
572572
throw new Zend_Http_Exception('Invalid header line detected');
573573
}
574574

library/Zend/Mail/Header/HeaderName.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static function isValid($name)
8585
public static function assertValid($name)
8686
{
8787
if (! self::isValid($name)) {
88-
require_once 'Zend/Mail/Exception.php';
88+
#require_once 'Zend/Mail/Exception.php';
8989
throw new Zend_Mail_Exception('Invalid header name detected');
9090
}
9191
}

library/Zend/Mail/Header/HeaderValue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public static function isValid($value)
129129
public static function assertValid($value)
130130
{
131131
if (! self::isValid($value)) {
132-
require_once 'Zend/Mail/Exception.php';
132+
#require_once 'Zend/Mail/Exception.php';
133133
throw new Zend_Mail_Exception('Invalid header value detected');
134134
}
135135
}

library/Zend/Mail/Part.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
/**
2929
* @see Zend_Mail_Header_HeaderName
3030
*/
31-
require_once 'Zend/Mail/Header/HeaderName.php';
31+
#require_once 'Zend/Mail/Header/HeaderName.php';
3232

3333
/**
3434
* @see Zend_Mail_Header_HeaderValue
3535
*/
36-
require_once 'Zend/Mail/Header/HeaderValue.php';
36+
#require_once 'Zend/Mail/Header/HeaderValue.php';
3737

3838
/**
3939
* @see Zend_Mail_Part_Interface

library/Zend/Session/Validator/Exception.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* @see Zend_Session_Exception
2626
*/
27-
require_once 'Zend/Session/Exception.php';
27+
#require_once 'Zend/Session/Exception.php';
2828

2929

3030
/**

0 commit comments

Comments
 (0)