Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zf 1.12.10 Upgrade #1

Merged
merged 123 commits into from
Feb 6, 2015
Merged

zf 1.12.10 Upgrade #1

merged 123 commits into from
Feb 6, 2015

Conversation

anupdugar
Copy link

Merged Zend Framework 1.12.10 release.

weierophinney and others added 30 commits September 16, 2014 15:50
@weierophinney
Bump versions
4607991 
- Next dev version: 1.12.10dev
@Slamdunk
PHPUnit legacy: class_alias instead of include
f3774fa
@Slamdunk
Includes are still necessary
25a5e24
@Slamdunk
class_alias not present in PHP 5.2; down to subclassing
b8c0c33
@froschdesign
Fixes DocBlocks in Zend_Controller_Router - Closes zendframework#434
8b82bb5
@froschdesign
CS fixes in Zend_Controller_Router
233aa78
@froschdesign
Fixes zendframework#426 - Use relative filenames in Zend_Validate_Hos…
1efeedc 
…tname
@froschdesign
Fixes zendframework#427 - Setting cache options problems
901da6b
@mhujer
Update Zend_Validate_Hostname TLDs list to 2014102301 version
ab4023f
@froschdesign
Merge pull request zendframework#444 from mhujer/validate-hostname-up…
706687f 
…date

Update Zend_Validate_Hostname TLDs list to 2014102301 version
fix typo unkown -> unknown
46266f3
@froschdesign
Merge pull request zendframework#446 from aporat/typo
4a9d203 
fix typo unkown -> unknown
fix travis ci build for php 5.2
41619e3
@bkendig-disney
Add support for time strings without seconds.
c7a5cf6
@froschdesign
Merge pull request zendframework#448 from aporat/travis_php52_fix
94be5f4 
Fix Travis CI build for PHP 5.2
@bkendig-disney
Unit tests for the time format additions.
b430be5
@froschdesign
Fix wrong name for fluent interface - Closes zendframework#452
9b9fda8
@bkendig-disney
Merge branch 'master' of https://github.com/zendframework/zf1
a0c0349
@a-lucas
(fix): default:
79ce9f8
@a-lucas
(fix): Bug Fix zendframework#377
4613a81
@a-lucas
testing the verifyRequiredArgumner : add more test
1a4053d
@a-lucas
(fix): Formatting style checked and fixed according to http://framewo…
0fc9584 
…rk.zend.com/manual/1.12/en/coding-standard.coding-style.html
@ivan-ponomarev
Fixed bug in quoteInto with $count parameter and question sign in $value
7a4aa64
@froschdesign
Fixes DocBlocks in Zend_Feed_Pubsubhubbub
7c073ca 
Closes zendframework#456 and Closes zendframework#457
@froschdesign
Merge pull request zendframework#454 from a-lucas/master
dae96bd 
Zend_Console_Getopt: Missing required parameter consumes next option as its parameter value
@froschdesign
CS fixes in Zend_Console_Getopt
2b8d4cb
@froschdesign
Merge pull request zendframework#450 from bskendig/master
5eeb261 
[Zend_Date] Add support for time strings without seconds.
@froschdesign
Fixes unit test for Zend_Console_Getopt
63b594d
@froschdesign
Fixes some more unit tests for Zend_Console_Getopt
0739a34
@ivan-ponomarev
Fixed bug in quoteInto with $count parameter and question sign in $value
f8b0e58
froschdesign and others added 24 commits January 5, 2015 14:24
@froschdesign
Merge pull request zendframework#441 from Mayflower/nested-sql-functions
e78669d 
Loosen regex to allow nested function calls in SQL
@froschdesign
Fixes zendframework#187 - Zend_Rest_Server does not properly handle o…
3f7b1c9 
…ptional parameters
@froschdesign
Some CS fixes in Zend_Rest_Server
52cec2d
@froschdesign
Merge pull request zendframework#476 from ThomasWunderlich/475Zend_Se…
56d2679 
…rver_Exception_Enhancement

Fixes zendframework#475 - Enhance Zend_Server_Exception message
@froschdesign
Fixes zendframework#440 - Zend_Controller_Dispatcher_Abstract::_forma…
40dd702 
…tName() inconsistent with name handling
@froschdesign
Merge pull request zendframework#470 from mhujer/62-validate-idn-email
b32947c 
Zend_Validate_EmailAddress: IDN domains are converted to punnycode if possible
@froschdesign
Fixes magento#8 - Zend_Loader_ClassMapAutoloader is not auto included
1190634
@froschdesign
Fixes DocBlocks in Zend_Dom
6e54182
@froschdesign
Fixes DocBlocks in Zend_EventManager
90f4f15
@froschdesign
Fixes DocBlocks in Zend_Service_Rackspace_Files
c11f8e1 
Closes magento#22
@akrabat
Merge pull request zendframework#485 from froschdesign/hotfix/8
ba7ffb1 
Fixes magento#8 - Zend_Loader_ClassMapAutoloader is not auto included
@froschdesign
Adds missing main method in TestCase classes for Zend_Loader
b67c1eb
@froschdesign
Adds missing unit test for autoincluding the ClassMapAutoloader
6a53a89
@froschdesign
Allow overriding cache id and tag validation in Zend_Cache
a2ac014 
Closes zendframework#317
@froschdesign
Fixes zendframework#488 - Zend_Dojo_View_Helper_Dojo_Container setCdn…
f361349 
…Version
@akrabat
Merge pull request zendframework#487 from froschdesign/hotfix/317
eb05aa4 
Allow overriding cache id and tag validation in Zend_Cache
@froschdesign
CS fixes for Zend_Application_Resource
82aca66
@froschdesign
CS fixes in Zend_Application
c5f5228
@froschdesign
CS fixes in Zend_Application_Module_Autoloader
4b59373
@froschdesign
CS fixes in Zend_Application_Bootstrap_Bootstrap
1f5691e
@holtkamp
Added more specific return documentation for Pages
e84e6d2 
To improved code-completion in IDEs like PHPStorm
@froschdesign
Merge pull request zendframework#490 from holtkamp/patch-1
00b6560 
Added more specific return documentation for Zend_Navigation Pages
@weierophinney
[1.12.10] release preparation
60567ad 
- Removed dev designation
- Provided release date
@anupdugar
Merge tag 'release-1.12.10'
498ff6a 
Zend Framework 1.12.10

- [1: isLast not working as expected in Zend&zendframework#95;Service&zendframework#95;Amazon&zendframework#95;SimpleDb&zendframework#95;Page](zendframework#1)
- [8: Zend&zendframework#95;Loader&zendframework#95;ClassMapAutoloader is not auto included when using Zend&zendframework#95;Loader&zendframework#95;AutoloaderFactory::factory](zendframework#8)
- [15: Zend&zendframework#95;Db&zendframework#95;Table&zendframework#95;Abstract::delete does not delete from dependent table](zendframework#15)
- [32: Zend&zendframework#95;Soap&zendframework#95;Client has no 'exceptions' flag.](zendframework#32)
- [62: Zend&zendframework#95;Validate&zendframework#95;EmailAddress->&zendframework#95;validateMXRecords() fails on Umlaut-Domains](zendframework#62)
- [187: Zend&zendframework#95;Rest&zendframework#95;Server does not properly handle optional parameters when anonymous (arg1, etc) parameters are passed in](zendframework#187)
- [322: Zend&zendframework#95;Validate&zendframework#95;Hostname: disallowed Unicode code point](zendframework#322)
- [324: SlideShare API change some tag names.](zendframework#324)
- [345: CallbackHandler throws warning if WeakRef-extension not installed](zendframework#345)
- [377: Zend&zendframework#95;Console&zendframework#95;Getopt: Missing required parameter consumes next option as its parameter value](zendframework#377)
- [400: PHPUnit contraints: use real class names to help classmap generators](zendframework#400)
- [426: Use relative filenames for &zendframework#95;validIdns for direct include in Zend&zendframework#95;Validate&zendframework#95;Hostname](zendframework#426)
- [434: Corrected type of property &zendframework#95;currentRoute](zendframework#434)
- [440: Zend&zendframework#95;Controller&zendframework#95;Dispatcher&zendframework#95;Abstract::&zendframework#95;formatName() inconsistent with Action name handling](zendframework#440)
- [441: Loosen regex to allow nested function calls in SQL](zendframework#441)
- [444: Update Zend&zendframework#95;Validate&zendframework#95;Hostname TLDs list to 2014102301 version](zendframework#444)
- [446: fix typo unkown -> unknown](zendframework#446)
- [448: fix travis ci build for php 5.2](zendframework#448)
- [449: Zend&zendframework#95;Date doesn't create correct date when seconds are missing from 8601 format](zendframework#449)
- [452: "fluent", not "fluid"](zendframework#452)
- [453: Zend&zendframework#95;Cache&zendframework#95;Backend&zendframework#95;Memcached looks at "bytes", but Couchbase 1.x returns "mem&zendframework#95;used"](zendframework#453)
- [456: Documentation of Zend&zendframework#95;Feed&zendframework#95;Pubsubhubbub&zendframework#95;Model&zendframework#95;ModelAbstract](zendframework#456)
- [458: Fixed bug in quoteInto with $count parameter and question sign in $value](zendframework#458)
- [461: CDATA section for category elements in RSS feed](zendframework#461)
- [465: Zend&zendframework#95;Currency creates invalid cache ids for values with fractions](zendframework#465)
- [467: debug&zendframework#95;backtrace() called twice when only once needed ](zendframework#467)
- [468: Zend&zendframework#95;Validate&zendframework#95;Hostname improvements](zendframework#468)
- [469: &zendframework#91;Zend&zendframework#95;Validate&zendframework#92; Testcase for zendframework#322](zendframework#469)
- [471: End of life for PHPUnit installation using pear](zendframework#471)
- [475: Zend Json Server Exception is missing the method name](zendframework#475)
- [478: Create .gitattributes to mirror archive { } in composer.json](zendframework#478)
- [480: Virtual machine doesn't install initial packages](zendframework#480)
- [483: Update copyright to 2015](zendframework#483)
- [484: Adds content headers on POST request in Zend&zendframework#95;Controller&zendframework#95;Request&zendframework#95;HTTP](zendframework#484)
- [487: Allow overriding cache id and tag validation in Zend&zendframework#95;Cache](zendframework#487)
- [488: Zend&zendframework#95;Dojo&zendframework#95;View&zendframework#95;Helper&zendframework#95;Dojo&zendframework#95;Container setCdnVersion error...](zendframework#488)
- [490: Added more specific return documentation for Zend&zendframework#95;Navigation Pages](zendframework#490)

# gpg verification failed.

Conflicts:
	README.md
	library/Zend/Application/Resource/Frontcontroller.php
	library/Zend/Application/Resource/Translate.php
	library/Zend/Barcode/Object/ObjectAbstract.php
	library/Zend/Controller/Router/Rewrite.php
	library/Zend/Db/Select.php
	library/Zend/EventManager/Filter/FilterIterator.php
	library/Zend/EventManager/GlobalEventManager.php
	library/Zend/Gdata/HttpAdapterStreamingProxy.php
	library/Zend/Mime/Part.php
	library/Zend/Mobile/Push/Message/Abstract.php
	library/Zend/Rest/Server.php
	library/Zend/Service/Rackspace/Files.php
	library/Zend/Service/SlideShare.php
	library/Zend/Test/PHPUnit/ControllerTestCase.php
	library/Zend/Validate/Hostname.php
	library/Zend/Version.php
vpelipenko added a commit that referenced this pull request Feb 6, 2015
@vpelipenko
Merge pull request #1 from anupdugar/master
d1e5cd8 
zf 1.12.10 Upgrade
@vpelipenko vpelipenko merged commit d1e5cd8 into magento:master Feb 6, 2015
danielrenaud pushed a commit that referenced this pull request Jul 26, 2019
Merge pull request #1 from magento-techdivision/feature/MC-16959-Warn…
b93bba5 
…ing-continue-in-switch

MC-16959: 4) Warning: 'continue' targeting switch
mmansoor-magento pushed a commit that referenced this pull request Dec 2, 2020
@fascinosum
Merge pull request #1 from magento/fixes-incorrect-cased-filename
6ad8150 
Fixes incorrectly cased filename of the Zend_Validate_Barcode_Intelli…
@JohnyRicio JohnyRicio mentioned this pull request Dec 10, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.