Remove files from lib/Zend that exist in Magentos core/Zend

app/code/core/Zend/Controller/Request/Http.php

@@ -20,10 +20,8 @@
  */
 
 /** @see Zend_Controller_Request_Abstract */
-#require_once 'Zend/Controller/Request/Abstract.php';
 
 /** @see Zend_Uri */
-#require_once 'Zend/Uri.php';
 
 /**
  * Zend_Controller_Request_Http
@@ -541,6 +539,7 @@ public function setBaseUrl($baseUrl = null)
      * Everything in REQUEST_URI before PATH_INFO
      * <form action="<?=$baseUrl?>/news/submit" method="POST"/>
      *
+     * @param bool $raw
      * @return string
      */
     public function getBaseUrl($raw = false)
@@ -664,7 +663,7 @@ public function getPathInfo()
      *
      * Can be empty array, or contain one or more of '_GET' or '_POST'.
      *
-     * @param  array $paramSoures
+     * @param array $paramSources
      * @return $this
      */
     public function setParamSources(array $paramSources = array())

app/code/core/Zend/Date.php

@@ -22,10 +22,6 @@
 /**
  * Include needed Date classes
  */
-#require_once 'Zend/Date/DateObject.php';
-#require_once 'Zend/Locale.php';
-#require_once 'Zend/Locale/Format.php';
-#require_once 'Zend/Locale/Math.php';
 
 /**
  * This class replaces default Zend_Date because of problem described in Jira ticket MAGE-4872
@@ -140,11 +136,10 @@ class Zend_Date extends Zend_Date_DateObject
      * For example, in your bootstrap: date_default_timezone_set('America/Los_Angeles');
      * For detailed instructions please look in the docu.
      *
-     * @param  string|integer|Zend_Date|array  $date    OPTIONAL Date value or value of date part to set
+     * @param string|integer|Zend_Date|array $date OPTIONAL Date value or value of date part to set
      *                                                 ,depending on $part. If null the actual time is set
-     * @param  string                          $part    OPTIONAL Defines the input format of $date
-     * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-     * @return $this
+     * @param string $part OPTIONAL Defines the input format of $date
+     * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input
      * @throws Zend_Date_Exception
      */
     public function __construct($date = null, $part = null, $locale = null)
@@ -244,9 +239,9 @@ public function __construct($date = null, $part = null, $locale = null)
     /**
      * Sets class wide options, if no option was given, the actual set options will be returned
      *
-     * @param  array  $options  Options to set
+     * @param array $options Options to set
+     * @return array array if no option was given
      * @throws Zend_Date_Exception
-     * @return Options array if no option was given
      */
     public static function setOptions(array $options = array())
     {

app/code/core/Zend/Db/Select.php

@@ -20,17 +20,13 @@
  * @version    $Id$
  */
 
-
 /**
  * @see Zend_Db_Adapter_Abstract
  */
-#require_once 'Zend/Db/Adapter/Abstract.php';
 
 /**
  * @see Zend_Db_Expr
  */
-#require_once 'Zend/Db/Expr.php';
-
 
 /**
  * Class for SQL SELECT generation and results.
@@ -41,8 +37,6 @@
  * @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 Zend_Db_Select
 {
 
@@ -290,8 +284,10 @@ public function columns($cols = '*', $correlationName = null)
      *      ->order("id");
      * </code>
      *
-     * @param  array $select Array of select clauses for the union.
+     * @param array $select Array of select clauses for the union.
+     * @param string $type
      * @return $this This Zend_Db_Select object.
+     * @throws Zend_Db_Select_Exception
      */
     public function union($select = array(), $type = self::SQL_UNION)
     {
@@ -906,7 +902,13 @@ protected function _join($type, $name, $cond, $cols, $schema = null)
      * * joinRightUsing
      * * joinLeftUsing
      *
+     * @param  null|string $type
+     * @param  array|string|Zend_Db_Expr $name
+     * @param  string $cond
+     * @param  array|string $cols
+     * @param  string|null $schema
      * @return $this This Zend_Db_Select object.
+     * @throws Zend_Db_Select_Exception
      */
     public function _joinUsing($type, $name, $cond, $cols = '*', $schema = null)
     {
@@ -954,10 +956,10 @@ private function _uniqueCorrelation($name)
     /**
      * Adds to the internal table-to-column mapping array.
      *
-     * @param  string $tbl The table/join the columns come from.
-     * @param  array|string $cols The list of columns; preferably as
+     * @param string $correlationName The table/join the columns come from.
+     * @param array|string $cols The list of columns; preferably as
      * an array, but possibly as a string containing one column.
-     * @param  bool|string True if it should be prepended, a correlation name if it should be inserted
+     * @param string|null $afterCorrelationName True if it should be prepended, a correlation name if it should be inserted
      * @return void
      */
     protected function _tableCols($correlationName, $cols, $afterCorrelationName = null)

app/code/core/Zend/Db/Statement.php

@@ -23,12 +23,10 @@
 /**
  * @see Zend_Db
  */
-#require_once 'Zend/Db.php';
 
 /**
  * @see Zend_Db_Statement_Interface
  */
-#require_once 'Zend/Db/Statement/Interface.php';
 
 /**
  * Abstract class to emulate a PDOStatement for native database adapters.
@@ -121,6 +119,7 @@ public function __construct($adapter, $sql)
      * Internal method called by abstract statment constructor to setup
      * the driver level statement
      *
+     * @param string $sql
      * @return void
      */
     protected function _prepare($sql)
@@ -394,8 +393,8 @@ public function getAttribute($key)
      * Set a statement attribute.
      *
      * @param string $key Attribute name.
-     * @param mixed  $val Attribute value.
-     * @return bool
+     * @param mixed $val Attribute value.
+     * @return void
      */
     public function setAttribute($key, $val)
     {
@@ -405,8 +404,8 @@ public function setAttribute($key, $val)
     /**
      * Set the default fetch mode for this statement.
      *
-     * @param int   $mode The fetch mode.
-     * @return bool
+     * @param int $mode The fetch mode.
+     * @return void
      * @throws Zend_Db_Statement_Exception
      */
     public function setFetchMode($mode)

app/code/core/Zend/Filter/PregReplace.php

@@ -26,7 +26,6 @@
  *
  * @see Zend_Filter_Interface
  */
-#require_once 'Zend/Filter/Interface.php';
 
 /**
  * @category   Zend
@@ -72,7 +71,7 @@ static public function isUnicodeSupportEnabled()
     /**
      * Method to cache the regex needed to determine if unicode support is available
      *
-     * @return bool
+     * @return void
      */
     static protected function _determineUnicodeSupport()
     {

app/code/core/Zend/Form/Decorator/Form.php

@@ -20,7 +20,6 @@
  */
 
 /** Zend_Form_Decorator_Abstract */
-#require_once 'Zend/Form/Decorator/Abstract.php';
 
 /**
  * This class replaces default Zend_Form_Decorator_Form because of problem described in MPERF-9707/MPERF-9769

app/code/core/Zend/Locale/Math/PhpMath.php

@@ -19,7 +19,6 @@
  * @version    $Id$
  */
 
-
 /**
  * This class replaces default Zend_Locale_Math_PhpMath because of issues described in MPERF-10261 and MPERF-10262
  * The only difference between current class and original one is overwritten implementation of Sub method
@@ -56,7 +55,13 @@ public static function disable()
     public static $defaultScale;
     public static $defaultPrecision;
 
-
+    /**
+     * @param string $op1
+     * @param string $op2
+     * @param string|null $scale
+     * @return false|string
+     * @throws Zend_Locale_Math_Exception
+     */
     public static function Add($op1, $op2, $scale = null)
     {
         if ($scale === null) {
@@ -80,6 +85,13 @@ public static function Add($op1, $op2, $scale = null)
         return self::round(self::normalize($result), $scale);
     }
 
+    /**
+     * @param string $op1
+     * @param string $op2
+     * @param string|null $scale
+     * @return false|string
+     * @throws Zend_Locale_Math_Exception
+     */
     public static function Sub($op1, $op2, $scale = null)
     {
         if ($scale === null) {
@@ -106,6 +118,13 @@ public static function Sub($op1, $op2, $scale = null)
         return self::round(self::normalize($result), $scale);
     }
 
+    /**
+     * @param string $op1
+     * @param string $op2
+     * @param string|null $scale
+     * @return false|string
+     * @throws Zend_Locale_Math_Exception
+     */
     public static function Pow($op1, $op2, $scale = null)
     {
         if ($scale === null) {
@@ -128,6 +147,13 @@ public static function Pow($op1, $op2, $scale = null)
         return self::round(self::normalize($result), $scale);
     }
 
+    /**
+     * @param string $op1
+     * @param string $op2
+     * @param string|null $scale
+     * @return false|string
+     * @throws Zend_Locale_Math_Exception
+     */
     public static function Mul($op1, $op2, $scale = null)
     {
         if ($scale === null) {
@@ -148,6 +174,13 @@ public static function Mul($op1, $op2, $scale = null)
         return self::round(self::normalize($result), $scale);
     }
 
+    /**
+     * @param string $op1
+     * @param string $op2
+     * @param string|null $scale
+     * @return false|string
+     * @throws Zend_Locale_Math_Exception
+     */
     public static function Div($op1, $op2, $scale = null)
     {
         if ($scale === null) {
@@ -172,6 +205,11 @@ public static function Div($op1, $op2, $scale = null)
         return self::round(self::normalize($result), $scale);
     }
 
+    /**
+     * @param string $op1
+     * @param string|null $scale
+     * @return false|string|null
+     */
     public static function Sqrt($op1, $scale = null)
     {
         if ($scale === null) {
@@ -190,6 +228,12 @@ public static function Sqrt($op1, $scale = null)
         return self::round(self::normalize($result), $scale);
     }
 
+    /**
+     * @param string $op1
+     * @param string $op2
+     * @return string|null
+     * @throws Zend_Locale_Math_Exception
+     */
     public static function Mod($op1, $op2)
     {
         if (empty($op1)) {
@@ -213,6 +257,12 @@ public static function Mod($op1, $op2)
         return self::normalize($result);
     }
 
+    /**
+     * @param string $op1
+     * @param string $op2
+     * @param string|null $scale
+     * @return int|string
+     */
     public static function Comp($op1, $op2, $scale = null)
     {
         if ($scale === null) {
@@ -239,6 +289,11 @@ public static function Comp($op1, $op2, $scale = null)
         return 0;
     }
 
+    /**
+     * @param string $scale
+     * @return bool
+     * @throws Zend_Locale_Math_Exception
+     */
     public static function Scale($scale)
     {
         if ($scale > 9) {

app/code/core/Zend/Mime.php

@@ -19,7 +19,6 @@
  * @version    $Id: Mime.php 16541 2009-07-07 06:59:03Z bkarwin $
  */
 
-
 /**
  * Support class for MultiPart Mime Messages
  *
@@ -119,7 +118,7 @@ public static function isPrintable($str)
      *
      * @param string $str
      * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
+     * @param string $lineEnd Defaults to {@link LINEEND}
      * @return string
      */
     public static function encodeQuotedPrintable($str,
@@ -180,7 +179,7 @@ private static function _encodeQuotedPrintable($str)
      * @param string $str
      * @param string $charset
      * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
+     * @param string $lineEnd Defaults to {@link LINEEND}
      * @return string
      */
     public static function encodeQuotedPrintableHeader($str, $charset,
@@ -253,7 +252,7 @@ private static function getNextQuotedPrintableToken($str)
      * @param string $str
      * @param string $charset
      * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
+     * @param string $lineEnd Defaults to {@link LINEEND}
      * @return string
      */
     public static function encodeBase64Header($str,
@@ -277,7 +276,7 @@ public static function encodeBase64Header($str,
      *
      * @param string $str
      * @param int $lineLength Defaults to {@link LINELENGTH}
-     * @param int $lineEnd Defaults to {@link LINEEND}
+     * @param string $lineEnd Defaults to {@link LINEEND}
      * @return string
      */
     public static function encodeBase64($str,
@@ -356,6 +355,7 @@ public function boundaryLine($EOL = self::LINEEND)
      * Return MIME ending
      *
      * @access public
+     * @param string $EOL
      * @return string
      */
     public function mimeEnd($EOL = self::LINEEND)

app/code/core/Zend/Serializer/Adapter/PhpCode.php

@@ -20,7 +20,6 @@
  * @version    $Id$
  */
 /** @see Zend_Serializer_Adapter_AdapterAbstract */
-#require_once 'Zend/Serializer/Adapter/AdapterAbstract.php';
 
 /**
  * This class replaces default Zend_Serializer_Adapter_PhpCode because of problem described in MPERF-9450