diff -Nru zend-framework-1.10.2/debian/changelog zend-framework-1.10.3/debian/changelog --- zend-framework-1.10.2/debian/changelog 2010-04-07 03:36:20.000000000 +0100 +++ zend-framework-1.10.3/debian/changelog 2010-04-07 03:36:22.000000000 +0100 @@ -1,12 +1,21 @@ -zend-framework (1.10.2-0ubuntu1~intrepid1) intrepid; urgency=low +zend-framework (1.10.3-0ubuntu1~intrepid1) intrepid; urgency=low [ Stephan Hermann ] + * New bugfix release + A complete list of bugfixes you can find here: + http://framework.zend.com/changelog/1.10.3 + * No FFE needed + + -- Micah Gersten Tue, 06 Apr 2010 21:26:23 -0500 + +zend-framework (1.10.2-0ubuntu1) lucid; urgency=low + * New Bugfix release A complete list of changes you can find here http://framework.zend.com/changelog/1.10.2 * No FFE needed, because of bugfix only release - -- Micah Gersten Tue, 02 Mar 2010 20:57:40 -0600 + -- Stephan Hermann Tue, 02 Mar 2010 09:30:44 +0000 zend-framework (1.10.1-0ubuntu1) lucid; urgency=low diff -Nru zend-framework-1.10.2/demos/Zend/Wildfire/application/views/scripts/index/index.phtml zend-framework-1.10.3/demos/Zend/Wildfire/application/views/scripts/index/index.phtml --- zend-framework-1.10.2/demos/Zend/Wildfire/application/views/scripts/index/index.phtml 2008-10-01 12:02:35.000000000 +0100 +++ zend-framework-1.10.3/demos/Zend/Wildfire/application/views/scripts/index/index.phtml 2010-03-06 02:21:47.000000000 +0000 @@ -30,7 +30,7 @@

Zend_Wildfire_Plugin_FirePhp


diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/classtrees_default.html zend-framework-1.10.3/extras/documentation/api/extras/classtrees_default.html --- zend-framework-1.10.2/extras/documentation/api/extras/classtrees_default.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/classtrees_default.html 2010-03-31 21:02:41.000000000 +0100 @@ -13,7 +13,7 @@

- Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

\ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/classtrees_Zend_Application.html zend-framework-1.10.3/extras/documentation/api/extras/classtrees_Zend_Application.html --- zend-framework-1.10.2/extras/documentation/api/extras/classtrees_Zend_Application.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/classtrees_Zend_Application.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ - - - - - - - - - - - -

- -

-

- Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 -

- - \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_Application.html zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_Application.html --- zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_Application.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_Application.html 2010-03-31 21:02:41.000000000 +0100 @@ -17,7 +17,7 @@
  • ZendX_Application_Resource_Jquery

    • - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_Console.html zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_Console.html --- zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_Console.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_Console.html 2010-03-31 21:02:41.000000000 +0100 @@ -23,7 +23,7 @@
  • ZendX_Console_Process_Unix

    • - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_Db.html zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_Db.html --- zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_Db.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_Db.html 2010-03-31 21:02:41.000000000 +0100 @@ -29,7 +29,7 @@
  • ZendX_Db_Statement_Firebird_Exception

    • - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX.html zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX.html --- zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX.html 2010-03-31 21:02:41.000000000 +0100 @@ -21,7 +21,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_JQuery.html zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_JQuery.html --- zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_JQuery.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_JQuery.html 2010-03-31 21:02:41.000000000 +0100 @@ -69,7 +69,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_Whois.html zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_Whois.html --- zend-framework-1.10.2/extras/documentation/api/extras/classtrees_ZendX_Whois.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/classtrees_ZendX_Whois.html 2010-03-31 21:02:41.000000000 +0100 @@ -13,7 +13,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/default/_JQuery---Form---Exception.php.html zend-framework-1.10.3/extras/documentation/api/extras/default/_JQuery---Form---Exception.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/default/_JQuery---Form---Exception.php.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/default/_JQuery---Form---Exception.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -164,7 +164,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex_default.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex_default.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex_default.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex_default.html 2010-03-31 21:02:41.000000000 +0100 @@ -16,7 +16,6 @@
  • ZendX_Console
  • ZendX_Whois
  • ZendX
    • -
  • Zend_Application
  • ZendX_Application
    • All elements diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex.html 2010-03-31 21:02:41.000000000 +0100 @@ -17,7 +17,6 @@
  • ZendX_Console
  • ZendX_Whois
  • ZendX
    • -
  • Zend_Application
  • ZendX_Application

    • @@ -1008,7 +1007,7 @@ Jquery.php
    -
    Jquery.php in Jquery.php
    +
    Jquery.php in Jquery.php
    Method @@ -1760,7 +1759,7 @@
    ZendX_Application_Resource_Jquery in Jquery.php
    -
    Cache Manager resource
    +
    JQuery application resource
    Class diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex_Zend_Application.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex_Zend_Application.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex_Zend_Application.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex_Zend_Application.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ - - - - - - - - - - -

    [Zend_Application] element index

    -

    Package indexes

    - -All elements -
    -
    - j -
    - - -
    -
    j
    - -
    -
    -
    -
    - Page - Jquery.php -
    -
    -
    Jquery.php in Jquery.php
    -
    -
    - -
    - j -
    - \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_Application.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_Application.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_Application.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_Application.html 2010-03-31 21:02:41.000000000 +0100 @@ -17,13 +17,13 @@
  • ZendX_Console
  • ZendX_Whois
  • ZendX
    • -
  • Zend_Application
    • All elements
    g i + j z _
    @@ -90,6 +90,21 @@
    Defined by Zend_Application_Resource_Resource
    + +
    +
    j
    + +
    +
    +
    +
    + Page + Jquery.php +
    +
    +
    Jquery.php in Jquery.php
    +
    +
    z
    @@ -103,13 +118,14 @@
    ZendX_Application_Resource_Jquery in Jquery.php
    -
    Cache Manager resource
    +
    JQuery application resource
    g i + j z _
    diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_Console.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_Console.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_Console.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_Console.html 2010-03-31 21:02:41.000000000 +0100 @@ -16,7 +16,6 @@
  • ZendX_JQuery
  • ZendX_Whois
  • ZendX
    • -
  • Zend_Application
  • ZendX_Application
    • All elements diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_Db.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_Db.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_Db.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_Db.html 2010-03-31 21:02:41.000000000 +0100 @@ -16,7 +16,6 @@
  • ZendX_Console
  • ZendX_Whois
  • ZendX
    • -
  • Zend_Application
  • ZendX_Application
    • All elements diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX.html 2010-03-31 21:02:41.000000000 +0100 @@ -16,8 +16,7 @@
  • ZendX_JQuery
  • ZendX_Console
  • ZendX_Whois
    • -
  • Zend_Application
    • -
  • ZendX_Application
    • +
  • ZendX_Application
    • All elements
    diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_JQuery.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_JQuery.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_JQuery.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_JQuery.html 2010-03-31 21:02:41.000000000 +0100 @@ -16,7 +16,6 @@
  • ZendX_Console
  • ZendX_Whois
  • ZendX
    • -
  • Zend_Application
  • ZendX_Application
    • All elements diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_Whois.html zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_Whois.html --- zend-framework-1.10.2/extras/documentation/api/extras/elementindex_ZendX_Whois.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/elementindex_ZendX_Whois.html 2010-03-31 21:02:41.000000000 +0100 @@ -16,7 +16,6 @@
  • ZendX_JQuery
  • ZendX_Console
  • ZendX
    • -
  • Zend_Application
  • ZendX_Application
    • All elements diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/errors.html zend-framework-1.10.3/extras/documentation/api/extras/errors.html --- zend-framework-1.10.2/extras/documentation/api/extras/errors.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/errors.html 2010-03-31 21:02:47.000000000 +0100 @@ -12,7 +12,6 @@ Exception.php
    Firebird.php
    Form.php
    -Jquery.php
    JQuery.php
    TabPane.php
    UiWidget.php
    @@ -24,20 +23,20 @@

    Warnings:


    Warning - Class ZendX_Exception parent Zend_Exception not found
    Warning - Class ZendX_JQuery_Exception parent Zend_Exception not found
    -Warning - Class ZendX_JQuery_Form_Element_UiWidget parent Zend_Form_Element not found
    -Warning - Class ZendX_JQuery_Form parent Zend_Form not found
    -Warning - Class ZendX_JQuery_Form_Decorator_UiWidgetContainer parent Zend_Form_Decorator_Abstract not found
    Warning - Class ZendX_JQuery_Form_Decorator_UiWidgetElement parent Zend_Form_Decorator_ViewHelper not found
    +Warning - Class ZendX_JQuery_Form parent Zend_Form not found
    +Warning - Class ZendX_JQuery_Form_Element_UiWidget parent Zend_Form_Element not found
    Warning - Class ZendX_JQuery_Form_Decorator_UiWidgetPane parent Zend_Form_Decorator_Abstract not found
    +Warning - Class ZendX_JQuery_Form_Decorator_UiWidgetContainer parent Zend_Form_Decorator_Abstract not found
    Warning - Class ZendX_JQuery_Controller_Action_Helper_AutoComplete parent Zend_Controller_Action_Helper_AutoComplete_Abstract not found
    Warning - Class ZendX_Application_Resource_Jquery parent Zend_Application_Resource_ResourceAbstract not found
    Warning - Class ZendX_Db_Adapter_Firebird_Exception parent Zend_Db_Adapter_Exception not found
    Warning - Class ZendX_Db_Adapter_Firebird parent Zend_Db_Adapter_Abstract not found
    Warning - Class ZendX_Db_Statement_Firebird_Exception parent Zend_Db_Statement_Exception not found
    Warning - Class ZendX_Db_Statement_Firebird parent Zend_Db_Statement not found
    -Warning - Class ZendX_JQuery_View_Helper_JQuery parent Zend_View_Helper_Abstract not found
    Warning - Class ZendX_JQuery_View_Helper_UiWidget parent Zend_View_Helper_HtmlElement not found
    Warning - Class ZendX_JQuery_View_Helper_AjaxLink parent Zend_View_Helper_HtmlElement not found
    +Warning - Class ZendX_JQuery_View_Helper_JQuery parent Zend_View_Helper_Abstract not found

    AjaxLink.php

    Warnings:


    @@ -51,7 +50,7 @@

    Exception.php

    Warnings:


    Warning on line 8 - no @package tag was used in a DocBlock for class ZendX_JQuery_Form_Exception
    -Warning on line 10 - File "/home/matthew/tmp/release-1.10.2/build-tools/stage/ZendFramework-1.10.2/extras/library/ZendX/JQuery/Form/Exception.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    +Warning on line 10 - File "/home/matthew/tmp/release-1.10.3/build-tools/stage/ZendFramework-1.10.3/extras/library/ZendX/JQuery/Form/Exception.php" has no page-level DocBlock, use @package in the first DocBlock to create one
    Warning on line 22 - Page-level DocBlock precedes "require_once "Zend/Exception.php"", use another DocBlock to document the source element
    Warning on line 22 - Page-level DocBlock precedes "require_once "ZendX/JQuery/Exception.php"", use another DocBlock to document the source element
    Warning on line 24 - package default is already in category default, will now replace with category Zend
    @@ -79,10 +78,6 @@ Warning on line 71 - Unknown tag "@const" used
    Warning on line 80 - Unknown tag "@const" used
    Warning on line 90 - Unknown tag "@const" used
    - -

    Jquery.php

    -

    Warnings:


    -Warning on line 54 - package default is already in category ZendX, will now replace with category Zend

    TabPane.php

    Warnings:


    @@ -104,7 +99,7 @@

    Warnings:


    Warning on line 22 - Page-level DocBlock precedes "require_once "Zend/Form/Decorator/Abstract.php"", use another DocBlock to document the source element

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/index.html zend-framework-1.10.3/extras/documentation/api/extras/index.html --- zend-framework-1.10.2/extras/documentation/api/extras/index.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/index.html 2010-03-31 21:02:41.000000000 +0100 @@ -4,7 +4,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> - + Zend Framework Extras API Documentation diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/li_Zend_Application.html zend-framework-1.10.3/extras/documentation/api/extras/li_Zend_Application.html --- zend-framework-1.10.2/extras/documentation/api/extras/li_Zend_Application.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/li_Zend_Application.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,149 +0,0 @@ - - - - - - - - - - - - -

    Zend_Application

    -
    - -
    -

    - Generated by - phpDocumentor 1.4.3 -

    - - \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/li_ZendX_Application.html zend-framework-1.10.3/extras/documentation/api/extras/li_ZendX_Application.html --- zend-framework-1.10.2/extras/documentation/api/extras/li_ZendX_Application.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/li_ZendX_Application.html 2010-03-31 21:02:41.000000000 +0100 @@ -134,6 +134,16 @@ subpackagetree.add(subpackagetree_classe); + var subpackagetree_file = new WebFXTreeItem('File(s)', ''); + subpackagetree_file.openIcon = 'media/images/folder.png'; + subpackagetree_file.icon = 'media/images/folder.png'; + + var file = new WebFXTreeItem('Jquery.php', 'ZendX_Application/Resource/_Application---Resource---Jquery.php.html'); + file.openIcon = 'media/images/Page.png'; + file.icon = 'media/images/Page.png'; + subpackagetree_file.add(file); + + subpackagetree.add(subpackagetree_file); tree.add(subpackagetree); diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/packages.html zend-framework-1.10.3/extras/documentation/api/extras/packages.html --- zend-framework-1.10.2/extras/documentation/api/extras/packages.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/packages.html 2010-03-31 21:02:41.000000000 +0100 @@ -28,7 +28,6 @@ - diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/todolist.html zend-framework-1.10.3/extras/documentation/api/extras/todolist.html --- zend-framework-1.10.2/extras/documentation/api/extras/todolist.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/todolist.html 2010-03-31 21:02:47.000000000 +0100 @@ -14,7 +14,7 @@
  • Offer convenience methods to add a tab or accordion container/pane combination.

    • - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/Zend_Application/Resource/_Application---Resource---Jquery.php.html zend-framework-1.10.3/extras/documentation/api/extras/Zend_Application/Resource/_Application---Resource---Jquery.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/Zend_Application/Resource/_Application---Resource---Jquery.php.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/Zend_Application/Resource/_Application---Resource---Jquery.php.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ - - - - - - Docs for page Jquery.php - - - - - -
    -

    File/Application/Resource/Jquery.php

    - - -
    -
    Description
    -
    - Description | - Classes -
    -
    - -

    Zend Framework

    -

    LICENSE

    This source file is subject to the new BSD license that is bundled with this package in the file LICENSE.txt. It is also available through the world-wide-web at this URL: http://framework.zend.com/license/new-bsd If you did not receive a copy of the license and are unable to obtain it through the world-wide-web, please send an email to license@zend.com so we can send you a copy immediately.

    -
      -
    • version: $Id$
      • -
    • copyright: Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
      • -
    • license: New BSD License
      • -
    - -
    -
    - - -
    -
    Classes
    -
    - Description | - Classes -
    -
    - - - - - - - - - -
    ClassDescription
    - class - ZendX_Application_Resource_Jquery - - Cache Manager resource -
    -
    -
    - - - - - -

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 -

    -
    - \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX/ZendX_Exception.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX/ZendX_Exception.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX/ZendX_Exception.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX/ZendX_Exception.html 2010-03-31 21:02:44.000000000 +0100 @@ -153,7 +153,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Application/Resource/_Application---Resource---Jquery.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Application/Resource/_Application---Resource---Jquery.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Application/Resource/_Application---Resource---Jquery.php.html 1970-01-01 01:00:00.000000000 +0100 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Application/Resource/_Application---Resource---Jquery.php.html 2010-03-31 21:02:45.000000000 +0100 @@ -0,0 +1,146 @@ + + + + + + Docs for page Jquery.php + + + + + +
    +

    File/Application/Resource/Jquery.php

    + + +
    +
    Description
    +
    + Description | + Classes +
    +
    + +

    Zend Framework

    +

    LICENSE

    This source file is subject to the new BSD license that is bundled with this package in the file LICENSE.txt. It is also available through the world-wide-web at this URL: http://framework.zend.com/license/new-bsd If you did not receive a copy of the license and are unable to obtain it through the world-wide-web, please send an email to license@zend.com so we can send you a copy immediately.

    +
      +
    • version: $Id: Jquery.php 20240 2010-01-13 04:51:56Z matthew $
      • +
    • copyright: Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
      • +
    • license: New BSD License
      • +
    + +
    +
    + + +
    +
    Classes
    +
    + Description | + Classes +
    +
    + + + + + + + + + +
    ClassDescription
    + class + ZendX_Application_Resource_Jquery + + JQuery application resource +
    +
    +
    + + + + + +

    + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3 +

    +
    + \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Application/Resource/ZendX_Application_Resource_Jquery.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Application/Resource/ZendX_Application_Resource_Jquery.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Application/Resource/ZendX_Application_Resource_Jquery.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Application/Resource/ZendX_Application_Resource_Jquery.html 2010-03-31 21:02:45.000000000 +0100 @@ -101,7 +101,7 @@
    -

    Cache Manager resource

    +

    JQuery application resource

    Example configuration: 

       resources.Jquery.noconflictmode = false        ; default
    resources.Jquery.version = 1.7.1               ; 
    resources.Jquery.localpath = "/foo/bar"
@@ -360,7 +360,7 @@
 
 	
 	
    
-		Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3
+		Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3
    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/_Console---Process---Exception.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/_Console---Process---Exception.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/_Console---Process---Exception.php.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/_Console---Process---Exception.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/_Console---Process---Unix.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/_Console---Process---Unix.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/_Console---Process---Unix.php.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/_Console---Process---Unix.php.html 2010-03-31 21:02:47.000000000 +0100 @@ -140,7 +140,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Exception.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Exception.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Exception.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Exception.html 2010-03-31 21:02:44.000000000 +0100 @@ -156,7 +156,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Process_Exception.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Process_Exception.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Process_Exception.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Process_Exception.html 2010-03-31 21:02:44.000000000 +0100 @@ -127,7 +127,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Process_Unix.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Process_Unix.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Process_Unix.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Console/ZendX_Console_Process_Unix.html 2010-03-31 21:02:47.000000000 +0100 @@ -663,7 +663,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Adapter/_Db---Adapter---Firebird---Exception.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Adapter/_Db---Adapter---Firebird---Exception.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Adapter/_Db---Adapter---Firebird---Exception.php.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Adapter/_Db---Adapter---Firebird---Exception.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Adapter/_Db---Adapter---Firebird.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Adapter/_Db---Adapter---Firebird.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Adapter/_Db---Adapter---Firebird.php.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Adapter/_Db---Adapter---Firebird.php.html 2010-03-31 21:02:45.000000000 +0100 @@ -225,7 +225,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Adapter/ZendX_Db_Adapter_Firebird_Exception.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Adapter/ZendX_Db_Adapter_Firebird_Exception.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Adapter/ZendX_Db_Adapter_Firebird_Exception.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Adapter/ZendX_Db_Adapter_Firebird_Exception.html 2010-03-31 21:02:44.000000000 +0100 @@ -122,7 +122,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Adapter/ZendX_Db_Adapter_Firebird.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Adapter/ZendX_Db_Adapter_Firebird.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Adapter/ZendX_Db_Adapter_Firebird.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Adapter/ZendX_Db_Adapter_Firebird.html 2010-03-31 21:02:45.000000000 +0100 @@ -1001,7 +1001,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Statement/_Db---Statement---Firebird---Exception.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Statement/_Db---Statement---Firebird---Exception.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Statement/_Db---Statement---Firebird---Exception.php.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Statement/_Db---Statement---Firebird---Exception.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Statement/_Db---Statement---Firebird.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Statement/_Db---Statement---Firebird.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Statement/_Db---Statement---Firebird.php.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Statement/_Db---Statement---Firebird.php.html 2010-03-31 21:02:45.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Statement/ZendX_Db_Statement_Firebird_Exception.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Statement/ZendX_Db_Statement_Firebird_Exception.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Statement/ZendX_Db_Statement_Firebird_Exception.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Statement/ZendX_Db_Statement_Firebird_Exception.html 2010-03-31 21:02:44.000000000 +0100 @@ -122,7 +122,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Statement/ZendX_Db_Statement_Firebird.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Statement/ZendX_Db_Statement_Firebird.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Db/Statement/ZendX_Db_Statement_Firebird.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Db/Statement/ZendX_Db_Statement_Firebird.html 2010-03-31 21:02:45.000000000 +0100 @@ -785,7 +785,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_AccordionContainer.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_AccordionContainer.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_AccordionContainer.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_AccordionContainer.html 2010-03-31 21:02:42.000000000 +0100 @@ -234,7 +234,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_AccordionPane.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_AccordionPane.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_AccordionPane.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_AccordionPane.html 2010-03-31 21:02:42.000000000 +0100 @@ -238,7 +238,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_DialogContainer.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_DialogContainer.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_DialogContainer.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_DialogContainer.html 2010-03-31 21:02:44.000000000 +0100 @@ -294,7 +294,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_TabContainer.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_TabContainer.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_TabContainer.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_TabContainer.html 2010-03-31 21:02:46.000000000 +0100 @@ -234,7 +234,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_TabPane.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_TabPane.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_TabPane.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_TabPane.html 2010-03-31 21:02:46.000000000 +0100 @@ -238,7 +238,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetContainer.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetContainer.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetContainer.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetContainer.html 2010-03-31 21:02:47.000000000 +0100 @@ -488,7 +488,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetElement.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetElement.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetElement.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetElement.html 2010-03-31 21:02:47.000000000 +0100 @@ -492,7 +492,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetPane.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetPane.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetPane.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Decorator_UiWidgetPane.html 2010-03-31 21:02:47.000000000 +0100 @@ -493,7 +493,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_AutoComplete.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_AutoComplete.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_AutoComplete.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_AutoComplete.html 2010-03-31 21:02:43.000000000 +0100 @@ -236,7 +236,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_ColorPicker.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_ColorPicker.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_ColorPicker.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_ColorPicker.html 2010-03-31 21:02:43.000000000 +0100 @@ -236,7 +236,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_DatePicker.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_DatePicker.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_DatePicker.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_DatePicker.html 2010-03-31 21:02:43.000000000 +0100 @@ -236,7 +236,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_Slider.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_Slider.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_Slider.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_Slider.html 2010-03-31 21:02:46.000000000 +0100 @@ -236,7 +236,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_Spinner.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_Spinner.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_Spinner.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_Spinner.html 2010-03-31 21:02:46.000000000 +0100 @@ -236,7 +236,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_UiWidget.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_UiWidget.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_UiWidget.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form_Element_UiWidget.html 2010-03-31 21:02:47.000000000 +0100 @@ -616,7 +616,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/Form/ZendX_JQuery_Form.html 2010-03-31 21:02:45.000000000 +0100 @@ -225,7 +225,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Controller---Action---Helper---AutoComplete.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Controller---Action---Helper---AutoComplete.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Controller---Action---Helper---AutoComplete.php.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Controller---Action---Helper---AutoComplete.php.html 2010-03-31 21:02:42.000000000 +0100 @@ -168,7 +168,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Exception.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Exception.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Exception.php.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Exception.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -168,7 +168,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---AccordionContainer.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---AccordionContainer.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---AccordionContainer.php.html 2010-02-23 23:18:42.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---AccordionContainer.php.html 2010-03-31 21:02:42.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:41 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---AccordionPane.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---AccordionPane.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---AccordionPane.php.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---AccordionPane.php.html 2010-03-31 21:02:42.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---DialogContainer.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---DialogContainer.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---DialogContainer.php.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---DialogContainer.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---TabContainer.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---TabContainer.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---TabContainer.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---TabContainer.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---TabPane.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---TabPane.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---TabPane.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---TabPane.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetContainer.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetContainer.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetContainer.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetContainer.php.html 2010-03-31 21:02:47.000000000 +0100 @@ -168,7 +168,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetElementMarker.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetElementMarker.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetElementMarker.php.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetElementMarker.php.html 2010-03-31 21:02:47.000000000 +0100 @@ -140,7 +140,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetElement.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetElement.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetElement.php.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetElement.php.html 2010-03-31 21:02:47.000000000 +0100 @@ -189,7 +189,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetPane.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetPane.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetPane.php.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Decorator---UiWidgetPane.php.html 2010-03-31 21:02:47.000000000 +0100 @@ -168,7 +168,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---AutoComplete.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---AutoComplete.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---AutoComplete.php.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---AutoComplete.php.html 2010-03-31 21:02:43.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---ColorPicker.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---ColorPicker.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---ColorPicker.php.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---ColorPicker.php.html 2010-03-31 21:02:43.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---DatePicker.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---DatePicker.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---DatePicker.php.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---DatePicker.php.html 2010-03-31 21:02:43.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---Slider.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---Slider.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---Slider.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---Slider.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---Spinner.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---Spinner.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---Spinner.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---Spinner.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---UiWidget.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---UiWidget.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---UiWidget.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form---Element---UiWidget.php.html 2010-03-31 21:02:47.000000000 +0100 @@ -168,7 +168,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form.php.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---Form.php.html 2010-03-31 21:02:45.000000000 +0100 @@ -168,7 +168,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery.php.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Exception.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Exception.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Exception.php.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Exception.php.html 2010-03-31 21:02:45.000000000 +0100 @@ -168,7 +168,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AccordionContainer.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AccordionContainer.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AccordionContainer.php.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AccordionContainer.php.html 2010-03-31 21:02:42.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AccordionPane.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AccordionPane.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AccordionPane.php.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AccordionPane.php.html 2010-03-31 21:02:42.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AjaxLink.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AjaxLink.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AjaxLink.php.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AjaxLink.php.html 2010-03-31 21:02:42.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AutoComplete.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AutoComplete.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AutoComplete.php.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---AutoComplete.php.html 2010-03-31 21:02:43.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---ColorPicker.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---ColorPicker.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---ColorPicker.php.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---ColorPicker.php.html 2010-03-31 21:02:43.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---DatePicker.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---DatePicker.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---DatePicker.php.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---DatePicker.php.html 2010-03-31 21:02:43.000000000 +0100 @@ -189,7 +189,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---DialogContainer.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---DialogContainer.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---DialogContainer.php.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---DialogContainer.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---JQuery---Container.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---JQuery---Container.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---JQuery---Container.php.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---JQuery---Container.php.html 2010-03-31 21:02:43.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---JQuery.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---JQuery.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---JQuery.php.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---JQuery.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -225,7 +225,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---Slider.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---Slider.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---Slider.php.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---Slider.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---Spinner.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---Spinner.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---Spinner.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---Spinner.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---TabContainer.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---TabContainer.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---TabContainer.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---TabContainer.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---TabPane.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---TabPane.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---TabPane.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---TabPane.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -168,7 +168,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---UiWidgetPane.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---UiWidgetPane.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---UiWidgetPane.php.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---UiWidgetPane.php.html 2010-03-31 21:02:47.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---UiWidget.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---UiWidget.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---UiWidget.php.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/_JQuery---View---Helper---UiWidget.php.html 2010-03-31 21:02:46.000000000 +0100 @@ -189,7 +189,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Controller_Action_Helper_AutoComplete.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Controller_Action_Helper_AutoComplete.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Controller_Action_Helper_AutoComplete.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Controller_Action_Helper_AutoComplete.html 2010-03-31 21:02:42.000000000 +0100 @@ -222,7 +222,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Exception.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Exception.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Exception.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Exception.html 2010-03-31 21:02:44.000000000 +0100 @@ -164,7 +164,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Form_Decorator_UiWidgetElementMarker.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Form_Decorator_UiWidgetElementMarker.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Form_Decorator_UiWidgetElementMarker.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Form_Decorator_UiWidgetElementMarker.html 2010-03-31 21:02:47.000000000 +0100 @@ -117,7 +117,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Form_Exception.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Form_Exception.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Form_Exception.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_Form_Exception.html 2010-03-31 21:02:44.000000000 +0100 @@ -123,7 +123,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery.html 2010-03-31 21:02:45.000000000 +0100 @@ -588,7 +588,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:45 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Exception.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Exception.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Exception.html 2010-02-23 23:18:45.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Exception.html 2010-03-31 21:02:44.000000000 +0100 @@ -124,7 +124,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:45 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AccordionContainer.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AccordionContainer.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AccordionContainer.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AccordionContainer.html 2010-03-31 21:02:42.000000000 +0100 @@ -462,7 +462,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:42 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AccordionPane.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AccordionPane.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AccordionPane.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AccordionPane.html 2010-03-31 21:02:42.000000000 +0100 @@ -313,7 +313,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AjaxLink.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AjaxLink.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AjaxLink.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AjaxLink.html 2010-03-31 21:02:42.000000000 +0100 @@ -241,7 +241,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AutoComplete.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AutoComplete.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AutoComplete.html 2010-02-23 23:18:43.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_AutoComplete.html 2010-03-31 21:02:43.000000000 +0100 @@ -243,7 +243,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:42 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_ColorPicker.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_ColorPicker.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_ColorPicker.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_ColorPicker.html 2010-03-31 21:02:43.000000000 +0100 @@ -241,7 +241,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:43 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_DatePicker.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_DatePicker.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_DatePicker.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_DatePicker.html 2010-03-31 21:02:43.000000000 +0100 @@ -279,7 +279,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_DialogContainer.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_DialogContainer.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_DialogContainer.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_DialogContainer.html 2010-03-31 21:02:43.000000000 +0100 @@ -240,7 +240,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_JQuery_Container.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_JQuery_Container.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_JQuery_Container.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_JQuery_Container.html 2010-03-31 21:02:43.000000000 +0100 @@ -2278,7 +2278,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:43 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_JQuery.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_JQuery.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_JQuery.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_JQuery.html 2010-03-31 21:02:46.000000000 +0100 @@ -487,7 +487,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_Slider.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_Slider.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_Slider.html 2010-02-23 23:18:46.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_Slider.html 2010-03-31 21:02:46.000000000 +0100 @@ -400,7 +400,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:46 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_Spinner.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_Spinner.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_Spinner.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_Spinner.html 2010-03-31 21:02:46.000000000 +0100 @@ -241,7 +241,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_TabContainer.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_TabContainer.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_TabContainer.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_TabContainer.html 2010-03-31 21:02:46.000000000 +0100 @@ -328,7 +328,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_TabPane.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_TabPane.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_TabPane.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_TabPane.html 2010-03-31 21:02:46.000000000 +0100 @@ -314,7 +314,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_UiWidget.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_UiWidget.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_UiWidget.html 2010-02-23 23:18:47.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_UiWidget.html 2010-03-31 21:02:46.000000000 +0100 @@ -429,7 +429,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:47 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:46 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_UiWidgetPane.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_UiWidgetPane.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_UiWidgetPane.html 2010-02-23 23:18:48.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_JQuery/View/ZendX_JQuery_View_Helper_UiWidgetPane.html 2010-03-31 21:02:47.000000000 +0100 @@ -453,7 +453,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:48 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:47 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Whois/_Console---Exception.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Whois/_Console---Exception.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Whois/_Console---Exception.php.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Whois/_Console---Exception.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Whois/_Exception.php.html zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Whois/_Exception.php.html --- zend-framework-1.10.2/extras/documentation/api/extras/ZendX_Whois/_Exception.php.html 2010-02-23 23:18:44.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/api/extras/ZendX_Whois/_Exception.php.html 2010-03-31 21:02:44.000000000 +0100 @@ -171,7 +171,7 @@

    - Documentation generated on Tue, 23 Feb 2010 18:18:44 -0500 by phpDocumentor 1.4.3 + Documentation generated on Wed, 31 Mar 2010 16:02:44 -0400 by phpDocumentor 1.4.3

    \ No newline at end of file diff -Nru zend-framework-1.10.2/extras/documentation/manual/extras/en/index.html zend-framework-1.10.3/extras/documentation/manual/extras/en/index.html --- zend-framework-1.10.2/extras/documentation/manual/extras/en/index.html 2010-02-23 23:18:36.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/manual/extras/en/index.html 2010-03-31 21:02:35.000000000 +0100 @@ -30,7 +30,7 @@ Zend Technologies Inc. (http://www.zend.com)

    -

    2010-02-23

    +

    2010-03-31

    diff -Nru zend-framework-1.10.2/extras/documentation/manual/extras/en/zendx.jquery.form.html zend-framework-1.10.3/extras/documentation/manual/extras/en/zendx.jquery.form.html --- zend-framework-1.10.2/extras/documentation/manual/extras/en/zendx.jquery.form.html 2010-02-23 23:18:36.000000000 +0000 +++ zend-framework-1.10.3/extras/documentation/manual/extras/en/zendx.jquery.form.html 2010-03-31 21:02:35.000000000 +0100 @@ -241,8 +241,8 @@ -
    > - +
    +
    diff -Nru zend-framework-1.10.2/extras/library/ZendX/Application/Resource/Jquery.php zend-framework-1.10.3/extras/library/ZendX/Application/Resource/Jquery.php --- zend-framework-1.10.2/extras/library/ZendX/Application/Resource/Jquery.php 2010-01-12 19:51:19.000000000 +0000 +++ zend-framework-1.10.3/extras/library/ZendX/Application/Resource/Jquery.php 2010-02-24 01:14:05.000000000 +0000 @@ -12,16 +12,16 @@ * obtain it through the world-wide-web, please send an email * to license@zend.com so we can send you a copy immediately. * - * @category Zend - * @package Zend_Application + * @category ZendX + * @package ZendX_Application * @subpackage Resource * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id$ + * @version $Id: Jquery.php 20240 2010-01-13 04:51:56Z matthew $ */ /** - * Cache Manager resource + * JQuery application resource * * Example configuration: * 
    @@ -37,13 +37,13 @@
  *   resources.Jquery.cdn_ssl = false
  *   resources.Jquery.render_mode = 255 ; default
  *   resources.Jquery.rendermode = 255 ; default
- *   
+ *
  *   resources.Jquery.javascriptfile = "/some/file.js"
  *   resources.Jquery.javascriptfiles.0 = "/some/file.js"
  *   resources.Jquery.stylesheet = "/some/file.css"
  *   resources.Jquery.stylesheets.0 = "/some/file.css"
  *
    - * + * * Resource for settings JQuery options * * @uses Zend_Application_Resource_ResourceAbstract @@ -65,7 +65,7 @@ * @var Zend_View */ protected $_view; - + /** * Defined by Zend_Application_Resource_Resource * @@ -95,17 +95,17 @@ return $this->_jquery; } - + /** * Parse options to find those pertinent to jquery helper and invoke them - * - * @param array $options + * + * @param array $options * @return void */ - protected function _parseOptions(array $options) + protected function _parseOptions(array $options) { $options = array_merge($options, array('cdn_ssl' => false)); - + foreach ($options as $key => $value) { switch($key) { case 'noconflictmode': @@ -134,7 +134,7 @@ break; case 'render_mode': case 'rendermode': - $this->_view->JQuery()->setRenderMode($value); + $this->_view->JQuery()->setRenderMode($value); break; case 'javascriptfile': $this->_view->JQuery()->addJavascriptFile($value); @@ -155,8 +155,8 @@ } } - if ((isset($key['uienable']) && (bool) $key['uienable']) - || (isset($key['ui_enable']) && (bool) $key['ui_enable']) + if ((isset($key['uienable']) && (bool) $key['uienable']) + || (isset($key['ui_enable']) && (bool) $key['ui_enable']) || (!isset($key['ui_enable']) && !isset($key['uienable']))) { $this->_view->JQuery()->uiEnable(); diff -Nru zend-framework-1.10.2/library/Zend/Amf/Parse/Amf0/Deserializer.php zend-framework-1.10.3/library/Zend/Amf/Parse/Amf0/Deserializer.php --- zend-framework-1.10.2/library/Zend/Amf/Parse/Amf0/Deserializer.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Amf/Parse/Amf0/Deserializer.php 2010-02-27 10:37:39.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Parse_Amf0 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Deserializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $ */ /** Zend_Amf_Constants */ @@ -30,7 +30,7 @@ * Read an AMF0 input stream and convert it into PHP data types * * @todo Implement Typed Object Class Mapping - * @todo Class could be implmented as Factory Class with each data type it's own class + * @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-2010 Zend Technologies USA Inc. (http://www.zend.com) @@ -39,7 +39,7 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer { /** - * An array of objects used for recursivly deserializing an object. + * An array of objects used for recursively deserializing an object. * @var array */ protected $_reference = array(); @@ -170,7 +170,7 @@ /** * Read reference objects * - * Used to gain access to the private array of refrence objects. + * Used to gain access to the private array of reference objects. * Called when marker type is 7. * * @return object @@ -203,7 +203,7 @@ } /** - * Converts numberically indexed actiosncript arrays into php arrays. + * Converts numerically indexed actiosncript arrays into php arrays. * * Called when marker type is 10 * diff -Nru zend-framework-1.10.2/library/Zend/Amf/Parse/Amf0/Serializer.php zend-framework-1.10.3/library/Zend/Amf/Parse/Amf0/Serializer.php --- zend-framework-1.10.2/library/Zend/Amf/Parse/Amf0/Serializer.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Amf/Parse/Amf0/Serializer.php 2010-02-27 10:37:39.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Parse_Amf0 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Serializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $ */ /** Zend_Amf_Constants */ @@ -27,7 +27,7 @@ require_once 'Zend/Amf/Parse/Serializer.php'; /** - * Serializer php misc types back to there corresponding AMF0 Type Marker. + * Serializer PHP misc types back to there corresponding AMF0 Type Marker. * * @uses Zend_Amf_Parse_Serializer * @package Zend_Amf @@ -63,7 +63,7 @@ public function writeTypeMarker($data, $markerType = null) { if (null !== $markerType) { - //try to refrence the given object + //try to reference the given object if( !$this->writeObjectReference($data, $markerType) ) { // Write the Type Marker to denote the following action script data type @@ -206,7 +206,7 @@ } /** - * Write a php array with string or mixed keys. + * Write a PHP array with string or mixed keys. * * @param object $data * @return Zend_Amf_Parse_Amf0_Serializer @@ -215,7 +215,7 @@ { // Loop each element and write the name of the property. foreach ($object as $key => $value) { - // skip variables starting with an _ provate transient + // skip variables starting with an _ private transient if( $key[0] == "_") continue; $this->_stream->writeUTF($key); $this->writeTypeMarker($value); @@ -241,7 +241,7 @@ // write the length of the array $this->_stream->writeLong(0); } else { - // Write the length of the numberic array + // Write the length of the numeric array $this->_stream->writeLong($length); for ($i=0; $i<$length; $i++) { $value = isset($array[$i]) ? $array[$i] : null; @@ -293,7 +293,7 @@ /** * Encountered and AMF3 Type Marker use AMF3 serializer. Once AMF3 is - * enountered it will not return to AMf0. + * encountered it will not return to AMf0. * * @param string $data * @return Zend_Amf_Parse_Amf0_Serializer diff -Nru zend-framework-1.10.2/library/Zend/Amf/Parse/Amf3/Deserializer.php zend-framework-1.10.3/library/Zend/Amf/Parse/Amf3/Deserializer.php --- zend-framework-1.10.2/library/Zend/Amf/Parse/Amf3/Deserializer.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Amf/Parse/Amf3/Deserializer.php 2010-02-27 10:37:39.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Parse_Amf3 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Deserializer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Deserializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $ */ /** Zend_Amf_Constants */ @@ -34,7 +34,7 @@ * * @todo readObject to handle Typed Objects * @todo readXMLStrimg to be implemented. - * @todo Class could be implmented as Factory Class with each data type it's own class. + * @todo Class could be implemented as Factory Class with each data type it's own class. * @package Zend_Amf * @subpackage Parse_Amf3 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) @@ -294,7 +294,7 @@ } $returnObject = $this->_referenceObjects[$ref]; } else { - // Check if the Object is in the stored Definistions reference table + // Check if the Object is in the stored Definitions reference table $storedClass = ($traitsInfo & 0x01) == 0; $traitsInfo = $traitsInfo >> 1; if ($storedClass) { @@ -322,7 +322,7 @@ $returnObject = new stdClass(); } else { // Defined object - // Typed object lookup agsinst registered classname maps + // Typed object lookup against registered classname maps if ($loader = Zend_Amf_Parse_TypeLoader::loadType($className)) { $returnObject = new $loader(); } else { @@ -332,7 +332,7 @@ } } - // Add the Object ot the reference table + // Add the Object to the reference table $this->_referenceObjects[] = $returnObject; $properties = array(); // clear value @@ -358,7 +358,7 @@ 'propertyNames' => $propertyNames, ); } - // not a refrence object read name value properties from byte stream + // not a reference object read name value properties from byte stream do { $property = $this->readString(); if ($property != "") { @@ -374,7 +374,7 @@ for($i=0; $i< $count; $i++) { $propertyNames[] = $this->readString(); } - // Add a refrence to the class. + // Add a reference to the class. $this->_referenceDefinitions[] = array( 'className' => $className, 'encoding' => $encoding, diff -Nru zend-framework-1.10.2/library/Zend/Amf/Parse/Serializer.php zend-framework-1.10.3/library/Zend/Amf/Parse/Serializer.php --- zend-framework-1.10.2/library/Zend/Amf/Parse/Serializer.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Amf/Parse/Serializer.php 2010-02-27 10:37:39.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Parse * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Serializer.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Serializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $ */ /** @@ -31,7 +31,7 @@ abstract class Zend_Amf_Parse_Serializer { /** - * Refrence to the current output stream being constructed + * Reference to the current output stream being constructed * * @var string */ diff -Nru zend-framework-1.10.2/library/Zend/Amf/Server.php zend-framework-1.10.3/library/Zend/Amf/Server.php --- zend-framework-1.10.2/library/Zend/Amf/Server.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Amf/Server.php 2010-02-27 10:37:39.000000000 +0000 @@ -16,7 +16,7 @@ * @package Zend_Amf * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Server.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Server.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $ */ /** @see Zend_Server_Interface */ @@ -49,7 +49,7 @@ * An AMF gateway server implementation to allow the connection of the Adobe Flash Player to * Zend Framework * - * @todo Make the relection methods cache and autoload. + * @todo Make the reflection methods cache and autoload. * @package Zend_Amf * @subpackage Server * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) @@ -228,7 +228,7 @@ * Check if the ACL allows accessing the function or method * * @param string|object $object Object or class being accessed - * @param string $function Function or method being acessed + * @param string $function Function or method being accessed * @return unknown_type */ protected function _checkAcl($object, $function) @@ -442,7 +442,7 @@ } /** - * Handle AMF authenticaton + * Handle AMF authentication * * @param string $userid * @param string $password @@ -488,7 +488,7 @@ // create a response object to place the output from the services. $response = $this->getResponse(); - // set reponse encoding + // set response encoding $response->setObjectEncoding($objectEncoding); $responseBody = $request->getAmfBodies(); @@ -673,7 +673,7 @@ } /** - * Public access method to private Zend_Amf_Server_Response refrence + * Public access method to private Zend_Amf_Server_Response reference * * @param string|Zend_Amf_Server_Response $response * @return Zend_Amf_Server @@ -695,7 +695,7 @@ } /** - * get a refrence to the Zend_Amf_response instance + * get a reference to the Zend_Amf_response instance * * @return Zend_Amf_Server_Response */ diff -Nru zend-framework-1.10.2/library/Zend/Amf/Util/BinaryStream.php zend-framework-1.10.3/library/Zend/Amf/Util/BinaryStream.php --- zend-framework-1.10.2/library/Zend/Amf/Util/BinaryStream.php 2010-01-07 17:59:01.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Amf/Util/BinaryStream.php 2010-02-27 10:37:39.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Util * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: BinaryStream.php 20124 2010-01-07 17:59:01Z mabe $ + * @version $Id: BinaryStream.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $ */ /** @@ -53,7 +53,7 @@ /** * Constructor * - * Create a refrence to a byte stream that is going to be parsed or created + * Create a reference to a byte stream that is going to be parsed or created * by the methods in the class. Detect if the class should use big or * little Endian encoding. * diff -Nru zend-framework-1.10.2/library/Zend/Auth/Adapter/Ldap.php zend-framework-1.10.3/library/Zend/Auth/Adapter/Ldap.php --- zend-framework-1.10.2/library/Zend/Auth/Adapter/Ldap.php 2010-02-09 14:06:42.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Auth/Adapter/Ldap.php 2010-03-04 16:05:09.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Zend_Auth_Adapter * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Ldap.php 21009 2010-02-09 14:06:42Z sgehrig $ + * @version $Id: Ldap.php 21320 2010-03-04 16:05:09Z sgehrig $ */ /** @@ -286,7 +286,7 @@ * @see Zend_Auth_Adapter_Exception */ require_once 'Zend/Auth/Adapter/Exception.php'; - throw new Zend_Auth_Adapter_Exception('Adapter options array not in array'); + throw new Zend_Auth_Adapter_Exception('Adapter options array not an array'); } $adapterOptions = $this->_prepareOptions($ldap, $options); $dname = ''; diff -Nru zend-framework-1.10.2/library/Zend/Barcode/Object/Code39.php zend-framework-1.10.3/library/Zend/Barcode/Object/Code39.php --- zend-framework-1.10.2/library/Zend/Barcode/Object/Code39.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Barcode/Object/Code39.php 2010-03-27 14:29:57.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Object * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Code39.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Code39.php 21658 2010-03-27 14:29:57Z mikaelkael $ */ /** @@ -44,7 +44,7 @@ * Coding map * @var array */ - private $_codingMap = array( + protected $_codingMap = array( '0' => '000110100', '1' => '100100001', '2' => '001100001', diff -Nru zend-framework-1.10.2/library/Zend/Cache/Backend/File.php zend-framework-1.10.3/library/Zend/Cache/Backend/File.php --- zend-framework-1.10.2/library/Zend/Cache/Backend/File.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Cache/Backend/File.php 2010-03-25 17:07:02.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: File.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: File.php 21642 2010-03-25 17:07:02Z mabe $ */ /** @@ -123,8 +123,8 @@ $this->setCacheDir(self::getTmpDir() . DIRECTORY_SEPARATOR, false); } if (isset($this->_options['file_name_prefix'])) { // particular case for this option - if (!preg_match('~^[\w]+$~', $this->_options['file_name_prefix'])) { - Zend_Cache::throwException('Invalid file_name_prefix : must use only [a-zA-A0-9_]'); + if (!preg_match('~^[a-zA-Z0-9_]+$~D', $this->_options['file_name_prefix'])) { + Zend_Cache::throwException('Invalid file_name_prefix : must use only [a-zA-Z0-9_]'); } } if ($this->_options['metadatas_array_max_size'] < 10) { @@ -647,6 +647,7 @@ $prefix = $this->_options['file_name_prefix']; $glob = @glob($dir . $prefix . '--*'); if ($glob === false) { + // On some systems it is impossible to distinguish between empty match and an error. return true; } foreach ($glob as $file) { @@ -739,7 +740,8 @@ $prefix = $this->_options['file_name_prefix']; $glob = @glob($dir . $prefix . '--*'); if ($glob === false) { - return true; + // On some systems it is impossible to distinguish between empty match and an error. + return array(); } foreach ($glob as $file) { if (is_file($file)) { @@ -802,7 +804,12 @@ } if ((is_dir($file)) and ($this->_options['hashed_directory_level']>0)) { // Recursive call - $result = array_unique(array_merge($result, $this->_get($file . DIRECTORY_SEPARATOR, $mode, $tags))); + $recursiveRs = $this->_get($file . DIRECTORY_SEPARATOR, $mode, $tags); + if ($recursiveRs === false) { + $this->_log('Zend_Cache_Backend_File::_get() / recursive call : can\'t list entries of "'.$file.'"'); + } else { + $result = array_unique(array_merge($result, $recursiveRs)); + } } } return array_unique($result); diff -Nru zend-framework-1.10.2/library/Zend/Cache/Backend/Memcached.php zend-framework-1.10.3/library/Zend/Cache/Backend/Memcached.php --- zend-framework-1.10.2/library/Zend/Cache/Backend/Memcached.php 2010-01-25 00:14:10.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Cache/Backend/Memcached.php 2010-03-17 18:20:53.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Memcached.php 20591 2010-01-25 00:14:10Z mabe $ + * @version $Id: Memcached.php 21535 2010-03-17 18:20:53Z mabe $ */ @@ -238,7 +238,7 @@ */ public function remove($id) { - return $this->_memcache->delete($id); + return $this->_memcache->delete($id, 0); } /** @@ -381,10 +381,10 @@ { $mems = $this->_memcache->getExtendedStats(); - $memSize = 0; - $memUsed = 0; + $memSize = null; + $memUsed = null; foreach ($mems as $key => $mem) { - if ($mem === false || !$mem['limit_maxbytes']) { + if ($mem === false) { $this->_log('can\'t get stat from ' . $key); continue; } @@ -399,7 +399,7 @@ $memUsed += $eachUsed; } - if (!$memSize || !$memUsed) { + if ($memSize === null || $memUsed === null) { Zend_Cache::throwException('Can\'t get filling percentage'); } diff -Nru zend-framework-1.10.2/library/Zend/Cache/Backend/Static.php zend-framework-1.10.3/library/Zend/Cache/Backend/Static.php --- zend-framework-1.10.2/library/Zend/Cache/Backend/Static.php 2010-01-28 11:42:25.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Cache/Backend/Static.php 2010-03-29 15:50:28.000000000 +0100 @@ -233,7 +233,6 @@ if ($extension) $ext = $extension; $file = rtrim($pathName, '/') . '/' . $fileName . $ext; if ($this->_options['file_locking']) { - file_put_contents('/var/www/data.dump', $file.$data); $result = file_put_contents($file, $data, LOCK_EX); } else { $result = file_put_contents($file, $data); diff -Nru zend-framework-1.10.2/library/Zend/Cache/Backend/Test.php zend-framework-1.10.3/library/Zend/Cache/Backend/Test.php --- zend-framework-1.10.2/library/Zend/Cache/Backend/Test.php 2010-01-18 14:40:57.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Cache/Backend/Test.php 2010-03-02 10:25:22.000000000 +0000 @@ -17,14 +17,14 @@ * @subpackage Zend_Cache_Backend * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Test.php 20379 2010-01-18 14:40:57Z mabe $ + * @version $Id: Test.php 21292 2010-03-02 10:25:22Z mabe $ */ /** * @see Zend_Cache_Backend_Interface */ -require_once 'Zend/Cache/Backend/Interface.php'; +require_once 'Zend/Cache/Backend/ExtendedInterface.php'; /** * @see Zend_Cache_Backend @@ -37,7 +37,7 @@ * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Cache_Backend_Test extends Zend_Cache_Backend implements Zend_Cache_Backend_Interface +class Zend_Cache_Backend_Test extends Zend_Cache_Backend implements Zend_Cache_Backend_ExtendedInterface { /** * Available options @@ -253,6 +253,145 @@ } /** + * Return an array of stored cache ids + * + * @return array array of stored cache ids (string) + */ + public function getIds() + { + return array( + 'prefix_id1', 'prefix_id2' + ); + } + + /** + * Return an array of stored tags + * + * @return array array of stored tags (string) + */ + public function getTags() + { + return array( + 'tag1', 'tag2' + ); + } + + /** + * Return an array of stored cache ids which match given tags + * + * In case of multiple tags, a logical AND is made between tags + * + * @param array $tags array of tags + * @return array array of matching cache ids (string) + */ + public function getIdsMatchingTags($tags = array()) + { + if ($tags == array('tag1', 'tag2')) { + return array('prefix_id1', 'prefix_id2'); + } + + return array(); + } + + /** + * Return an array of stored cache ids which don't match given tags + * + * In case of multiple tags, a logical OR is made between tags + * + * @param array $tags array of tags + * @return array array of not matching cache ids (string) + */ + public function getIdsNotMatchingTags($tags = array()) + { + if ($tags == array('tag3', 'tag4')) { + return array('prefix_id3', 'prefix_id4'); + } + + return array(); + } + + /** + * Return an array of stored cache ids which match any given tags + * + * In case of multiple tags, a logical AND is made between tags + * + * @param array $tags array of tags + * @return array array of any matching cache ids (string) + */ + public function getIdsMatchingAnyTags($tags = array()) + { + if ($tags == array('tag5', 'tag6')) { + return array('prefix_id5', 'prefix_id6'); + } + + return array(); + } + + /** + * Return the filling percentage of the backend storage + * + * @return int integer between 0 and 100 + */ + public function getFillingPercentage() + { + return 50; + } + + /** + * Return an array of metadatas for the given cache id + * + * The array must include these keys : + * - expire : the expire timestamp + * - tags : a string array of tags + * - mtime : timestamp of last modification time + * + * @param string $id cache id + * @return array array of metadatas (false if the cache id is not found) + */ + public function getMetadatas($id) + { + return false; + } + + /** + * Give (if possible) an extra lifetime to the given cache id + * + * @param string $id cache id + * @param int $extraLifetime + * @return boolean true if ok + */ + public function touch($id, $extraLifetime) + { + return true; + } + + /** + * Return an associative array of capabilities (booleans) of the backend + * + * The array must include these keys : + * - automatic_cleaning (is automating cleaning necessary) + * - tags (are tags supported) + * - expired_read (is it possible to read expired cache records + * (for doNotTestCacheValidity option for example)) + * - priority does the backend deal with priority when saving + * - infinite_lifetime (is infinite lifetime can work with this backend) + * - get_list (is it possible to get the list of cache ids and the complete list of tags) + * + * @return array associative of with capabilities + */ + public function getCapabilities() + { + return array( + 'automatic_cleaning' => true, + 'tags' => true, + 'expired_read' => false, + 'priority' => true, + 'infinite_lifetime' => true, + 'get_list' => true + ); + } + + /** * Add an event to the log array * * @param string $methodName MethodName diff -Nru zend-framework-1.10.2/library/Zend/Cache/Core.php zend-framework-1.10.3/library/Zend/Cache/Core.php --- zend-framework-1.10.2/library/Zend/Cache/Core.php 2010-02-05 14:37:52.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Cache/Core.php 2010-03-02 10:26:32.000000000 +0000 @@ -16,7 +16,7 @@ * @package Zend_Cache * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Core.php 20930 2010-02-05 14:37:52Z padraic $ + * @version $Id: Core.php 21293 2010-03-02 10:26:32Z mabe $ */ @@ -28,6 +28,12 @@ class Zend_Cache_Core { /** + * Messages + */ + const BACKEND_NOT_SUPPORTS_TAG = 'tags are not supported by the current backend'; + const BACKEND_NOT_IMPLEMENTS_EXTENDED_IF = 'Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'; + + /** * Backend Object * * @var object $_backend @@ -466,12 +472,26 @@ public function getIdsMatchingTags($tags = array()) { if (!$this->_extendedBackend) { - Zend_Cache::throwException('Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'); + Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } if (!($this->_backendCapabilities['tags'])) { - Zend_Cache::throwException('tags are not supported by the current backend'); + Zend_Cache::throwException(self::BACKEND_NOT_SUPPORT_TAG); + } + + $ids = $this->_backend->getIdsMatchingTags($tags); + + // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600) + if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') { + $prefix = & $this->_options['cache_id_prefix']; + $prefixLen = strlen($prefix); + foreach ($ids as &$id) { + if (strpos($id, $prefix) === 0) { + $id = substr($id, $prefixLen); + } + } } - return $this->_backend->getIdsMatchingTags($tags); + + return $ids; } /** @@ -485,12 +505,59 @@ public function getIdsNotMatchingTags($tags = array()) { if (!$this->_extendedBackend) { - Zend_Cache::throwException('Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'); + Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); + } + if (!($this->_backendCapabilities['tags'])) { + Zend_Cache::throwException(self::BACKEND_NOT_SUPPORT_TAG); + } + + $ids = $this->_backend->getIdsNotMatchingTags($tags); + + // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600) + if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') { + $prefix = & $this->_options['cache_id_prefix']; + $prefixLen = strlen($prefix); + foreach ($ids as &$id) { + if (strpos($id, $prefix) === 0) { + $id = substr($id, $prefixLen); + } + } + } + + return $ids; + } + + /** + * Return an array of stored cache ids which match any given tags + * + * In case of multiple tags, a logical OR is made between tags + * + * @param array $tags array of tags + * @return array array of matching any cache ids (string) + */ + public function getIdsMatchingAnyTags($tags = array()) + { + if (!$this->_extendedBackend) { + Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } if (!($this->_backendCapabilities['tags'])) { - Zend_Cache::throwException('tags are not supported by the current backend'); + Zend_Cache::throwException(self::BACKEND_NOT_SUPPORT_TAG); } - return $this->_backend->getIdsNotMatchingTags($tags); + + $ids = $this->_backend->getIdsMatchingAnyTags($tags); + + // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600) + if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') { + $prefix = & $this->_options['cache_id_prefix']; + $prefixLen = strlen($prefix); + foreach ($ids as &$id) { + if (strpos($id, $prefix) === 0) { + $id = substr($id, $prefixLen); + } + } + } + + return $ids; } /** @@ -501,20 +568,23 @@ public function getIds() { if (!$this->_extendedBackend) { - Zend_Cache::throwException('Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'); + Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } - $array = $this->_backend->getIds(); - if ((!isset($this->_options['cache_id_prefix'])) || ($this->_options['cache_id_prefix'] == '')) return $array; - // we need to remove cache_id_prefix from ids (see #ZF-6178) - $res = array(); - while (list(,$id) = each($array)) { - if (strpos($id, $this->_options['cache_id_prefix']) === 0) { - $res[] = preg_replace("~^{$this->_options['cache_id_prefix']}~", '', $id); - } else { - $res[] = $id; + + $ids = $this->_backend->getIds(); + + // we need to remove cache_id_prefix from ids (see #ZF-6178, #ZF-7600) + if (isset($this->_options['cache_id_prefix']) && $this->_options['cache_id_prefix'] !== '') { + $prefix = & $this->_options['cache_id_prefix']; + $prefixLen = strlen($prefix); + foreach ($ids as &$id) { + if (strpos($id, $prefix) === 0) { + $id = substr($id, $prefixLen); + } } } - return $res; + + return $ids; } /** @@ -525,10 +595,10 @@ public function getTags() { if (!$this->_extendedBackend) { - Zend_Cache::throwException('Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'); + Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } if (!($this->_backendCapabilities['tags'])) { - Zend_Cache::throwException('tags are not supported by the current backend'); + Zend_Cache::throwException(self::BACKEND_NOT_SUPPORT_TAG); } return $this->_backend->getTags(); } @@ -541,7 +611,7 @@ public function getFillingPercentage() { if (!$this->_extendedBackend) { - Zend_Cache::throwException('Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'); + Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } return $this->_backend->getFillingPercentage(); } @@ -560,7 +630,7 @@ public function getMetadatas($id) { if (!$this->_extendedBackend) { - Zend_Cache::throwException('Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'); + Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } $id = $this->_id($id); // cache id may need prefix return $this->_backend->getMetadatas($id); @@ -576,7 +646,7 @@ public function touch($id, $extraLifetime) { if (!$this->_extendedBackend) { - Zend_Cache::throwException('Current backend doesn\'t implement the Zend_Cache_Backend_ExtendedInterface, so this method is not available'); + Zend_Cache::throwException(self::BACKEND_NOT_IMPLEMENTS_EXTENDED_IF); } $id = $this->_id($id); // cache id may need prefix return $this->_backend->touch($id, $extraLifetime); @@ -599,7 +669,7 @@ if (substr($string, 0, 9) == 'internal-') { Zend_Cache::throwException('"internal-*" ids or tags are reserved'); } - if (!preg_match('~^[\w]+$~D', $string)) { + if (!preg_match('~^[a-zA-Z0-9_]+$~D', $string)) { Zend_Cache::throwException("Invalid id or tag '$string' : must use only [a-zA-Z0-9_]"); } } diff -Nru zend-framework-1.10.2/library/Zend/Controller/Response/Abstract.php zend-framework-1.10.3/library/Zend/Controller/Response/Abstract.php --- zend-framework-1.10.2/library/Zend/Controller/Response/Abstract.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Controller/Response/Abstract.php 2010-03-02 23:01:38.000000000 +0000 @@ -16,7 +16,7 @@ * @package Zend_Controller * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Abstract.php 21302 2010-03-02 23:01:38Z yoshida@zend.co.jp $ */ /** @@ -184,26 +184,26 @@ return $this; } - /** - * Clears the specified HTTP header - * - * @param string $name - * @return Zend_Controller_Response_Abstract - */ - public function clearHeader($name) - { - if (! count($this->_headers)) { - return $this; - } - - foreach ($this->_headers as $index => $header) { - if ($name == $header['name']) { - unset($this->_headers[$index]); - } - } + /** + * Clears the specified HTTP header + * + * @param string $name + * @return Zend_Controller_Response_Abstract + */ + public function clearHeader($name) + { + if (! count($this->_headers)) { + return $this; + } + + foreach ($this->_headers as $index => $header) { + if ($name == $header['name']) { + unset($this->_headers[$index]); + } + } - return $this; - } + return $this; + } /** * Set raw HTTP header @@ -244,23 +244,23 @@ return $this; } - /** - * Clears the specified raw HTTP header - * - * @param string $headerRaw - * @return Zend_Controller_Response_Abstract - */ - public function clearRawHeader($headerRaw) - { - if (! count($this->_headersRaw)) { - return $this; - } + /** + * Clears the specified raw HTTP header + * + * @param string $headerRaw + * @return Zend_Controller_Response_Abstract + */ + public function clearRawHeader($headerRaw) + { + if (! count($this->_headersRaw)) { + return $this; + } - $key = array_search($headerRaw, $this->_headersRaw); - unset($this->_headersRaw[$key]); + $key = array_search($headerRaw, $this->_headersRaw); + unset($this->_headersRaw[$key]); - return $this; - } + return $this; + } /** * Clear all headers, normal and raw diff -Nru zend-framework-1.10.2/library/Zend/Currency.php zend-framework-1.10.3/library/Zend/Currency.php --- zend-framework-1.10.2/library/Zend/Currency.php 2010-02-15 21:31:42.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Currency.php 2010-03-25 20:59:40.000000000 +0000 @@ -16,7 +16,7 @@ * @package Zend_Currency * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Currency.php 21059 2010-02-15 21:31:42Z thomas $ + * @version $Id: Currency.php 21647 2010-03-25 20:59:40Z thomas $ */ /** @@ -91,14 +91,15 @@ public function __construct($options = null, $locale = null) { if (is_array($options)) { + $this->setLocale($locale); $this->setFormat($options); } else if (Zend_Locale::isLocale($options, false, false)) { - $temp = $locale; - $locale = $options; - $options = $temp; + $this->setLocale($options); + $options = $locale; + } else { + $this->setLocale($locale); } - $this->setLocale($locale); // Get currency details if (!isset($this->_options['currency']) || !is_array($options)) { $this->_options['currency'] = self::getShortName($options, $this->_options['locale']); @@ -745,11 +746,13 @@ protected function _exchangeCurrency($value, $currency) { if ($value instanceof Zend_Currency) { - $value = $value->getValue(); + $currency = $value->getShortName(); + $value = $value->getValue(); + } else { + $currency = $this->getShortName($currency, $this->getLocale()); } - $currency = $this->getShortName($currency); - $rate = 1; + $rate = 1; if ($currency !== $this->getShortName()) { $service = $this->getService(); if (!($service instanceof Zend_Currency_CurrencyInterface)) { @@ -757,7 +760,7 @@ throw new Zend_Currency_Exception('No exchange service applied'); } - $rate = $service->getRate($this->getShortName(), $currency); + $rate = $service->getRate($currency, $this->getShortName()); } $value *= $rate; @@ -840,10 +843,12 @@ case 'format': if ((empty($value) === false) and (Zend_Locale::isLocale($value, null, false) === false)) { - require_once 'Zend/Currency/Exception.php'; - throw new Zend_Currency_Exception("'" . - ((gettype($value) === 'object') ? get_class($value) : $value) - . "' is not a known locale."); + if (!is_string($value) || (strpos($value, '0') === false)) { + require_once 'Zend/Currency/Exception.php'; + throw new Zend_Currency_Exception("'" . + ((gettype($value) === 'object') ? get_class($value) : $value) + . "' is no format token"); + } } break; diff -Nru zend-framework-1.10.2/library/Zend/Date.php zend-framework-1.10.3/library/Zend/Date.php --- zend-framework-1.10.2/library/Zend/Date.php 2010-02-05 22:36:44.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Date.php 2010-03-01 21:40:19.000000000 +0000 @@ -16,7 +16,7 @@ * @package Zend_Date * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Date.php 20936 2010-02-05 22:36:44Z thomas $ + * @version $Id: Date.php 21282 2010-03-01 21:40:19Z thomas $ */ /** @@ -2796,6 +2796,19 @@ throw new Zend_Date_Exception($e->getMessage(), 0, $e); } } + + if (!array_key_exists('hour', $parsed)) { + $parsed['hour'] = 0; + } + + if (!array_key_exists('minute', $parsed)) { + $parsed['minute'] = 0; + } + + if (!array_key_exists('second', $parsed)) { + $parsed['second'] = 0; + } + $time = str_pad($parsed['hour'], 2, '0', STR_PAD_LEFT) . ":"; $time .= str_pad($parsed['minute'], 2, '0', STR_PAD_LEFT) . ":"; $time .= str_pad($parsed['second'], 2, '0', STR_PAD_LEFT); @@ -2805,6 +2818,7 @@ if ($calc != 'cmp') { return $this; } + return $return; } @@ -2947,6 +2961,19 @@ throw new Zend_Date_Exception($e->getMessage(), 0, $e); } } + + if (!array_key_exists('day', $parsed)) { + $parsed['day'] = 1; + } + + if (!array_key_exists('month', $parsed)) { + $parsed['month'] = 1; + } + + if (!array_key_exists('year', $parsed)) { + $parsed['year'] = 0; + } + $date = $parsed['day'] . "." . $parsed['month'] . "." . $parsed['year']; } diff -Nru zend-framework-1.10.2/library/Zend/Db/Adapter/Sqlsrv.php zend-framework-1.10.3/library/Zend/Db/Adapter/Sqlsrv.php --- zend-framework-1.10.2/library/Zend/Db/Adapter/Sqlsrv.php 2010-01-25 21:18:20.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Db/Adapter/Sqlsrv.php 2010-02-24 16:12:53.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage Adapter * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Sqlsrv.php 20630 2010-01-25 21:18:20Z ralph $ + * @version $Id: Sqlsrv.php 21197 2010-02-24 16:12:53Z rob $ */ /** @@ -605,23 +605,29 @@ throw new Zend_Db_Adapter_Exception("LIMIT argument offset=$offset is not valid"); } - $orderby = stristr($sql, 'ORDER BY'); - if ($orderby !== false) { - $sort = (stripos($orderby, ' desc') !== false) ? 'desc' : 'asc'; - $order = str_ireplace('ORDER BY', '', $orderby); - $order = trim(preg_replace('/\bASC\b|\bDESC\b/i', '', $order)); - } - - $sql = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($count+$offset) . ' ', $sql); - - $sql = 'SELECT * FROM (SELECT TOP ' . $count . ' * FROM (' . $sql . ') AS inner_tbl'; - if ($orderby !== false) { - $sql .= ' ORDER BY ' . $order . ' '; - $sql .= (stripos($sort, 'asc') !== false) ? 'DESC' : 'ASC'; - } - $sql .= ') AS outer_tbl'; - if ($orderby !== false) { - $sql .= ' ORDER BY ' . $order . ' ' . $sort; + if ($offset == 0) { + $sql = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . $count . ' ', $sql); + } else { + $orderby = stristr($sql, 'ORDER BY'); + if ($orderby !== false) { + $sort = (stripos($orderby, ' desc') !== false) ? 'desc' : 'asc'; + $order = str_ireplace('ORDER BY', '', $orderby); + $order = trim(preg_replace('/\bASC\b|\bDESC\b/i', '', $order)); + } + + $sql = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($count+$offset) . ' ', $sql); + + $sql = 'SELECT * FROM (SELECT TOP ' . $count . ' * FROM (' . $sql . ') AS inner_tbl'; + if ($orderby !== false) { + $innerOrder = preg_replace('/\".*\".\"(.*)\"/i', '"inner_tbl"."$1"', $order); + $sql .= ' ORDER BY ' . $innerOrder . ' '; + $sql .= (stripos($sort, 'asc') !== false) ? 'DESC' : 'ASC'; + } + $sql .= ') AS outer_tbl'; + if ($orderby !== false) { + $outerOrder = preg_replace('/\".*\".\"(.*)\"/i', '"outer_tbl"."$1"', $order); + $sql .= ' ORDER BY ' . $outerOrder . ' ' . $sort; + } } return $sql; diff -Nru zend-framework-1.10.2/library/Zend/Dojo/View/Helper/Dojo/Container.php zend-framework-1.10.3/library/Zend/Dojo/View/Helper/Dojo/Container.php --- zend-framework-1.10.2/library/Zend/Dojo/View/Helper/Dojo/Container.php 2010-01-14 22:15:29.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Dojo/View/Helper/Dojo/Container.php 2010-03-31 18:38:19.000000000 +0100 @@ -16,7 +16,7 @@ * @package Zend_Dojo * @subpackage View * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) - * @version $Id: Container.php 20295 2010-01-14 22:15:29Z matthew $ + * @version $Id: Container.php 21705 2010-03-31 17:38:19Z matthew $ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -67,7 +67,7 @@ * Dojo version to use from CDN * @var string */ - protected $_cdnVersion = '1.4.0'; + protected $_cdnVersion = '1.4.1'; /** * Has the dijit loader been registered? diff -Nru zend-framework-1.10.2/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php zend-framework-1.10.3/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php --- zend-framework-1.10.2/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php 2010-01-23 15:49:54.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Feed/Pubsubhubbub/Subscriber/Callback.php 2010-02-28 13:52:51.000000000 +0000 @@ -105,6 +105,8 @@ && $this->_hasValidVerifyToken(null, false) && ($this->_getHeader('Content-Type') == 'application/atom+xml' || $this->_getHeader('Content-Type') == 'application/rss+xml' + || $this->_getHeader('Content-Type') == 'application/xml' + || $this->_getHeader('Content-Type') == 'text/xml' || $this->_getHeader('Content-Type') == 'application/rdf+xml') ) { $this->setFeedUpdate($this->_getRawBody()); diff -Nru zend-framework-1.10.2/library/Zend/File/Transfer/Adapter/Abstract.php zend-framework-1.10.3/library/Zend/File/Transfer/Adapter/Abstract.php --- zend-framework-1.10.2/library/Zend/File/Transfer/Adapter/Abstract.php 2010-02-12 20:48:37.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/File/Transfer/Adapter/Abstract.php 2010-03-11 21:21:55.000000000 +0000 @@ -16,7 +16,7 @@ * @package Zend_File_Transfer * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Abstract.php 21039 2010-02-12 20:48:37Z thomas $ + * @version $Id: Abstract.php 21468 2010-03-11 21:21:55Z thomas $ */ /** @@ -621,6 +621,11 @@ if (array_key_exists('validators', $content) && in_array('Zend_Validate_File_Count', $content['validators'])) { $validator = $this->_validators['Zend_Validate_File_Count']; + $count = $content; + if (empty($content['tmp_name'])) { + continue; + } + if (array_key_exists('destination', $content)) { $checkit = $content['destination']; } else { @@ -628,8 +633,7 @@ } $checkit .= DIRECTORY_SEPARATOR . $content['name']; - $validator->addFile($checkit); - $count = $content; + $validator->addFile($checkit); } } @@ -1021,7 +1025,7 @@ $destination = rtrim($destination, "/\\"); if (!is_dir($destination)) { require_once 'Zend/File/Transfer/Exception.php'; - throw new Zend_File_Transfer_Exception('The given destination is no directory or does not exist'); + throw new Zend_File_Transfer_Exception('The given destination is not a directory or does not exist'); } if (!is_writable($destination)) { @@ -1063,7 +1067,7 @@ $destinations[$orig] = $this->_files[$orig]['destination']; } else { require_once 'Zend/File/Transfer/Exception.php'; - throw new Zend_File_Transfer_Exception(sprintf('"%s" not found by file transfer adapter', $orig)); + throw new Zend_File_Transfer_Exception(sprintf('The file transfer adapter can not find "%s"', $orig)); } } @@ -1168,7 +1172,7 @@ $result[$key] = hash_file($hash, $value['tmp_name']); } else if (empty($value['options']['ignoreNoFile'])) { require_once 'Zend/File/Transfer/Exception.php'; - throw new Zend_File_Transfer_Exception("File '{$value['name']}' does not exist"); + throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } } @@ -1199,7 +1203,7 @@ } } else if (empty($value['options']['ignoreNoFile'])) { require_once 'Zend/File/Transfer/Exception.php'; - throw new Zend_File_Transfer_Exception("File '{$value['name']}' does not exist"); + throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } else { continue; } @@ -1248,7 +1252,7 @@ $result[$key] = $value['type']; } else if (empty($value['options']['ignoreNoFile'])) { require_once 'Zend/File/Transfer/Exception.php'; - throw new Zend_File_Transfer_Exception("File '{$value['name']}' does not exist"); + throw new Zend_File_Transfer_Exception("The file '{$value['name']}' does not exist"); } else { continue; } @@ -1280,13 +1284,15 @@ if (class_exists('finfo', false)) { $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME; if (!empty($value['options']['magicFile'])) { - $mime = new finfo($const, $value['options']['magicFile']); - } else { - $mime = new finfo($const); + $mime = @finfo_open($const, $value['options']['magicFile']); + } + + if (empty($mime)) { + $mime = @finfo_open($const); } if ($mime !== false) { - $result = $mime->file($file); + $result = finfo_file($mime, $file); } unset($mime); @@ -1397,7 +1403,7 @@ unlink($tempFile); } else { require_once 'Zend/File/Transfer/Exception.php'; - throw new Zend_File_Transfer_Exception('Could not determine temp directory'); + throw new Zend_File_Transfer_Exception('Could not determine a temporary directory'); } } @@ -1480,7 +1486,7 @@ } require_once 'Zend/File/Transfer/Exception.php'; - throw new Zend_File_Transfer_Exception(sprintf('"%s" not found by file transfer adapter', $find)); + throw new Zend_File_Transfer_Exception(sprintf('The file transfer adapter can not find "%s"', $find)); } foreach ($found as $checked) { diff -Nru zend-framework-1.10.2/library/Zend/File/Transfer.php zend-framework-1.10.3/library/Zend/File/Transfer.php --- zend-framework-1.10.2/library/Zend/File/Transfer.php 2010-01-08 09:00:56.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/File/Transfer.php 2010-02-24 22:16:44.000000000 +0000 @@ -16,7 +16,7 @@ * @package Zend_File_Transfer * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Transfer.php 20141 2010-01-08 09:00:56Z thomas $ + * @version $Id: Transfer.php 21202 2010-02-24 22:16:44Z thomas $ */ /** @@ -74,9 +74,9 @@ $direction = (integer) $direction; $this->_adapter[$direction] = new $adapter($options); - if (!$this->_adapter[$direction] instanceof Zend_File_Transfer_Adapter) { + if (!$this->_adapter[$direction] instanceof Zend_File_Transfer_Adapter_Abstract) { require_once 'Zend/File/Transfer/Exception.php'; - throw new Zend_File_Transfer_Exception("Adapter " . $adapter . " does not extend Zend_File_Transfer_Adapter"); + throw new Zend_File_Transfer_Exception("Adapter " . $adapter . " does not extend Zend_File_Transfer_Adapter_Abstract"); } return $this; diff -Nru zend-framework-1.10.2/library/Zend/Filter/Inflector.php zend-framework-1.10.3/library/Zend/Filter/Inflector.php --- zend-framework-1.10.2/library/Zend/Filter/Inflector.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Filter/Inflector.php 2010-03-07 19:58:08.000000000 +0000 @@ -16,7 +16,7 @@ * @package Zend_Filter * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: Inflector.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: Inflector.php 21372 2010-03-07 19:58:08Z thomas $ */ /** @@ -68,30 +68,36 @@ /** * Constructor * - * @param string $target - * @param array $rules + * @param string|array $options Options to set */ - public function __construct($target = null, Array $rules = array(), $throwTargetExceptionsOn = null, $targetReplacementIdentifer = null) + public function __construct($options = null) { - if ($target instanceof Zend_Config) { - $this->setConfig($target); - } else { - if ((null !== $target) && is_string($target)) { - $this->setTarget($target); + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + $options = func_get_args(); + $temp = array(); + + if (!empty($options)) { + $temp['target'] = array_shift($options); } - if (null !== $rules) { - $this->addRules($rules); + if (!empty($options)) { + $temp['rules'] = array_shift($options); } - if ($throwTargetExceptionsOn !== null) { - $this->setThrowTargetExceptionsOn($throwTargetExceptionsOn); + if (!empty($options)) { + $temp['throwTargetExceptionsOn'] = array_shift($options); } - if ($targetReplacementIdentifer != '') { - $this->setTargetReplacementIdentifier($targetReplacementIdentifer); + if (!empty($options)) { + $temp['targetReplacementIdentifier'] = array_shift($options); } + + $options = $temp; } + + $this->setOptions($options); } /** @@ -123,38 +129,51 @@ /** * Use Zend_Config object to set object state * + * @deprecated Use setOptions() instead * @param Zend_Config $config * @return Zend_Filter_Inflector */ public function setConfig(Zend_Config $config) { - foreach ($config as $key => $value) { - switch ($key) { - case 'target': - $this->setTarget($value); - break; - case 'filterPrefixPath': - if (is_scalar($value)) { - break; - } - $paths = $value->toArray(); - foreach ($paths as $prefix => $path) { - $this->addFilterPrefixPath($prefix, $path); - } - break; - case 'throwTargetExceptionsOn': - $this->setThrowTargetExceptionsOn($value); - break; - case 'targetReplacementIdentifier': - $this->setTargetReplacementIdentifier($value); - break; - case 'rules': - $this->addRules($value->toArray()); - break; - default: - break; + return $this->setOptions($config); + } + + /** + * Set options + * + * @param array $options + * @return Zend_Filter_Inflector + */ + public function setOptions($options) { + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } + + // Set Präfix Path + if (array_key_exists('filterPrefixPath', $options)) { + if (!is_scalar($options['filterPrefixPath'])) { + foreach ($options['filterPrefixPath'] as $prefix => $path) { + $this->addFilterPrefixPath($prefix, $path); + } } } + + if (array_key_exists('throwTargetExceptionsOn', $options)) { + $this->setThrowTargetExceptionsOn($options['throwTargetExceptionsOn']); + } + + if (array_key_exists('targetReplacementIdentifier', $options)) { + $this->setTargetReplacementIdentifier($options['targetReplacementIdentifier']); + } + + if (array_key_exists('target', $options)) { + $this->setTarget($options['target']); + } + + if (array_key_exists('rules', $options)) { + $this->addRules($options['rules']); + } + return $this; } @@ -202,7 +221,10 @@ */ public function setTargetReplacementIdentifier($targetReplacementIdentifier) { - $this->_targetReplacementIdentifier = (string) $targetReplacementIdentifier; + if ($targetReplacementIdentifier) { + $this->_targetReplacementIdentifier = (string) $targetReplacementIdentifier; + } + return $this; } @@ -502,5 +524,4 @@ return $ruleObject; } - } diff -Nru zend-framework-1.10.2/library/Zend/Filter/StripTags.php zend-framework-1.10.3/library/Zend/Filter/StripTags.php --- zend-framework-1.10.2/library/Zend/Filter/StripTags.php 2010-01-21 18:43:53.000000000 +0000 +++ zend-framework-1.10.3/library/Zend/Filter/StripTags.php 2010-03-18 18:49:26.000000000 +0000 @@ -17,7 +17,7 @@ * @package Zend_Filter * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StripTags.php 20486 2010-01-21 18:43:53Z matthew $ + * @version $Id: StripTags.php 21553 2010-03-18 18:49:26Z thomas $ */ @@ -237,14 +237,22 @@ */ public function filter($value) { + $value = (string) $value; + // Strip HTML comments first - $valueCopy = preg_replace('# --> '; - $expected = ' '; + $expected = ' '; $this->_filter->setCommentsAllowed(true); $this->assertEquals($expected, $this->_filter->filter($input)); } @@ -563,6 +563,17 @@ $expected = 'äöüäöü'; $this->assertEquals($expected, $this->_filter->filter($input)); } + + /** + * @group ZF-9434 + */ + public function testCommentWithTagInSameLine() + { + $input = 'test test
    div-content
    '; + $expected = 'test test div-content'; + $this->assertEquals($expected, $this->_filter->filter($input)); + } + } // Call Zend_Filter_StripTagsTest::main() if this source file is executed directly. diff -Nru zend-framework-1.10.2/tests/Zend/Form/FormTest.php zend-framework-1.10.3/tests/Zend/Form/FormTest.php --- zend-framework-1.10.2/tests/Zend/Form/FormTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Form/FormTest.php 2010-03-31 17:32:29.000000000 +0100 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: FormTest.php 21704 2010-03-31 16:32:29Z matthew $ */ if (!defined('PHPUnit_MAIN_METHOD')) { @@ -1473,6 +1473,112 @@ $this->assertTrue($this->form->isValid($data)); } + public function testIsValidEqualSubFormAndElementName() + { + $this->form->addSubForm(new Zend_Form_SubForm(), 'foo') + ->foo->addElement('text', 'foo') + ->foo->setRequired(true) + ->addValidator('Identical', + false, + array('Foo Value')); + $foo = array('foo' => + array('foo' => 'Foo Value')); + + $this->assertTrue($this->form->isValid($foo)); + + $this->form->foo->setIsArray(false); + + $this->assertTrue($this->form->isValid($foo)); + } + + public function testIsValidPartialEqualSubFormAndElementName() + { + $this->form->addSubForm(new Zend_Form_SubForm(), 'foo') + ->foo->addElement('text', 'foo') + ->foo->setRequired(true) + ->addValidator('Identical', + false, + array('Foo Value')); + $foo = array('foo' => + array('foo' => 'Foo Value')); + + $this->assertTrue($this->form->isValidPartial($foo)); + + $this->form->foo->setIsArray(false); + + $this->assertTrue($this->form->isValidPartial($foo)); + } + + public function testPopulateWithElementsBelongTo() + { + $this->form->addSubForm(new Zend_Form_SubForm(), 'foo') + ->foo->setElementsBelongTo('foo[foo]') + ->addSubForm(new Zend_Form_SubForm(), 'foo') + ->foo->setIsArray(false) + ->addElement('text', 'foo'); + + $foo = array('foo' => + array('foo' => + array('foo' => + array('foo' => 'foo Value')))); + + $this->form->setView($this->getView()) + ->populate($foo); + + $this->assertRegexp('/value=.foo Value./', $this->form->render()); + } + + public function _setup9350() + { + $this->form->addSubForm(new Zend_Form_SubForm(), 'foo') + ->foo->setElementsBelongTo('foo[foo]') + ->addSubForm(new Zend_Form_SubForm(), 'foo') + ->foo->setIsArray(false) + ->addElement('text', 'foo') + ->foo->addValidator('Identical', + false, + array('foo Value')); + + $this->form->foo->addSubForm(new Zend_Form_SubForm(), 'baz') + ->baz->setIsArray(false) + ->addSubForm(new Zend_Form_SubForm(), 'baz') + ->baz->setElementsBelongTo('baz[baz]') + ->addElement('text', 'baz') + ->baz->addValidator('Identical', + false, + array('baz Value')); + + $data = array('valid' => array('foo' => + array('foo' => + array('foo' => + array('foo' => 'foo Value'), + 'baz' => + array('baz' => + array('baz' => + array('baz' => 'baz Value')))))), + 'invalid' => array('foo' => + array('foo' => + array('foo' => + array('foo' => 'foo Invalid'), + 'baz' => + array('baz' => + array('baz' => + array('baz' => 'baz Value')))))), + 'partial' => array('foo' => + array('foo' => + array('baz' => + array('baz' => + array('baz' => + array('baz' => 'baz Value'))))))); + return $data; + } + + public function testGetValidValuesWithElementsBelongTo() + { + $data = $this->_setup9350(); + $this->assertSame($this->form->getValidValues($data['invalid']), $data['partial']); + } + // Display groups @@ -3797,6 +3903,118 @@ $this->assertEquals(array('sub' => array('valid' => 1234)), $this->form->getValidValues($data)); } + + /** + * @group ZF-9494 + */ + public function testElementTranslatorNotOveriddenbyFormTranslator() + { + $translations = array( + 'isEmpty' => 'Element message', + ); + $translate = new Zend_Translate('array', $translations); + $this->form->addElement('text', 'foo', array('required'=>true, 'translator'=>$translate)); + $this->assertFalse($this->form->isValid(array('foo'=>''))); + $messages = $this->form->getMessages(); + $this->assertEquals(1, count($messages)); + $this->assertEquals('Element message', $messages['foo']['isEmpty']); + + $this->assertFalse($this->form->isValidPartial(array('foo'=>''))); + $messages = $this->form->getMessages(); + $this->assertEquals(1, count($messages)); + $this->assertEquals('Element message', $messages['foo']['isEmpty']); + } + + /** + * @group ZF-9364 + */ + public function testElementTranslatorPreferredOverFormTranslator() + { + $formTanslations = array( + 'isEmpty' => 'Form message', + ); + $elementTanslations = array( + 'isEmpty' => 'Element message', + ); + $formTranslate = new Zend_Translate('array', $formTanslations); + $elementTranslate = new Zend_Translate('array', $elementTanslations); + $this->form->setTranslator($formTranslate); + $this->form->addElement('text', 'foo', array('required'=>true, 'translator'=>$elementTranslate)); + $this->form->addElement('text', 'bar', array('required'=>true)); + + $this->assertFalse($this->form->isValid(array('foo'=>'', 'bar'=>''))); + $messages = $this->form->getMessages(); + $this->assertEquals(2, count($messages)); + $this->assertEquals('Element message', $messages['foo']['isEmpty']); + $this->assertEquals('Form message', $messages['bar']['isEmpty']); + + $this->assertFalse($this->form->isValidPartial(array('foo'=>'', 'bar'=>''))); + $messages = $this->form->getMessages(); + $this->assertEquals(2, count($messages)); + $this->assertEquals('Element message', $messages['foo']['isEmpty']); + $this->assertEquals('Form message', $messages['bar']['isEmpty']); + } + + /** + * @group ZF-9364 + */ + public function testElementTranslatorPreferredOverDefaultTranslator() + { + $defaultTranslations = array( + 'isEmpty' => 'Default message', + ); + $formTranslations = array( + 'isEmpty' => 'Form message', + ); + $elementTranslations = array( + 'isEmpty' => 'Element message', + ); + $defaultTranslate = new Zend_Translate('array', $defaultTranslations); + $formTranslate = new Zend_Translate('array', $formTranslations); + $elementTranslate = new Zend_Translate('array', $elementTranslations); + + Zend_Registry::set('Zend_Translate', $defaultTranslate); + $this->form->setTranslator($formTranslate); + $this->form->addElement('text', 'foo', array('required'=>true, 'translator'=>$elementTranslate)); + $this->form->addElement('text', 'bar', array('required'=>true)); + + $this->assertFalse($this->form->isValid(array('foo'=>'', 'bar'=>''))); + $messages = $this->form->getMessages(); + $this->assertEquals(2, count($messages)); + $this->assertEquals('Element message', $messages['foo']['isEmpty']); + $this->assertEquals('Form message', $messages['bar']['isEmpty']); + + $this->assertFalse($this->form->isValidPartial(array('foo'=>'', 'bar'=>''))); + $messages = $this->form->getMessages(); + $this->assertEquals(2, count($messages)); + $this->assertEquals('Element message', $messages['foo']['isEmpty']); + $this->assertEquals('Form message', $messages['bar']['isEmpty']); + } + + /** + * @group ZF-9540 + */ + public function testSubFormTranslatorPreferredOverDefaultTranslator() + { + $defaultTranslations = array('isEmpty' => 'Default message'); + $subformTranslations = array('isEmpty' => 'SubForm message'); + + $defaultTranslate = new Zend_Translate('array', $defaultTranslations); + $subformTranslate = new Zend_Translate('array', $subformTranslations); + + Zend_Registry::set('Zend_Translate', $defaultTranslate); + $this->form->addSubForm(new Zend_Form_SubForm(), 'subform'); + $this->form->subform->setTranslator($subformTranslate); + $this->form->subform->addElement('text', 'foo', array('required'=>true)); + + $this->assertFalse($this->form->isValid(array('subform' => array('foo'=>'')))); + $messages = $this->form->getMessages(); + $this->assertEquals('SubForm message', $messages['subform']['foo']['isEmpty']); + + $this->assertFalse($this->form->isValidPartial(array('subform' => array('foo'=>'')))); + $messages = $this->form->getMessages(); + $this->assertEquals('SubForm message', $messages['subform']['foo']['isEmpty']); + } /** * Used by test methods susceptible to ZF-2794, marks a test as incomplete diff -Nru zend-framework-1.10.2/tests/Zend/Locale/FormatTest.php zend-framework-1.10.3/tests/Zend/Locale/FormatTest.php --- zend-framework-1.10.2/tests/Zend/Locale/FormatTest.php 2010-02-20 20:36:21.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Locale/FormatTest.php 2010-03-14 12:01:43.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FormatTest.php 21111 2010-02-20 20:36:21Z thomas $ + * @version $Id: FormatTest.php 21493 2010-03-14 12:01:43Z thomas $ */ require_once dirname(__FILE__) . '/../../TestHelper.php'; @@ -732,7 +732,7 @@ $this->assertEquals( '1.234.567,00', Zend_Locale_Format::toNumber( 1234567, array('number_format' => '#,##0.00', 'locale' => 'de_AT'))); $this->assertEquals( '1.234.567,12', Zend_Locale_Format::toNumber( 1234567.123, array('precision' => 2, 'locale' => 'de_AT'))); $this->assertEquals( '1234567,12-', Zend_Locale_Format::toNumber(-1234567.123, array('number_format' => '#0.00-', 'locale' => 'de_AT'))); - $this->assertEquals( '-12.345', Zend_Locale_Format::toNumber( -12345.67, array('precision' => 0, 'locale' => 'de_AT'))); + $this->assertEquals( '-12.346', Zend_Locale_Format::toNumber( -12345.67, array('precision' => 0, 'locale' => 'de_AT'))); } /** @@ -1082,4 +1082,17 @@ { $this->assertEquals(1234, Zend_Locale_Format::getNumber('1234.567', array('locale' => 'en_US', 'precision' => 0))); } + + /** + * @group ZF-9319 + */ + public function testToNumberWithoutFormatWithPrecision() + { + $options = array('locale' => 'de_AT', 'precision' => 2); + $this->assertEquals('3,99', Zend_Locale_Format::toNumber(3.99, $options)); + $this->assertEquals('3,99', Zend_Locale_Format::toNumber(3.994, $options)); + $this->assertEquals('4,00', Zend_Locale_Format::toNumber(3.995, $options)); + $this->assertEquals('4,00', Zend_Locale_Format::toNumber(3.999, $options)); + $this->assertEquals('4,00', Zend_Locale_Format::toNumber(4, $options)); + } } diff -Nru zend-framework-1.10.2/tests/Zend/Markup/BbcodeAndHtmlTest.php zend-framework-1.10.3/tests/Zend/Markup/BbcodeAndHtmlTest.php --- zend-framework-1.10.2/tests/Zend/Markup/BbcodeAndHtmlTest.php 2010-02-21 15:36:07.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Markup/BbcodeAndHtmlTest.php 2010-03-18 17:19:11.000000000 +0000 @@ -530,6 +530,16 @@ $this->assertEquals('testtest', $m->render('[url="http://framework.zend.com/"]test[/url][url="http://framework.zend.com/"]test[/url]')); } + + /** + * Test for ZF-9463 + */ + public function testNoXssInH() + { + $m = $this->_markup; + $this->assertEquals('

    <script>alert("hi");</script>

    ', + $m->render('[h1][/h1]')); + } } // Call Zend_Markup_BbcodeAndHtmlTest::main() diff -Nru zend-framework-1.10.2/tests/Zend/Measure/TimeTest.php zend-framework-1.10.3/tests/Zend/Measure/TimeTest.php --- zend-framework-1.10.2/tests/Zend/Measure/TimeTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Measure/TimeTest.php 2010-03-04 22:07:38.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimeTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimeTest.php 21330 2010-03-04 22:07:38Z thomas $ */ /** @@ -386,4 +386,18 @@ $unit = $value->getConversionList(); $this->assertTrue(is_array($unit), 'Array expected'); } + + /** + * @group ZF-9078 + */ + public function testSetTypeOnPhpMathWithStrippedValue() + { + $locale = new Zend_Locale('en_US'); + $time = new Zend_Measure_Time(0, Zend_Measure_Time::SECOND); + $time->setLocale($locale); + $time->setType(Zend_Measure_Time::SECOND); + $seconds = $time->getValue(); + $this->assertEquals(0, $seconds); + $this->assertEquals(Zend_Measure_Time::SECOND, $time->getType()); + } } diff -Nru zend-framework-1.10.2/tests/Zend/Oauth/Oauth/Token/AccessTest.php zend-framework-1.10.3/tests/Zend/Oauth/Oauth/Token/AccessTest.php --- zend-framework-1.10.2/tests/Zend/Oauth/Oauth/Token/AccessTest.php 2008-07-09 20:16:55.000000000 +0100 +++ zend-framework-1.10.3/tests/Zend/Oauth/Oauth/Token/AccessTest.php 2010-02-28 13:48:58.000000000 +0000 @@ -79,7 +79,7 @@ 'http://www.example.com', new Test_Config_90244 ); - $this->assertEquals('OAuth realm="",oauth_consumer_key="1234567890",oauth_nonce="e807f1fcf82d132f9bb018ca6738a19f",oauth_signature_method="HMAC-SHA1",oauth_timestamp="12345678901",oauth_token="abcde",oauth_version="1.0",oauth_signature="6fb42da0e32e07b61c9f0251fe627a9c"', $value); + $this->assertEquals('OAuth realm="",oauth_consumer_key="1234567890",oauth_nonce="e807f1fcf82d132f9bb018ca6738a19f",oauth_signature_method="HMAC-SHA1",oauth_timestamp="12345678901",oauth_version="1.0",oauth_token="abcde",oauth_signature="6fb42da0e32e07b61c9f0251fe627a9c"', $value); } } @@ -107,4 +107,4 @@ return $token;} public function getRequestMethod() {return 'POST';} -} \ No newline at end of file +} diff -Nru zend-framework-1.10.2/tests/Zend/Pdf/Element/StringTest.php zend-framework-1.10.3/tests/Zend/Pdf/Element/StringTest.php --- zend-framework-1.10.2/tests/Zend/Pdf/Element/StringTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Pdf/Element/StringTest.php 2010-03-18 09:12:27.000000000 +0000 @@ -17,10 +17,15 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: StringTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: StringTest.php 21545 2010-03-18 09:12:27Z bate $ */ /** + * TestHelper + */ +require_once dirname(dirname(dirname(dirname(__FILE__)))) . DIRECTORY_SEPARATOR . 'TestHelper.php'; + +/** * Zend_Pdf_Element_String */ require_once 'Zend/Pdf/Element/String.php'; @@ -68,4 +73,20 @@ $this->assertEquals(Zend_Pdf_Element_String::unescape("\\n\\r\\t\\b\\f\\(\\)\\\\ \nsome \\\ntext"), "\n\r\t\x08\x0C()\\ \nsome text"); } + + /** + * @group ZF-9450 + */ + public function testUnescapeOctal() + { + $input = array( + 0304 => '\\304', + 0326 => '\\326', + 0334 => '\\334' + ); + foreach ($input as $k => $v) { + $this->assertEquals(Zend_Pdf_Element_String::unescape($v), + chr($k), 'expected German Umlaut'); + } + } } diff -Nru zend-framework-1.10.2/tests/Zend/Reflection/_files/TestSampleClass.php zend-framework-1.10.3/tests/Zend/Reflection/_files/TestSampleClass.php --- zend-framework-1.10.2/tests/Zend/Reflection/_files/TestSampleClass.php 2009-11-19 20:44:56.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Reflection/_files/TestSampleClass.php 2010-03-31 18:38:26.000000000 +0100 @@ -56,7 +56,7 @@ * Blah Blah * */ -abstract class Zend_Reflection_TestSampleClass3 extends ArrayObject implements Iterator, Traversable +abstract class Zend_Reflection_TestSampleClass3 extends ArrayObject { diff -Nru zend-framework-1.10.2/tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php zend-framework-1.10.3/tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php --- zend-framework-1.10.2/tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Soap/Wsdl/ArrayOfTypeComplexStrategyTest.php 2010-03-31 18:38:32.000000000 +0100 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayOfTypeComplexStrategyTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ArrayOfTypeComplexStrategyTest.php 21707 2010-03-31 17:38:32Z matthew $ */ require_once dirname(__FILE__)."/../../../TestHelper.php"; require_once dirname(__FILE__)."/../_files/commontypes.php"; @@ -227,7 +227,7 @@ $return = $this->wsdl->addComplexType("Zend_Soap_AutoDiscover_Recursion"); } catch(Exception $e) { $this->assertTrue($e instanceof Zend_Soap_Wsdl_Exception); - $this->assertEquals("Infinite recursion, cannot nest 'Zend_Soap_AutoDiscover_Recursion' into itsself.", $e->getMessage()); + $this->assertEquals("Infinite recursion, cannot nest 'Zend_Soap_AutoDiscover_Recursion' into itself.", $e->getMessage()); } } } diff -Nru zend-framework-1.10.2/tests/Zend/TimeSyncTest.php zend-framework-1.10.3/tests/Zend/TimeSyncTest.php --- zend-framework-1.10.2/tests/Zend/TimeSyncTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/TimeSyncTest.php 2010-03-31 18:38:37.000000000 +0100 @@ -17,19 +17,18 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TimeSyncTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TimeSyncTest.php 21708 2010-03-31 17:38:37Z matthew $ */ /** - * Zend_timeSync + * Test helper */ -require_once 'Zend/TimeSync.php'; +require_once dirname(__FILE__ ) . '/../TestHelper.php'; /** - * PHPUnit test case + * Zend_timeSync */ -require_once 'PHPUnit/Framework/TestCase.php'; - +require_once 'Zend/TimeSync.php'; /** * @category Zend diff -Nru zend-framework-1.10.2/tests/Zend/Tool/Project/ProfileTest.php zend-framework-1.10.3/tests/Zend/Tool/Project/ProfileTest.php --- zend-framework-1.10.2/tests/Zend/Tool/Project/ProfileTest.php 2010-01-18 19:11:49.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Tool/Project/ProfileTest.php 2010-03-31 18:38:42.000000000 +0100 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ProfileTest.php 20396 2010-01-18 19:11:49Z mabe $ + * @version $Id: ProfileTest.php 21709 2010-03-31 17:38:42Z matthew $ */ require_once dirname(__FILE__) . '/../../../TestHelper.php'; @@ -163,7 +163,7 @@ public function testProfileCanReturnStorageData() { $this->_standardProfileFromData->loadFromData(); - $expectedValue = ' '; + $expectedValue = ' '; $this->assertEquals($expectedValue, str_replace(array("\r\n", "\n"), '', $this->_standardProfileFromData->storeToData())); } diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/ArrayTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/ArrayTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/ArrayTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/ArrayTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ArrayTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ArrayTest.php 21662 2010-03-27 20:23:42Z thomas $ */ if (!defined('PHPUnit_MAIN_METHOD')) { @@ -99,7 +99,7 @@ public function testToString() { - $adapter = new Zend_Translate_Adapter_Array(array('msg1' => 'Message 1 (en)', 'msg2' => 'Message 2 (en)', 'msg3' => 'Message 3 (en)')); + $adapter = new Zend_Translate_Adapter_Array(array('msg1' => 'Message 1 (en)', 'msg2' => 'Message 2 (en)', 'msg3' => 'Message 3 (en)'), 'en'); $this->assertEquals('Array', $adapter->toString()); } @@ -156,6 +156,7 @@ array( 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.php', 'scan' => null, 'locale' => 'en', 'ignore' => '.', diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/CsvTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/CsvTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/CsvTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/CsvTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: CsvTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: CsvTest.php 21662 2010-03-27 20:23:42Z thomas $ */ /** @@ -131,6 +131,7 @@ 'delimiter' => ';', 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.csv', 'scan' => null, 'locale' => 'en', 'length' => 0, diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/GettextTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/GettextTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/GettextTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/GettextTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: GettextTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: GettextTest.php 21662 2010-03-27 20:23:42Z thomas $ */ /** @@ -134,6 +134,7 @@ array( 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.mo', 'scan' => null, 'locale' => 'en', 'ignore' => '.', diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/IniTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/IniTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/IniTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/IniTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: IniTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: IniTest.php 21662 2010-03-27 20:23:42Z thomas $ */ /** @@ -127,6 +127,7 @@ array( 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.ini', 'scan' => null, 'locale' => 'en', 'ignore' => '.', diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/QtTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/QtTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/QtTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/QtTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: QtTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: QtTest.php 21662 2010-03-27 20:23:42Z thomas $ */ /** @@ -126,6 +126,7 @@ array( 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.ts', 'scan' => null, 'locale' => 'en', 'ignore' => '.', diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/TbxTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/TbxTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/TbxTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/TbxTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TbxTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: TbxTest.php 21662 2010-03-27 20:23:42Z thomas $ */ /** @@ -125,6 +125,7 @@ array( 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.tbx', 'scan' => null, 'locale' => 'en', 'ignore' => '.', diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/TmxTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/TmxTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/TmxTest.php 2010-02-13 22:53:40.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/TmxTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: TmxTest.php 21050 2010-02-13 22:53:40Z thomas $ + * @version $Id: TmxTest.php 21662 2010-03-27 20:23:42Z thomas $ */ /** @@ -126,6 +126,7 @@ array( 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.tmx', 'scan' => null, 'locale' => 'en', 'ignore' => '.', diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/XliffTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/XliffTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/XliffTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/XliffTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XliffTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: XliffTest.php 21662 2010-03-27 20:23:42Z thomas $ */ /** @@ -126,6 +126,7 @@ array( 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.xliff', 'scan' => null, 'locale' => 'en', 'ignore' => '.', diff -Nru zend-framework-1.10.2/tests/Zend/Translate/Adapter/XmlTmTest.php zend-framework-1.10.3/tests/Zend/Translate/Adapter/XmlTmTest.php --- zend-framework-1.10.2/tests/Zend/Translate/Adapter/XmlTmTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Translate/Adapter/XmlTmTest.php 2010-03-27 20:23:42.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: XmlTmTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: XmlTmTest.php 21662 2010-03-27 20:23:42Z thomas $ */ /** @@ -126,6 +126,7 @@ array( 'testoption' => 'testkey', 'clear' => false, + 'content' => dirname(__FILE__) . '/_files/translation_en.xmltm', 'scan' => null, 'locale' => 'en', 'ignore' => '.', diff -Nru zend-framework-1.10.2/tests/Zend/TranslateTest.php zend-framework-1.10.3/tests/Zend/TranslateTest.php --- zend-framework-1.10.2/tests/Zend/TranslateTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/TranslateTest.php 2010-03-26 22:04:42.000000000 +0000 @@ -666,6 +666,72 @@ } /** + * @group ZF-9489 + */ + public function testAddingAdapterToSourcealsUsingOwnRule() + { + $translate = new Zend_Translate( + Zend_Translate::AN_ARRAY, + array('singular' => + array('plural_0 (en)', + 'plural_1 (en)', + 'plural_2 (en)', + 'plural_3 (en)'), + 'plural' => ''), 'en' + ); + + $this->assertFalse($translate->isTranslated('Message 1')); + $adapter = new Zend_Translate_Adapter_Gettext(dirname(__FILE__) . '/Translate/Adapter/_files/translation_en.mo', 'en'); + $translate->addTranslation($adapter); + + $this->assertTrue($adapter->isTranslated('Message 1')); + + $adapter2 = new Zend_Translate_Adapter_Gettext(dirname(__FILE__) . '/Translate/Adapter/_files/testmo/de_AT/LC_TEST/translation-de_DE.mo', 'de_AT'); + $adapter2->addTranslation(dirname(__FILE__) . '/Translate/Adapter/_files/translation_en2.mo', 'fr'); + $translate->addTranslation($adapter2, 'fr'); + + $languages = $translate->getList(); + $this->assertFalse(array_key_exists('de_AT', $languages)); + $this->assertTrue(array_key_exists('fr', $languages)); + } + + /** + * @group ZF-9500 + */ + public function testIgnoreMultipleDirectories() + { + $translate = new Zend_Translate( + Zend_Translate::AN_ARRAY, + dirname(__FILE__) . '/Translate/Adapter/_files/testArray/', + 'auto', + array( + 'scan' => Zend_Translate::LOCALE_FILENAME, + 'ignore' => array('.', 'ignoreme', 'LC_TEST') + ) + ); + + $langs = $translate->getList(); + $this->assertFalse(array_key_exists('de_DE', $langs)); + $this->assertTrue(array_key_exists('ja', $langs)); + $this->assertTrue(array_key_exists('en_US', $langs)); + + $translate2 = new Zend_Translate( + Zend_Translate::AN_ARRAY, + dirname(__FILE__) . '/Translate/Adapter/_files/testArray/', + 'auto', + array( + 'scan' => Zend_Translate::LOCALE_FILENAME, + 'ignore' => array('.', 'regex_1' => '/de_DE/', 'regex' => '/ja/') + ) + ); + + $langs = $translate2->getList(); + $this->assertFalse(array_key_exists('de_DE', $langs)); + $this->assertFalse(array_key_exists('ja', $langs)); + $this->assertTrue(array_key_exists('en_US', $langs)); + } + + /** * Ignores a raised PHP error when in effect, but throws a flag to indicate an error occurred * * @param integer $errno diff -Nru zend-framework-1.10.2/tests/Zend/Validate/CreditCardTest.php zend-framework-1.10.3/tests/Zend/Validate/CreditCardTest.php --- zend-framework-1.10.2/tests/Zend/Validate/CreditCardTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Validate/CreditCardTest.php 2010-03-19 19:00:50.000000000 +0000 @@ -249,6 +249,16 @@ $this->assertEquals(array('Zend_Validate_CreditCardTest', 'staticCallback'), $validator->getService()); } + /** + * @group ZF-9477 + */ + public function testMultiInstitute() { + $validator = new Zend_Validate_CreditCard(array('type' => Zend_Validate_CreditCard::MASTERCARD)); + $this->assertFalse($validator->isValid('4111111111111111')); + $message = $validator->getMessages(); + $this->assertContains('not from an allowed institute', current($message)); + } + public static function staticCallback($value) { return false; diff -Nru zend-framework-1.10.2/tests/Zend/Validate/File/MimeTypeTest.php zend-framework-1.10.3/tests/Zend/Validate/File/MimeTypeTest.php --- zend-framework-1.10.2/tests/Zend/Validate/File/MimeTypeTest.php 2010-01-16 15:37:35.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Validate/File/MimeTypeTest.php 2010-03-11 22:16:55.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: MimeTypeTest.php 20337 2010-01-16 15:37:35Z thomas $ + * @version $Id: MimeTypeTest.php 21472 2010-03-11 22:16:55Z thomas $ */ // Call Zend_Validate_File_MimeTypeTest::main() if this source file is executed directly. @@ -175,17 +175,18 @@ try { $validator->setMagicFile('/unknown/magic/file'); } catch (Zend_Validate_Exception $e) { - $this->assertContains('can not be read', $e->getMessage()); + $this->assertContains('can not be', $e->getMessage()); } - - $validator->setMagicFile(__FILE__); - $this->assertEquals(__FILE__, $validator->getMagicFile()); } public function testSetMagicFileWithinConstructor() { - $validator = new Zend_Validate_File_MimeType(array('image/gif', 'magicfile' => __FILE__)); - $this->assertEquals(__FILE__, $validator->getMagicFile()); + require_once 'Zend/Validate/Exception.php'; + try { + $validator = new Zend_Validate_File_MimeType(array('image/gif', 'magicfile' => __FILE__)); + } catch (Zend_Validate_Exception $e) { + // @ZF-9320: False Magic File is not allowed to be set + } } public function testOptionsAtConstructor() @@ -193,10 +194,8 @@ $validator = new Zend_Validate_File_MimeType(array( 'image/gif', 'image/jpg', - 'magicfile' => __FILE__, 'headerCheck' => true)); - $this->assertEquals(__FILE__, $validator->getMagicFile()); $this->assertTrue($validator->getHeaderCheck()); $this->assertEquals('image/gif,image/jpg', $validator->getMimeType()); } diff -Nru zend-framework-1.10.2/tests/Zend/Validate/FloatTest.php zend-framework-1.10.3/tests/Zend/Validate/FloatTest.php --- zend-framework-1.10.2/tests/Zend/Validate/FloatTest.php 2010-01-22 12:51:11.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Validate/FloatTest.php 2010-03-27 21:39:38.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: FloatTest.php 20516 2010-01-22 12:51:11Z thomas $ + * @version $Id: FloatTest.php 21664 2010-03-27 21:39:38Z thomas $ */ /** @@ -90,7 +90,6 @@ array(1.00, true), array(0.01, true), array(-0.1, true), - array('10.1', true), array(1, true), array('not a float', false), ); @@ -145,6 +144,7 @@ setlocale(LC_ALL, 'de'); $valid = new Zend_Validate_Float(); $this->assertTrue($valid->isValid(123,456)); + $this->assertTrue($valid->isValid('123,456')); } /** @@ -166,4 +166,14 @@ $valid = new Zend_Validate_Float(); $this->assertTrue($valid->isValid(10.5)); } + + /** + * @ZF-8919 + */ + public function testPhpLocaleDeStringType() + { + setlocale(LC_NUMERIC, 'de_AT'); + $valid = new Zend_Validate_Float(); + $this->assertTrue($valid->isValid('1,3')); + } } diff -Nru zend-framework-1.10.2/tests/Zend/Validate/RegexTest.php zend-framework-1.10.3/tests/Zend/Validate/RegexTest.php --- zend-framework-1.10.2/tests/Zend/Validate/RegexTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Validate/RegexTest.php 2010-03-19 19:45:26.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: RegexTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: RegexTest.php 21572 2010-03-19 19:45:26Z thomas $ */ @@ -96,12 +96,12 @@ */ public function testBadPattern() { - $validator = new Zend_Validate_Regex('/'); try { + $validator = new Zend_Validate_Regex('/'); $validator->isValid('anything'); $this->fail('Expected Zend_Validate_Exception not thrown for bad pattern'); } catch (Zend_Validate_Exception $e) { - $this->assertContains('Internal error matching pattern', $e->getMessage()); + $this->assertContains('Internal error while', $e->getMessage()); } } @@ -110,7 +110,7 @@ */ public function testNonStringValidation() { - $validator = new Zend_Validate_Regex('/'); + $validator = new Zend_Validate_Regex('/./'); $this->assertFalse($validator->isValid(array(1 => 1))); } } diff -Nru zend-framework-1.10.2/tests/Zend/Validate/Sitemap/ChangefreqTest.php zend-framework-1.10.3/tests/Zend/Validate/Sitemap/ChangefreqTest.php --- zend-framework-1.10.2/tests/Zend/Validate/Sitemap/ChangefreqTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Validate/Sitemap/ChangefreqTest.php 2010-03-07 09:38:41.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ChangefreqTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: ChangefreqTest.php 21365 2010-03-07 09:38:41Z thomas $ */ require_once 'PHPUnit/Framework/TestCase.php'; @@ -88,6 +88,8 @@ foreach ($values as $value) { $this->assertSame(false, $this->_validator->isValid($value)); + $messages = $this->_validator->getMessages(); + $this->assertContains('is no valid', current($messages)); } } @@ -103,6 +105,8 @@ foreach ($values as $value) { $this->assertSame(false, $this->_validator->isValid($value)); + $messages = $this->_validator->getMessages(); + $this->assertContains('should be a string', current($messages)); } } } diff -Nru zend-framework-1.10.2/tests/Zend/Validate/Sitemap/LastmodTest.php zend-framework-1.10.3/tests/Zend/Validate/Sitemap/LastmodTest.php --- zend-framework-1.10.2/tests/Zend/Validate/Sitemap/LastmodTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Validate/Sitemap/LastmodTest.php 2010-03-07 09:38:41.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LastmodTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LastmodTest.php 21365 2010-03-07 09:38:41Z thomas $ */ require_once 'PHPUnit/Framework/TestCase.php'; @@ -100,6 +100,8 @@ foreach ($values as $value) { $this->assertSame(false, $this->_validator->isValid($value)); + $messages = $this->_validator->getMessages(); + $this->assertContains('is no valid', current($messages)); } } @@ -115,6 +117,8 @@ foreach ($values as $value) { $this->assertSame(false, $this->_validator->isValid($value)); + $messages = $this->_validator->getMessages(); + $this->assertContains('should be a string', current($messages)); } } } diff -Nru zend-framework-1.10.2/tests/Zend/Validate/Sitemap/LocTest.php zend-framework-1.10.3/tests/Zend/Validate/Sitemap/LocTest.php --- zend-framework-1.10.2/tests/Zend/Validate/Sitemap/LocTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Validate/Sitemap/LocTest.php 2010-03-07 09:38:41.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: LocTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: LocTest.php 21365 2010-03-07 09:38:41Z thomas $ */ require_once 'PHPUnit/Framework/TestCase.php'; @@ -89,15 +89,32 @@ 'www.example.com', '/news/', '#', - new stdClass(), - 42, 'http:/example.com/', - null, 'https://www.exmaple.com/?foo="bar\'&bar=' ); foreach ($values as $value) { $this->assertSame(false, $this->_validator->isValid($value)); + $messages = $this->_validator->getMessages(); + $this->assertContains('is no valid', current($messages)); } } + + /** + * Tests values that are not strings + * + */ + public function testNotStrings() + { + $values = array( + 1, 1.4, null, new stdClass(), true, false + ); + + foreach ($values as $value) { + $this->assertSame(false, $this->_validator->isValid($value)); + $messages = $this->_validator->getMessages(); + $this->assertContains('should be a string', current($messages)); + } + } + } diff -Nru zend-framework-1.10.2/tests/Zend/Validate/Sitemap/PriorityTest.php zend-framework-1.10.3/tests/Zend/Validate/Sitemap/PriorityTest.php --- zend-framework-1.10.2/tests/Zend/Validate/Sitemap/PriorityTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Validate/Sitemap/PriorityTest.php 2010-03-07 09:38:41.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: PriorityTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: PriorityTest.php 21365 2010-03-07 09:38:41Z thomas $ */ require_once 'PHPUnit/Framework/TestCase.php'; @@ -82,14 +82,30 @@ public function testInvalidPriorities() { $values = array( - 'alwayz', '_hourly', 'Daily', 'wEekly', - 'mönthly ', ' yearly ', 'never ', 'rofl', - '0,0', '1.1', '02', '3', '01.4', '0.f', - 1.1, -0.001, 1.0001 + -1, -0.1, 1.1, 100, 10, 2, '3', '-4', ); foreach ($values as $value) { $this->assertSame(false, $this->_validator->isValid($value)); + $messages = $this->_validator->getMessages(); + $this->assertContains('is no valid', current($messages)); + } + } + + /** + * Tests values that are no numbers + * + */ + public function testNotNumbers() + { + $values = array( + null, new stdClass(), true, false, 'abcd', + ); + + foreach ($values as $value) { + $this->assertSame(false, $this->_validator->isValid($value)); + $messages = $this->_validator->getMessages(); + $this->assertContains('should be a integer', current($messages)); } } } diff -Nru zend-framework-1.10.2/tests/Zend/ValidateTest.php zend-framework-1.10.3/tests/Zend/ValidateTest.php --- zend-framework-1.10.2/tests/Zend/ValidateTest.php 2010-02-23 07:19:05.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/ValidateTest.php 2010-03-05 15:33:49.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: ValidateTest.php 21144 2010-02-23 07:19:05Z ralph $ + * @version $Id: ValidateTest.php 21340 2010-03-05 15:33:49Z thomas $ */ /** @@ -36,6 +36,11 @@ require_once 'Zend/Validate/Abstract.php'; /** + * @see Zend_Translate + */ +require_once 'Zend/Translate.php'; + +/** * @category Zend * @package Zend_Validate * @subpackage UnitTests @@ -208,6 +213,15 @@ $this->assertTrue(strlen($message) <= 5); } + public function testSetGetDefaultTranslator() + { + set_error_handler(array($this, 'errorHandlerIgnore')); + $translator = new Zend_Translate('array', array(), 'en'); + restore_error_handler(); + Zend_Validate_Abstract::setDefaultTranslator($translator); + $this->assertSame($translator->getAdapter(), Zend_Validate_Abstract::getDefaultTranslator()); + } + /** * Handle file not found errors * @@ -222,6 +236,21 @@ $this->error = true; } } + + /** + * Ignores a raised PHP error when in effect, but throws a flag to indicate an error occurred + * + * @param integer $errno + * @param string $errstr + * @param string $errfile + * @param integer $errline + * @param array $errcontext + * @return void + */ + public function errorHandlerIgnore($errno, $errstr, $errfile, $errline, array $errcontext) + { + $this->_errorOccurred = true; + } } diff -Nru zend-framework-1.10.2/tests/Zend/Wildfire/WildfireTest.php zend-framework-1.10.3/tests/Zend/Wildfire/WildfireTest.php --- zend-framework-1.10.2/tests/Zend/Wildfire/WildfireTest.php 2010-01-06 02:05:09.000000000 +0000 +++ zend-framework-1.10.3/tests/Zend/Wildfire/WildfireTest.php 2010-03-06 02:21:47.000000000 +0000 @@ -17,7 +17,7 @@ * @subpackage UnitTests * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: WildfireTest.php 20096 2010-01-06 02:05:09Z bkarwin $ + * @version $Id: WildfireTest.php 21353 2010-03-06 02:21:47Z cadorn $ */ if (!defined('PHPUnit_MAIN_METHOD')) { @@ -153,6 +153,14 @@ $this->_request->setUserAgentExtensionEnabled(false); $this->assertFalse($channel->isReady(true)); + + $this->_request->setUserAgentExtensionEnabled(true, 'User-Agent'); + + $this->assertTrue($channel->isReady(true)); + + $this->_request->setUserAgentExtensionEnabled(true, 'X-FirePHP-Version'); + + $this->assertTrue($channel->isReady(true)); } public function testIsReady2() @@ -166,6 +174,14 @@ $this->_request->setUserAgentExtensionEnabled(false); $this->assertFalse($channel->isReady()); + + $this->_request->setUserAgentExtensionEnabled(true, 'User-Agent'); + + $this->assertTrue($channel->isReady()); + + $this->_request->setUserAgentExtensionEnabled(true, 'X-FirePHP-Version'); + + $this->assertTrue($channel->isReady()); } public function testFirePhpPluginInstanciation() @@ -534,6 +550,36 @@ $rowOld)); } + /** + * @group ZF-6396 + */ + public function testTableMessage2() + { + $this->_setupWithoutFrontController(); + + $channel = Zend_Wildfire_Channel_HttpHeaders::getInstance(); + $protocol = $channel->getProtocol(Zend_Wildfire_Plugin_FirePhp::PROTOCOL_URI); + + $table = new Zend_Wildfire_Plugin_FirePhp_TableMessage('TestMessage'); + $table->setHeader(array('col1','col2')); + $table->setBuffered(true); + + Zend_Wildfire_Plugin_FirePhp::send($table); + + $cell = new ArrayObject(); + $cell->append("item1"); + $cell->append("item2"); + + $table->addRow(array("row1", $cell)); + + Zend_Wildfire_Channel_HttpHeaders::getInstance()->flush(); + + $messages = $protocol->getMessages(); + + $this->assertEquals($messages[Zend_Wildfire_Plugin_FirePhp::STRUCTURE_URI_FIREBUGCONSOLE] + [Zend_Wildfire_Plugin_FirePhp::PLUGIN_URI][0], + '[{"Type":"TABLE","Label":"TestMessage"},[["col1","col2"],["row1",{"__className":"ArrayObject","undeclared:0":"item1","undeclared:1":"item2"}]]]'); + } public function testMessageGroups() { @@ -969,20 +1015,28 @@ { protected $_enabled = false; + protected $_enabled_headerName = false; - public function setUserAgentExtensionEnabled($enabled) { + public function setUserAgentExtensionEnabled($enabled, $headerName = "User-Agent") { $this->_enabled = $enabled; + $this->_enabled_headerName = $headerName; } public function getHeader($header, $default = null) { - if ($header == 'User-Agent') { + if ($header == 'User-Agent' && $this->_enabled_headerName == 'User-Agent') { if ($this->_enabled) { return 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14 FirePHP/0.1.0'; } else { return 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14'; } + } else + if ($header == 'X-FirePHP-Version' && $this->_enabled_headerName == 'X-FirePHP-Version') { + if ($this->_enabled) { + return '0.1.0'; + } } + return null; } }