[Agavi-Commits] r4910 - in branches/david-httpcaching: . etc/olson/tzdata samples/app/config samples/app/modules/Confidential/config samples/app/modules/Default/config samples/app/modules/Disabled/config samples/app/modules/Products/config samples/test src src/build/templates/app/config src/build/templates/app/modules/config src/build/templates/defaults/app/modules/templates src/build/templates/defaults/app/modules/views src/config src/config/defaults src/config/xsd/parts src/config/xsl src/controller src/core src/database src/filter src/renderer src/request src/routing src/testing src/testing/PHPUnit/Constraint src/testing/templates src/translation/data/timezones src/util src/validator test test/config test/sandbox/app/config test/sandbox/app/modules/ControllerTests/config test/tests/unit/config test/tests/unit/date test/tests/unit/util test/tests/unit/validator tests2 tests2/AllTests tests2/action tests2/config tests2/controller tests2/core tests2/database tests2/routing

[com...@lists.agavi.org]

Author: david
Date: 2011-12-26 17:19:15 +0100 (Mon, 26 Dec 2011)
New Revision: 4910

Added:
branches/david-httpcaching/src/testing/AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility.class.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Juba.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hebron.php
branches/david-httpcaching/src/util/AgaviAutoloader.class.php
branches/david-httpcaching/test/tests/unit/util/AgaviInflectorTest.php
Modified:
branches/david-httpcaching/
branches/david-httpcaching/CHANGELOG
branches/david-httpcaching/CHANGELOG-1.0
branches/david-httpcaching/RELEASE_NOTES
branches/david-httpcaching/RELEASE_NOTES-1.0
branches/david-httpcaching/UPGRADING
branches/david-httpcaching/etc/olson/tzdata/africa
branches/david-httpcaching/etc/olson/tzdata/asia
branches/david-httpcaching/etc/olson/tzdata/australasia
branches/david-httpcaching/etc/olson/tzdata/backward
branches/david-httpcaching/etc/olson/tzdata/europe
branches/david-httpcaching/etc/olson/tzdata/northamerica
branches/david-httpcaching/etc/olson/tzdata/southamerica
branches/david-httpcaching/samples/app/config/autoload.xml
branches/david-httpcaching/samples/app/modules/Confidential/config/autoload.xml
branches/david-httpcaching/samples/app/modules/Default/config/autoload.xml
branches/david-httpcaching/samples/app/modules/Disabled/config/autoload.xml
branches/david-httpcaching/samples/app/modules/Products/config/autoload.xml
branches/david-httpcaching/samples/test/run-tests.php
branches/david-httpcaching/src/agavi.php
branches/david-httpcaching/src/build/templates/app/config/autoload.xml.tmpl
branches/david-httpcaching/src/build/templates/app/modules/config/autoload.xml.tmpl
branches/david-httpcaching/src/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl
branches/david-httpcaching/src/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl
branches/david-httpcaching/src/config/AgaviAutoloadConfigHandler.class.php
branches/david-httpcaching/src/config/AgaviConfigCache.class.php
branches/david-httpcaching/src/config/AgaviXmlConfigParser.class.php
branches/david-httpcaching/src/config/defaults/autoload.xml
branches/david-httpcaching/src/config/defaults/compile.xml
branches/david-httpcaching/src/config/xsd/parts/autoload.xsd
branches/david-httpcaching/src/config/xsd/parts/filters.xsd
branches/david-httpcaching/src/config/xsl/autoload.xsl
branches/david-httpcaching/src/config/xsl/validators.xsl
branches/david-httpcaching/src/controller/AgaviController.class.php
branches/david-httpcaching/src/core/Agavi.class.php
branches/david-httpcaching/src/database/AgaviDoctrine2Database.class.php
branches/david-httpcaching/src/database/AgaviDoctrine2dbalDatabase.class.php
branches/david-httpcaching/src/database/AgaviDoctrine2ormDatabase.class.php
branches/david-httpcaching/src/database/AgaviDoctrineDatabase.class.php
branches/david-httpcaching/src/database/AgaviMysqlDatabase.class.php
branches/david-httpcaching/src/database/AgaviMysqliDatabase.class.php
branches/david-httpcaching/src/database/AgaviPdoDatabase.class.php
branches/david-httpcaching/src/database/AgaviPostgresqlDatabase.class.php
branches/david-httpcaching/src/database/AgaviPropelDatabase.class.php
branches/david-httpcaching/src/database/AgaviSqlsrvDatabase.class.php
branches/david-httpcaching/src/database/AgaviZendclouddocumentserviceDatabase.class.php
branches/david-httpcaching/src/filter/AgaviExecutionFilter.class.php
branches/david-httpcaching/src/filter/AgaviFormPopulationFilter.class.php
branches/david-httpcaching/src/filter/AgaviSecurityFilter.class.php
branches/david-httpcaching/src/filter/AgaviTidyFilter.class.php
branches/david-httpcaching/src/renderer/AgaviPhptalRenderer.class.php
branches/david-httpcaching/src/renderer/AgaviSmartyRenderer.class.php
branches/david-httpcaching/src/request/AgaviConsoleRequest.class.php
branches/david-httpcaching/src/request/AgaviConsoleRequestDataHolder.class.php
branches/david-httpcaching/src/request/AgaviUploadedFile.class.php
branches/david-httpcaching/src/request/AgaviWebRequest.class.php
branches/david-httpcaching/src/request/AgaviWebRequestDataHolder.class.php
branches/david-httpcaching/src/routing/AgaviWebRouting.class.php
branches/david-httpcaching/src/testing.php
branches/david-httpcaching/src/testing/AgaviFlowTestCase.class.php
branches/david-httpcaching/src/testing/AgaviFragmentTestCase.class.php
branches/david-httpcaching/src/testing/AgaviTesting.class.php
branches/david-httpcaching/src/testing/AgaviUnitTestCase.class.php
branches/david-httpcaching/src/testing/AgaviViewTestCase.class.php
branches/david-httpcaching/src/testing/PHPUnit/Constraint/AgaviConstraintActionHandlesMethod.php
branches/david-httpcaching/src/testing/PHPUnit/Constraint/AgaviConstraintViewHandlesOutputType.php
branches/david-httpcaching/src/testing/templates/TestCaseMethod.tpl
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Abidjan.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Accra.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Addis_Ababa.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Algiers.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Asmara.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bamako.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bangui.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Banjul.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bissau.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Blantyre.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Brazzaville.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bujumbura.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Cairo.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Casablanca.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ceuta.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Conakry.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Dakar.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Dar_es_Salaam.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Djibouti.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Douala.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_El_Aaiun.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Freetown.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Gaborone.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Harare.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Johannesburg.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kampala.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Khartoum.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kigali.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kinshasa.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lagos.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Libreville.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lome.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Luanda.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lubumbashi.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lusaka.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Malabo.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Maputo.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Maseru.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Mbabane.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Mogadishu.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Monrovia.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Nairobi.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ndjamena.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Niamey.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Nouakchott.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ouagadougou.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Porto_45_Novo.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Sao_Tome.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Tripoli.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Tunis.php
branches/david-httpcaching/src/translation/data/timezones/Africa_47_Windhoek.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Adak.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Anchorage.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Anguilla.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Antigua.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Araguaina.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Buenos_Aires.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Catamarca.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Cordoba.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Jujuy.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_La_Rioja.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Mendoza.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Rio_Gallegos.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Salta.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_San_Juan.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_San_Luis.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Tucuman.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Ushuaia.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Aruba.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Asuncion.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Atikokan.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Bahia.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Bahia_Banderas.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Barbados.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Belem.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Belize.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Blanc_45_Sablon.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Boa_Vista.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Bogota.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Boise.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Cambridge_Bay.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Campo_Grande.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Cancun.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Caracas.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Cayenne.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Cayman.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Chicago.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Chihuahua.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Costa_Rica.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Cuiaba.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Curacao.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Danmarkshavn.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Dawson.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Dawson_Creek.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Denver.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Detroit.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Dominica.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Edmonton.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Eirunepe.php
branches/david-httpcaching/src/translation/data/timezones/America_47_El_Salvador.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Fortaleza.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Glace_Bay.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Godthab.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Goose_Bay.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Grand_Turk.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Grenada.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Guadeloupe.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Guatemala.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Guayaquil.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Guyana.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Halifax.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Havana.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Hermosillo.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Indianapolis.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Knox.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Marengo.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Petersburg.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Tell_City.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Vevay.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Vincennes.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Winamac.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Inuvik.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Iqaluit.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Jamaica.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Juneau.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Kentucky_47_Louisville.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Kentucky_47_Monticello.php
branches/david-httpcaching/src/translation/data/timezones/America_47_La_Paz.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Lima.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Los_Angeles.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Maceio.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Managua.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Manaus.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Martinique.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Matamoros.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Mazatlan.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Menominee.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Merida.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Metlakatla.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Mexico_City.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Miquelon.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Moncton.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Monterrey.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Montevideo.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Montreal.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Montserrat.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Nassau.php
branches/david-httpcaching/src/translation/data/timezones/America_47_New_York.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Nipigon.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Nome.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Noronha.php
branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_Beulah.php
branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_Center.php
branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_New_Salem.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Ojinaga.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Panama.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Pangnirtung.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Paramaribo.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Phoenix.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Port_45_au_45_Prince.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Port_of_Spain.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Porto_Velho.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Puerto_Rico.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Rainy_River.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Rankin_Inlet.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Recife.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Regina.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Resolute.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Rio_Branco.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Santa_Isabel.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Santarem.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Santiago.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Santo_Domingo.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Sao_Paulo.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Scoresbysund.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Sitka.php
branches/david-httpcaching/src/translation/data/timezones/America_47_St_Johns.php
branches/david-httpcaching/src/translation/data/timezones/America_47_St_Kitts.php
branches/david-httpcaching/src/translation/data/timezones/America_47_St_Lucia.php
branches/david-httpcaching/src/translation/data/timezones/America_47_St_Thomas.php
branches/david-httpcaching/src/translation/data/timezones/America_47_St_Vincent.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Swift_Current.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Tegucigalpa.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Thule.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Thunder_Bay.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Tijuana.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Toronto.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Tortola.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Vancouver.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Whitehorse.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Winnipeg.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Yakutat.php
branches/david-httpcaching/src/translation/data/timezones/America_47_Yellowknife.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aden.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Almaty.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Amman.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Anadyr.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aqtau.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aqtobe.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ashgabat.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Baghdad.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bahrain.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Baku.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bangkok.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Beirut.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bishkek.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Brunei.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Choibalsan.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Chongqing.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Colombo.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Damascus.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dhaka.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dili.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dubai.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dushanbe.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Gaza.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Harbin.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ho_Chi_Minh.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hong_Kong.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hovd.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Irkutsk.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jakarta.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jayapura.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jerusalem.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kabul.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kamchatka.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Karachi.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kashgar.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kathmandu.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kolkata.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Krasnoyarsk.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuala_Lumpur.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuching.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuwait.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Macau.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Magadan.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Makassar.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Manila.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Muscat.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Nicosia.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Novokuznetsk.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Novosibirsk.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Omsk.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Oral.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Phnom_Penh.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Pontianak.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Pyongyang.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Qatar.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Qyzylorda.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Rangoon.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Riyadh.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Sakhalin.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Samarkand.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Seoul.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Shanghai.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Singapore.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Taipei.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tashkent.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tbilisi.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tehran.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Thimphu.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tokyo.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ulaanbaatar.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Urumqi.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Vientiane.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Vladivostok.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yakutsk.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yekaterinburg.php
branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yerevan.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Azores.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Bermuda.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Canary.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Cape_Verde.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Faroe.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Madeira.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Reykjavik.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_South_Georgia.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_St_Helena.php
branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Stanley.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Adelaide.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Brisbane.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Broken_Hill.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Currie.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Darwin.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Eucla.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Hobart.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Lindeman.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Lord_Howe.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Melbourne.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Perth.php
branches/david-httpcaching/src/translation/data/timezones/Australia_47_Sydney.php
branches/david-httpcaching/src/translation/data/timezones/CET.php
branches/david-httpcaching/src/translation/data/timezones/CST6CDT.php
branches/david-httpcaching/src/translation/data/timezones/EET.php
branches/david-httpcaching/src/translation/data/timezones/EST.php
branches/david-httpcaching/src/translation/data/timezones/EST5EDT.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Amsterdam.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Andorra.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Athens.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Belgrade.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Berlin.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Brussels.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Bucharest.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Budapest.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Chisinau.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Copenhagen.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Dublin.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Gibraltar.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Helsinki.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Istanbul.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Kaliningrad.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Kiev.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Lisbon.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_London.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Luxembourg.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Madrid.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Malta.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Minsk.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Monaco.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Moscow.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Oslo.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Paris.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Prague.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Riga.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Rome.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Samara.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Simferopol.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Sofia.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Stockholm.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Tallinn.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Tirane.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Uzhgorod.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vaduz.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vienna.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vilnius.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Volgograd.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Warsaw.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Zaporozhye.php
branches/david-httpcaching/src/translation/data/timezones/Europe_47_Zurich.php
branches/david-httpcaching/src/translation/data/timezones/HST.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Antananarivo.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Chagos.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Christmas.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Cocos.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Comoro.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mahe.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Maldives.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mauritius.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mayotte.php
branches/david-httpcaching/src/translation/data/timezones/Indian_47_Reunion.php
branches/david-httpcaching/src/translation/data/timezones/MET.php
branches/david-httpcaching/src/translation/data/timezones/MST.php
branches/david-httpcaching/src/translation/data/timezones/MST7MDT.php
branches/david-httpcaching/src/translation/data/timezones/PST8PDT.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Apia.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Auckland.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Chatham.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Chuuk.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Easter.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Efate.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Enderbury.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Fakaofo.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Fiji.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Funafuti.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Galapagos.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Gambier.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Guadalcanal.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Guam.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Honolulu.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Johnston.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kiritimati.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kosrae.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kwajalein.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Majuro.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Marquesas.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Midway.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Nauru.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Niue.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Norfolk.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Noumea.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pago_Pago.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Palau.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pitcairn.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pohnpei.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Port_Moresby.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Rarotonga.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Saipan.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tahiti.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tarawa.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tongatapu.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Wake.php
branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Wallis.php
branches/david-httpcaching/src/translation/data/timezones/WET.php
branches/david-httpcaching/src/translation/data/timezones/zonelist.php
branches/david-httpcaching/src/util/AgaviInflector.class.php
branches/david-httpcaching/src/validator/AgaviBooleanValidator.class.php
branches/david-httpcaching/src/validator/AgaviDependencyManager.class.php
branches/david-httpcaching/src/validator/AgaviValidator.class.php
branches/david-httpcaching/test/config/suites.xml
branches/david-httpcaching/test/run-tests.php
branches/david-httpcaching/test/sandbox/app/config/autoload.xml
branches/david-httpcaching/test/sandbox/app/modules/ControllerTests/config/autoload.xml
branches/david-httpcaching/test/tests/unit/config/AgaviConfigTest.php
branches/david-httpcaching/test/tests/unit/date/AgaviTimezoneTest.php
branches/david-httpcaching/test/tests/unit/util/AgaviToolkitTest.php
branches/david-httpcaching/test/tests/unit/validator/AgaviBooleanValidatorTest.php
branches/david-httpcaching/tests2/AllTests.php
branches/david-httpcaching/tests2/AllTests/RoutingTests.php
branches/david-httpcaching/tests2/action/ActionStackTest.php
branches/david-httpcaching/tests2/config/DatabaseConfigHandlerTest.php
branches/david-httpcaching/tests2/config/FactoryConfigHandlerTest.php
branches/david-httpcaching/tests2/config/FilterConfigHandlerTest.php
branches/david-httpcaching/tests2/config/LoggingConfigHandlerTest.php
branches/david-httpcaching/tests2/controller/ControllerTest.php
branches/david-httpcaching/tests2/core/ContextTest.php
branches/david-httpcaching/tests2/database/DatabaseManagerTest.php
branches/david-httpcaching/tests2/routing/WebRoutingTest.php
Log:
sync trunk

Property changes on: branches/david-httpcaching
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.0:2658-4781
/branches/config-1.1:4687-4733
/branches/david-azure:4475-4478
/branches/david-numbers:4397-4455
/trunk:4759-4814
+ /branches/1.0:2658-4906
/branches/config-1.1:4687-4733
/branches/david-azure:4475-4478
/branches/david-numbers:4397-4455
/trunk:4759-4909

Modified: branches/david-httpcaching/CHANGELOG
===================================================================
--- branches/david-httpcaching/CHANGELOG 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/CHANGELOG 2011-12-26 16:19:15 UTC (rev 4910)
@@ -4,6 +4,13 @@
1.1.0 beta1 (June ??, 2009)
---------------------------

+ADD: Support arbitrary "provides" and "depends" validator options with access to argument base parts (#1199) (David)
+ADD: Allow calls to PHP functions in configuration file transformations (#1456) (David)
+ADD: PSR-0 compatible namespaces autoloader (#1454) (David)
+ADD: Allow validators to specify result code for exported data (#1453) (David)
+ADD: Allow validators to export to a different source (#1419) (David)
+ADD: Automatically read from STDIN in AgaviConsoleRequest (#1437) (David)
+ADD: Streams support in AgaviUploadedFile (#1449) (David)
ADD: Make filter chains and their filters accessible via an API (#1418) (David)
ADD: Allow MIME type checks in AgaviBaseFileValidator (#1342) (David)
ADD: Allow checking of MIME type in AgaviUploadedFile (#1407) (David)
@@ -15,9 +22,13 @@
ADD: Add support for custom filesystem layouts for modules to the project configuration system (#874) (Noah)
ADD: Response attributes (#1062) (David, TANAKA Koichi)

+CHG: Remove unlinking of temporary files in AgaviUploadedFile destructor (#1452) (David)
+CHG: Overhaul default values in AgaviUploadedFile constructor (#1451) (David)
+CHG: Move cleanup and wrapping of uploaded files from AgaviWebRequestDataHolder to AgaviWebRequest (#1450) (David)
+CHG: Exit by default in AgaviTesting::dispatch() (#1446) (David)
+CHG: Refactor request input handling to avoid disk writes (#1412) (David)
CHG: Deprecate support for property access in AgaviUploadedFile (#1408) (David)
CHG: Deprecate AgaviFilter::executeOnce() (#1410) (David)
-CHG: Refactor HTTP request body handling to avoid disk writes (#1412) (David)
CHG: Deprecate support for PHPTAL versions older than 1.2 in AgaviPhptalRenderer (#1416) (David)
CHG: Deprecate support for Doctrine versions older than 1.2 in AgaviDoctrineDatabase (#1414) (David)
CHG: Remove call overload and ArrayObject usage from AgaviUploadedFile (#1287) (David)

Modified: branches/david-httpcaching/CHANGELOG-1.0
===================================================================
--- branches/david-httpcaching/CHANGELOG-1.0 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/CHANGELOG-1.0 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,6 +1,51 @@
AGAVI CHANGELOG (1.0.x)
=======================

+1.0.7 (December 22, 2011)
+-------------------------
+
+ADD: Configurable context for AgaviFlowTestCase (#1465) (David)
+
+CHG: Redesign welcome page (#1464) (David)
+
+
+1.0.7 RC2 (December 14, 2011)
+-----------------------------
+
+CHG: Add missing interfaces to default compile.xml (#1462) (David)
+CHG: Guarantee order of form population and give preferential treatment to automatically re-populated forms (#1461) (David)
+CHG: Update singular and plural rules in AgaviInflector (#1460) (David)
+
+FIX: Inflector does not handle uncountable words as part of strings (#1459) (David)
+FIX: Fatal errors with PHPUnit 3.6 (#1457) (David)
+
+
+1.0.7 RC1 (November 20, 2011)
+-----------------------------
+
+ADD: Optional argument for AgaviTesting::dispatch() to trigger exit with status code (#1444) (David)
+ADD: Pass through "configuration" command line option to PHPUnit (#1439) (David)
+ADD: Configuration option for character encoding in AgaviPhpTalRenderer (#1428) (David)
+
+CHG: AgaviConsoleRequest should not populate $_FILES superglobal when processing STDIN content (#1448) (David)
+CHG: Return test result from AgaviTesting::dispatch() (#1445) (David)
+CHG: Remove function_exists check for spl_object_hash (#1441) (David)
+CHG: Remove function_exists check for get_magic_quotes_gpc (#1440) (David)
+CHG: Update timezone database to 2011n (#1430) (David)
+CHG: Rephrase exception message about missing XSL extension to be more descriptive (#1426) (David)
+CHG: Do not call getCredentials() if Action is not "secure" (#1400) (David)
+
+FIX: AgavConsoleRequest creates array instead of AgaviUploadedFile for STDIN contents (#1447) (David)
+FIX: AgaviSmartyRenderer fails to detect Smarty version 3.1 or later (#1438) (David)
+FIX: AgaviSqlsrvDatabase does not assign resource property (#1443) (David)
+FIX: AgaviPdoDatabase does not assign resource property (#1442) (David)
+FIX: Several database adapters don't clean up connection and resource properties on shutdown (#1433) (David)
+FIX: Doctrine database adapter won't trigger connect() on getResource() call (#1434) (David)
+FIX: Doctrine2 database adapters won't trigger connect() on getResource() call (#1432) (David)
+FIX: AgaviViewTestCase calls undefined method (#1424) (David, Markus Lervik)
+FIX: Exporting and value casting behavior swapped in AgaviBooleanValidator (#1422) (Dominik)
+
+
1.0.6 (July 23, 2011)
---------------------

Modified: branches/david-httpcaching/RELEASE_NOTES
===================================================================
--- branches/david-httpcaching/RELEASE_NOTES 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/RELEASE_NOTES 2011-12-26 16:19:15 UTC (rev 4910)
@@ -24,6 +24,17 @@
--------
Support for Propel versions prior to 1.3 has been dropped from AgaviPropelDatabase. AgaviCreoleDatabase has been removed.

+Validators
+----------
+It is now possible to export request data arguments to a different source. This is done by either passing an AgaviValidationArgument object as the second argument to AgaviValidator::export(), or, if the validator does not provide an argument name or only a name, but not an object, via the "export_to_source" parameter of the validator.
+Furthermore, a new third parameter in AgaviValidator::export() now accepts the result code to use when exporting; it defaults to AgaviValidator::SUCCESS and may be used to for instance require validation of the exported value by using AgaviValidator::NOT_PROCESSED.
+
+The "provides" and "depends" options of a validator now take an sprintf() string where you can use position specifiers to access parts of the argument base.
+This means that having a "provides" value of "foobar" with an argument base of "foo[]" will now provide into "foobar" for every iteration, and not into "foo[$key][foobar]" like in 1.0. To get this old behavior back in this example, you'd have to use "foo[%2$s][foobar]" or "%1$s[%2$s][foobar]" as the value for "provides". The referencing of argument base parts works exactly like in "export" strings.
+For "depends", the exact same syntax and behavior is now used; the old behavior was for a plain "foobar" to depend on just "foobar" no matter the argument base, and for "[foobar]" with an argument base of "foo[]" to depend on "foo[$key][foobar]", which was a bit confusing and also meant that you could only ever depend on provides from the same argument base. To depend on the "provides" results for the same keys as in the example above, you would again use "foo[%2$s][foobar]" or "%1$s[%2$s][foobar]" (but if we assume that this second validator had "lulz[]" as the argument base, then only "foo[%2$s][foobar]" would work of course).
+If your validation config is from the 1.0 namespace, then the old behavior is retained automatically, so if you want to take advantage of this new functionality, you must bump the config namespace to 1.1.
+Some more examples can be found in ticket #1199 (and also in #1073 where the same syntax is discussed for the exporting feature).
+
Filters
-------
AgaviIFilter::executeOnce() has been deprecated; in most cases, you can simply use execute() instead, see UPGRADING for further information.
@@ -32,6 +43,10 @@

Filter chains now expose an interface to access individual filters by name via AgaviFilterChain::getFilter(); this allows filters to expose an API to adjust runtime behavior (e.g. for AgaviFormPopulationFilter as a more convenient alternative to request attributes). AgaviFilterChain::getType() now returns the type of the filter chain (AgaviFilterChain::TYPE_GLOBAL or AgaviFilterChain::TYPE_ACTION) so dual-use (global and action) filters can detect the calling context.

+Autoloading
+-----------
+Agavi's autoloader has been moved to its own class and gained the ability to autoload namespaces. This functionality is compliant with the PSR-0 specification. The <autoload> element in namespace http://agavi.org/agavi/config/parts/autoload/1.1 now allows either a "class" attribute specifying a class name (in which case the element value is the path to the file containing that class) or a "namespace" attribute specifying a namespace prefix (in which case the element value is the path containing the files for that namespace). XSL transformations will transparently convert <autoload> elements with a "name" attribute from older namespaces to the latest version.
+
AgaviReturnArrayConfigHandler
-----------------------------
RACH is now an AgaviXmlConfigHandler and fully namespace aware. Transformations are automatically added in most cases for config files used with previous Agavi versions. Refer to UPGRADING for details.
@@ -48,3 +63,7 @@
<xi:include href="%core.module_dir%/{WinningModule,*}/config/routing.xml" />
For any path matched, the <xi:include /> element will be duplicated with the expanded path inserted into the href attribute.
Duplicates are removed, so the "WinningModule" entry matched by the "*" wildcard alternative in the last example will not be included a second time.
+
+Testing
+-------
+AgaviTesting::dispatch() now calls exit() with an appropriate shell exit code to indicate success or failures/errors by default; pass false as the second argument to prevent this behavior.
\ No newline at end of file

Modified: branches/david-httpcaching/RELEASE_NOTES-1.0
===================================================================
--- branches/david-httpcaching/RELEASE_NOTES-1.0 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/RELEASE_NOTES-1.0 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,6 +1,24 @@
AGAVI RELEASE NOTES (1.0.x)
===========================

+Version 1.0.7 - December 22, 2011
+=================================
+
+The getCredentials() method on an Action is no longer called unconditionally (i.e. whether or not the isSecure() method returned false) but only if the Action is "secure".
+
+It is now possible to manually call shutdown() on any database adapter to close the underlying connection; another call to getConnection() will cause a reconnect.
+
+AgaviFormPopulationFilter will now populate multiple forms in the order specified in the "populate" request attribute (when populating via an array with form IDs as keys and parameter holders as values) in namespace "org.agavi.filter.FormPopulationFilter"); however, if the value for a key in the "populate" array is boolean true (to re-populate from request data), this form will always be handled first, so error messages are inserted on that form first.
+
+Testing is now compatible with both PHPUnit 3.5 and 3.6. If you want to specify code coverage filters, AgaviTesting::getCodeCoverageFilter() returns the correct instance (singleton or not depending on the PHPUnit version) for you to use. A base constraint class named "AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility" can be used for constraints that work with both PHPUnit 3.5 and 3.6; if you implement the new matches() method introduced in PHPUnit 3.6 instead of the old evaluate(), it will automatically be called in the proper fashion depending on the PHPUnit version.
+
+AgaviTesting::dispatch() can now call exit() with the appropriate shell status code (the same as returned by a vanilla PHPUnit run) to indicate success or failures/errors to the calling process. This behavior is triggered when the new optional second argument, defaulting to false, is set to true. If set to false, it returns the PHPUnit result object that may be used by custom code to perform further analysis of the test run.
+
+Several other minor changes and fixes are included in this release as well; most notably, AgaviBooleanValidator's casting and exporting logic has been repaired, and AgaviConsoleRequest now properly creates an AgaviUploadedFile object with STDIN contents (when configured to read those) instead of a plain array. The PHPTAL renderer now supports configuration of character encoding via parameter "encoding".
+
+The timezone database was updated to version 2011n.
+
+
Version 1.0.6 - July 23, 2011
=============================

Modified: branches/david-httpcaching/UPGRADING
===================================================================
--- branches/david-httpcaching/UPGRADING 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/UPGRADING 2011-12-26 16:19:15 UTC (rev 4910)
@@ -16,6 +16,10 @@
--------
If you are using custom implementations of AgaviResponse, please make sure to update the merge() method to call parent::merge(). This method was previously declared abstract, but since Agavi 1.1 it contains the necessary code to perform merging of response attributes.

+Autoloading
+-----------
+AgaviAutoloader now performs autoloads; class maps or namespaces prefixes may be registered. Namespace autoloading is compliant with the PSR-0 specification. The <autoload> element in namespace http://agavi.org/agavi/config/parts/autoload/1.1 now allows either a "class" attribute specifying a class name (in which case the element value is the path to the file containing that class) or a "namespace" attribute specifying a namespace prefix (in which case the element value is the path containing the files for that namespace). XSL transformations will transparently convert <autoload> elements with a "name" attribute from older namespaces to the latest version.
+
AgaviReturnArrayConfigHandler
-----------------------------
RACH has been ported to the new-style configuration handler system introduced in Agavi 1.0, and expects your configuration contents to be wrapped in <ae:configurations>/<ae:configuration> elements, like all other Agavi configuration files. The actual content elements must be in no namespace, unless configured otherwise.

Modified: branches/david-httpcaching/etc/olson/tzdata/africa
===================================================================
--- branches/david-httpcaching/etc/olson/tzdata/africa 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/etc/olson/tzdata/africa 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,5 +1,5 @@
# <pre>
-# @(#)africa 8.31
+# @(#)africa 8.33
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.

@@ -58,7 +58,7 @@
# I invented the following abbreviations; corrections are welcome!
# 2:00 WAST West Africa Summer Time
# 2:30 BEAT British East Africa Time (no longer used)
-# 2:44:45 BEAUT British East Africa Unified Time (no longer used)
+# 2:45 BEAUT British East Africa Unified Time (no longer used)
# 3:00 CAST Central Africa Summer Time (no longer used)
# 3:00 SAST South Africa Summer Time (no longer used)
# 3:00 EAT East Africa Time
@@ -396,7 +396,7 @@
Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul
3:00 - EAT 1930
2:30 - BEAT 1940
- 2:44:45 - BEAUT 1960
+ 2:45 - BEAUT 1960
3:00 - EAT

# Lesotho
@@ -957,6 +957,11 @@
2:00 Sudan CA%sT 2000 Jan 15 12:00
3:00 - EAT

+# South Sudan
+Zone Africa/Juba 2:06:24 - LMT 1931
+ 2:00 Sudan CA%sT 2000 Jan 15 12:00
+ 3:00 - EAT
+
# Swaziland
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar
@@ -966,7 +971,7 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Dar_es_Salaam 2:37:08 - LMT 1931
3:00 - EAT 1948
- 2:44:45 - BEAUT 1961
+ 2:45 - BEAUT 1961
3:00 - EAT

# Togo
@@ -1092,7 +1097,7 @@
Zone Africa/Kampala 2:09:40 - LMT 1928 Jul
3:00 - EAT 1930
2:30 - BEAT 1948
- 2:44:45 - BEAUT 1957
+ 2:45 - BEAUT 1957
3:00 - EAT

# Zambia

Modified: branches/david-httpcaching/etc/olson/tzdata/asia
===================================================================
--- branches/david-httpcaching/etc/olson/tzdata/asia 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/etc/olson/tzdata/asia 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,4 +1,4 @@
-# @(#)asia 8.65
+# @(#)asia 8.69
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.

@@ -2194,7 +2194,47 @@
# http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
# </a>

+# From Steffen Thorsen (2011-08-26):
+# Gaza and the West Bank did go back to standard time in the beginning of
+# August, and will now enter daylight saving time again on 2011-08-30
+# 00:00 (so two periods of DST in 2011). The pause was because of
+# Ramadan.
+#
+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=416217">
+# http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
+# </a>
+# Additional info:
+# <a href="http://www.timeanddate.com/news/time/palestine-dst-2011.html">
+# http://www.timeanddate.com/news/time/palestine-dst-2011.html
+# </a>
+
+# From Alexander Krivenyshev (2011-08-27):
+# According to the article in The Jerusalem Post:
+# "...Earlier this month, the Palestinian government in the West Bank decided to
+# move to standard time for 30 days, during Ramadan. The Palestinians in the
+# Gaza Strip accepted the change and also moved their clocks one hour back.
+# The Hamas government said on Saturday that it won't observe summertime after
+# the Muslim feast of Id al-Fitr, which begins on Tuesday..."
+# ...
+# <a href="http://www.jpost.com/MiddleEast/Article.aspx?id=235650">
+# http://www.jpost.com/MiddleEast/Article.aspx?id=235650
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html">
+# http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
+# </a>
# The rules for Egypt are stolen from the `africa' file.
+
+# From Steffen Thorsen (2011-09-30):
+# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30
+# 00:00).
+# So West Bank and Gaza now have the same time again.
+#
+# Many sources, including:
+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=424808">
+# http://www.maannews.net/eng/ViewDetails.aspx?ID=424808
+# </a>
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
@@ -2210,20 +2250,38 @@
Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S
Rule Palestine 2006 only - Sep 22 0:00 0 -
Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
-Rule Palestine 2008 only - Aug lastFri 2:00 0 -
+Rule Palestine 2008 only - Aug lastFri 0:00 0 -
Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S
-Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S
-Rule Palestine 2009 max - Sep Fri>=1 2:00 0 -
+Rule Palestine 2009 only - Sep Fri>=1 2:00 0 -
+Rule Palestine 2010 only - Mar lastSat 0:01 1:00 S
Rule Palestine 2010 only - Aug 11 0:00 0 -

+# From Arthur David Olson (2011-09-20):
+# 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
2:00 Zion EET 1948 May 15
2:00 EgyptAsia EE%sT 1967 Jun 5
2:00 Zion I%sT 1996
2:00 Jordan EE%sT 1999
- 2:00 Palestine EE%sT
+ 2:00 Palestine EE%sT 2011 Apr 2 12:01
+ 2:00 1:00 EEST 2011 Aug 1
+ 2:00 - EET

+Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
+ 2:00 Zion EET 1948 May 15
+ 2:00 EgyptAsia EE%sT 1967 Jun 5
+ 2:00 Zion I%sT 1996
+ 2:00 Jordan EE%sT 1999
+ 2:00 Palestine EE%sT 2008 Aug
+ 2:00 1:00 EEST 2008 Sep
+ 2:00 Palestine EE%sT 2011 Apr 1 12:01
+ 2:00 1:00 EEST 2011 Aug 1
+ 2:00 - EET 2011 Aug 30
+ 2:00 1:00 EEST 2011 Sep 30 3:00
+ 2:00 - EET
+
# Paracel Is
# no information

Modified: branches/david-httpcaching/etc/olson/tzdata/australasia
===================================================================
--- branches/david-httpcaching/etc/olson/tzdata/australasia 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/etc/olson/tzdata/australasia 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,5 +1,5 @@
# <pre>
-# @(#)australasia 8.23
+# @(#)australasia 8.29
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.

@@ -296,6 +296,32 @@
# http://www.worldtimezone.com/dst_news/dst_news_fiji04.html
# </a>

+# From Steffen Thorsen (2011-10-03):
+# Now the dates have been confirmed, and at least our start date
+# assumption was correct (end date was one week wrong).
+#
+# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155">
+# www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
+# </a>
+# which says
+# Members of the public are reminded to change their time to one hour in
+# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to
+# 2am on February 26 next year.
+
+# From Ken Rylander (2011-10-24)
+# Another change to the Fiji DST end date. In the TZ database the end date for
+# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22.
+#
+# <a href="http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155">
+# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155
+# </a>
+# states:
+#
+# The end of daylight saving scheduled initially for the 26th of February 2012
+# has been brought forward to the 22nd of January 2012.
+# The commencement of daylight saving will remain unchanged and start
+# on the 23rd of October, 2011.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
@@ -303,6 +329,8 @@
Rule Fiji 2010 only - Mar lastSun 3:00 0 -
Rule Fiji 2010 only - Oct 24 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
+Rule Fiji 2011 only - Oct 23 2:00 1:00 S
+Rule Fiji 2012 only - Jan 22 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:53:40 - LMT 1915 Oct 26 # Suva
12:00 Fiji FJ%sT # Fiji Time
@@ -499,7 +527,7 @@
# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf
# </a>

-# From Raymond Hughes (2010-10-07):
+# From Laupue Raymond Hughes (2010-10-07):
# Please see
# <a href="http://www.mcil.gov.ws">
# http://www.mcil.gov.ws
@@ -509,7 +537,7 @@
# to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks
# backwards from 1:00am to 12:00am"

-# From Raymond Hughes (2011-03-07)
+# From Laupue Raymond Hughes (2011-03-07):
# I believe this will be posted shortly on the website
# <a href="http://www.mcil.gov.ws">
# www.mcil.gov.ws
@@ -529,12 +557,74 @@
# Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE,
# INDUSTRY AND LABOUR 28th February 2011

+# From David Zuelke (2011-05-09):
+# Subject: Samoa to move timezone from east to west of international date line
+#
+# <a href="http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963">
+# http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963
+# </a>
+
+# From Mark Sim-Smith (2011-08-17):
+# I have been in contact with Leilani Tuala Warren from the Samoa Law
+# Reform Commission, and she has sent me a copy of the Bill that she
+# confirmed has been passed...Most of the sections are about maps rather
+# than the time zone change, but I'll paste the relevant bits below. But
+# the essence is that at midnight 29 Dec (UTC-11 I suppose), Samoa
+# changes from UTC-11 to UTC+13:
+#
+# International Date Line Bill 2011
+#
+# AN ACT to provide for the change to standard time in Samoa and to make
+# consequential amendments to the position of the International Date
+# Line, and for related purposes.
+#
+# BE IT ENACTED by the Legislative Assembly of Samoa in Parliament
+# assembled as follows:
+#
+# 1. Short title and commencement-(1) This Act may be cited as the
+# International Date Line Act 2011. (2) Except for section 5(3) this Act
+# commences at 12 o'clock midnight, on Thursday 29th December 2011. (3)
+# Section 5(3) commences on the date of assent by the Head of State.
+#
+# [snip]
+#
+# 3. Interpretation - [snip] "Samoa standard time" in this Act and any
+# other statute of Samoa which refers to 'Samoa standard time' means the
+# time 13 hours in advance of Co-ordinated Universal Time.
+#
+# 4. Samoa standard time - (1) Upon the commencement of this Act, Samoa
+# standard time shall be set at 13 hours in advance of Co-ordinated
+# Universal Time for the whole of Samoa. (2) All references to Samoa's
+# time zone and to Samoa standard time in Samoa in all legislation and
+# instruments after the commencement of this Act shall be references to
+# Samoa standard time as provided for in this Act. (3) Nothing in this
+# Act affects the provisions of the Daylight Saving Act 2009, except that
+# it defines Samoa standard time....
+
+# From Laupue Raymond Hughes (2011-09-02):
+# <a href="http://www.mcil.gov.ws/mcil_publications.html">
+# http://www.mcil.gov.ws/mcil_publications.html
+# </a>
+#
+# here is the official website publication for Samoa DST and dateline change
+#
+# DST
+# Year End Time Start Time
+# 2011 - - - - - - 24 September 3:00am to 4:00am
+# 2012 01 April 4:00am to 3:00am - - - - - -
+#
+# Dateline Change skip Friday 30th Dec 2011
+# Thursday 29th December 2011 23:59:59 Hours
+# Saturday 31st December 2011 00:00:00 Hours
Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5
-11:26:56 - LMT 1911
-11:30 - SAMT 1950 # Samoa Time
-11:00 - WST 2010 Sep 26
-11:00 1:00 WSDT 2011 Apr 2 4:00
- -11:00 - WST
+ -11:00 - WST 2011 Sep 24 3:00
+ -11:00 1:00 WSDT 2011 Dec 30
+ 13:00 1:00 WSDT 2012 Apr 1 4:00
+ 13:00 - WST

# Solomon Is
# excludes Bougainville, for which see Papua New Guinea
@@ -1206,7 +1296,7 @@
# Lord Howe Island Board (controlling authority for the Island) is
# seeking the community's views on various options for summer time
# arrangements on the Island, e.g. advance clocks by 1 full hour
-# instead of only 30 minutes. Dependant on the wishes of residents
+# instead of only 30 minutes. [Dependent] on the wishes of residents
# the Board may approach the NSW government to change the existing
# arrangements. The starting date for summer time on the Island will
# however always coincide with the rest of NSW.
@@ -1332,7 +1422,7 @@

# From Paul Eggert (1996-01-22):
# Today's _Wall Street Journal_ (page 1) reports that Kiribati
-# ``declared it the same day throught the country as of Jan. 1, 1995''
+# ``declared it the same day [throughout] the country as of Jan. 1, 1995''
# as part of the competition to be first into the 21st century.

Modified: branches/david-httpcaching/etc/olson/tzdata/backward
===================================================================
--- branches/david-httpcaching/etc/olson/tzdata/backward 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/etc/olson/tzdata/backward 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,5 +1,5 @@
# <pre>
-# @(#)backward 8.9
+# @(#)backward 8.11
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.

Modified: branches/david-httpcaching/etc/olson/tzdata/europe
===================================================================
--- branches/david-httpcaching/etc/olson/tzdata/europe 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/etc/olson/tzdata/europe 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,5 +1,5 @@
# <pre>
-# @(#)europe 8.33
+# @(#)europe 8.40
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.

@@ -561,9 +561,9 @@
#
Rule Russia 1992 only - Mar lastSat 23:00 1:00 S
Rule Russia 1992 only - Sep lastSat 23:00 0 -
-Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S
+Rule Russia 1993 2010 - Mar lastSun 2:00s 1:00 S
Rule Russia 1993 1995 - Sep lastSun 2:00s 0 -
-Rule Russia 1996 max - Oct lastSun 2:00s 0 -
+Rule Russia 1996 2010 - Oct lastSun 2:00s 0 -

# From Alexander Krivenyshev (2011-06-14):
# According to Kremlin press service, Russian President Dmitry Medvedev
@@ -583,7 +583,6 @@
# From Arthur David Olson (2011-06-15):
# Take "abolishing daylight saving time" to mean that time is now considered
# to be standard.
-# At least for now, keep the "old" Russia rules for the benefit of Belarus.

# These are for backward compatibility with older versions.

@@ -689,6 +688,23 @@
1:00 EU CE%sT

# Belarus
+# From Yauhen Kharuzhy (2011-09-16):
+# By latest Belarus government act Europe/Minsk timezone was changed to
+# GMT+3 without DST (was GMT+2 with DST).
+#
+# Sources (Russian language):
+# 1.
+# <a href="http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html">
+# http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
+# </a>
+# 2.
+# <a href="http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/">
+# http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
+# </a>
+# 3.
+# <a href="http://news.tut.by/society/250578.html">
+# http://news.tut.by/society/250578.html
+# </a>
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Minsk 1:50:16 - LMT 1880
1:50 - MMT 1924 May 2 # Minsk Mean Time
@@ -700,7 +716,8 @@
2:00 1:00 EEST 1991 Sep 29 2:00s
2:00 - EET 1992 Mar 29 0:00s
2:00 1:00 EEST 1992 Sep 27 0:00s
- 2:00 Russia EE%sT
+ 2:00 Russia EE%sT 2011 Mar 27 2:00s
+ 3:00 - FET # Further-eastern European Time

# Belgium
#
@@ -1638,7 +1655,42 @@
# But [two people] separately reported via
# Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau.
# The Tiraspol entry has therefore been removed for now.
+#
+# From Alexander Krivenyshev (2011-10-17):
+# Pridnestrovian Moldavian Republic (PMR, also known as
+# "Pridnestrovie") has abolished seasonal clock change (no transition
+# to the Winter Time).
+#
+# News (in Russian):
+# <a href="http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html">
+# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
+# </a>
+#
+# <a href="http://www.allmoldova.com/moldova-news/1249064116.html">
+# http://www.allmoldova.com/moldova-news/1249064116.html
+# </a>
+#
+# The substance of this change (reinstatement of the Tiraspol entry)
+# is from a patch from Petr Machata (2011-10-17)
+#
+# From Tim Parenti (2011-10-19)
+# In addition, being situated at +4651+2938 would give Tiraspol
+# a pre-1880 LMT offset of 1:58:32.
+#
+# (which agrees with the earlier entry that had been removed)
+#
+# From Alexander Krivenyshev (2011-10-26)
+# NO need to divide Moldova into two timezones at this point.
+# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own
+# decision to abolish DST this winter.
+# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
+# Tiraspol will go back to winter time on October 30, 2011.
+# News from Moldova (in russian):
+# <a href="http://ru.publika.md/link_317061.html">
+# http://ru.publika.md/link_317061.html
+# </a>

+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Chisinau 1:55:20 - LMT 1880
1:55 - CMT 1918 Feb 15 # Chisinau MT
@@ -2034,7 +2086,7 @@
2:00 Poland CE%sT 1946
3:00 Russia MSK/MSD 1991 Mar 31 2:00s
2:00 Russia EE%sT 2011 Mar 27 2:00s
- 3:00 - EET
+ 3:00 - FET # Further-eastern European Time
#
# From Oscar van Vlijmen (2001-08-25): [This region consists of]
# Respublika Adygeya, Arkhangel'skaya oblast',
@@ -2189,7 +2241,7 @@
# [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.

# From Oscar van Vlijmen (2009-11-29):
-# ...some regions of RUssia were merged with others since 2005...
+# ...some regions of [Russia] were merged with others since 2005...
# Some names were changed, no big deal, except for one instance: a new name.
# YAK/YAKST: UTC+9 Zabajkal'skij kraj.

@@ -2613,6 +2665,50 @@
# of March at 3am the time is changing to 4am and each last Sunday of
# October the time at 4am is changing to 3am"

+# From Alexander Krivenyshev (2011-09-20):
+# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+# abolish the transfer clock to winter time.
+#
+# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+# approval from 266 deputies.
+#
+# Ukraine abolishes transter back to the winter time (in Russian)
+# <a href="http://news.mail.ru/politics/6861560/">
+# http://news.mail.ru/politics/6861560/
+# </a>
+#
+# The Ukrainians will no longer change the clock (in Russian)
+# <a href="http://www.segodnya.ua/news/14290482.html">
+# http://www.segodnya.ua/news/14290482.html
+# </a>
+#
+# Deputies cancelled the winter time (in Russian)
+# <a href="http://www.pravda.com.ua/rus/news/2011/09/20/6600616/">
+# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+# </a>
+#
+# From Philip Pizzey (2011-10-18):
+# Today my Ukrainian colleagues have informed me that the
+# Ukrainian parliament have decided that they will go to winter
+# time this year after all.
+#
+# From Udo Schwedt (2011-10-18):
+# As far as I understand, the recent change to the Ukranian time zone
+# (Europe/Kiev) to introduce permanent daylight saving time (similar
+# to Russia) was reverted today:
+#
+# <a href="http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995">
+# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
+# </a>
+#
+# Also reported by Alexander Bokovoy (2011-10-18) who also noted:
+# The law documents themselves are at
+#
+# <a href="http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484">
+# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
+# </a>
+
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
# Most of Ukraine since 1970 has been like Kiev.
# "Kyiv" is the transliteration of the Ukrainian name, but

Modified: branches/david-httpcaching/etc/olson/tzdata/northamerica
===================================================================
--- branches/david-httpcaching/etc/olson/tzdata/northamerica 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/etc/olson/tzdata/northamerica 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,5 +1,5 @@
# <pre>
-# @(#)northamerica 8.42
+# @(#)northamerica 8.51
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.

@@ -468,6 +468,10 @@
# own time. I asked about daylight saving; they said it wasn't used. I
# did not inquire about practices in the past.

+# From Arthur David Olson (2011-08-17):
+# For lack of better information, assume that Metlakatla's
+# abandonment of use of daylight saving resulted from the 1983 vote.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Juneau 15:02:19 - LMT 1867 Oct 18
-8:57:41 - LMT 1900 Aug 20 12:00
@@ -479,7 +483,7 @@
-8:00 US P%sT 1983 Oct 30 2:00
-9:00 US Y%sT 1983 Nov 30
-9:00 US AK%sT
-Zone America/Sitka -14:58:47 - LMT 1867 Oct 18
+Zone America/Sitka 14:58:47 - LMT 1867 Oct 18
-9:01:13 - LMT 1900 Aug 20 12:00
-8:00 - PST 1942
-8:00 US P%sT 1946
@@ -493,7 +497,7 @@
-8:00 US P%sT 1946
-8:00 - PST 1969
-8:00 US P%sT 1983 Oct 30 2:00
- -8:00 US MeST
+ -8:00 - MeST
Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18
-9:18:55 - LMT 1900 Aug 20 12:00
-9:00 - YST 1942
@@ -593,8 +597,8 @@
-10:30 - HST 1933 Apr 30 2:00 #Laws 1933
-10:30 1:00 HDT 1933 May 21 12:00 #Laws 1933+12
-10:30 - HST 1942 Feb 09 2:00 #Schmitt&Cox+2
- -10:30 1:00 HDT 1945 Sep 30 2:00 #Schmitt&Fox+2
- -10:30 US H%sT 1947 Jun 8 2:00 #Schmitt&Fox+2
+ -10:30 1:00 HDT 1945 Sep 30 2:00 #Schmitt&Cox+2
+ -10:30 - HST 1947 Jun 8 2:00 #Schmitt&Cox+2
-10:00 - HST

# Now we turn to US areas that have diverged from the consensus since 1970.
@@ -1163,12 +1167,29 @@
# From Paul Eggert (2000-10-02):
# INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
# at 00:01 local time. For now, assume it started in 1987.
+
+# From Michael Pelley (2011-09-12):
+# We received today, Monday, September 12, 2011, notification that the
+# changes to the Newfoundland Standard Time Act have been proclaimed.
+# The change in the Act stipulates that the change from Daylight Savings
+# Time to Standard Time and from Standard Time to Daylight Savings Time
+# now occurs at 2:00AM.
+# ...
+# <a href="http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm">
+# http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
+# </a>
+# ...
+# MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
+# Office of the Chief Information Officer
+# Executive Council
+# Government of Newfoundland & Labrador
+
Rule StJohns 1987 only - Apr Sun>=1 0:01 1:00 D
Rule StJohns 1987 2006 - Oct lastSun 0:01 0 S
Rule StJohns 1988 only - Apr Sun>=1 0:01 2:00 DD
Rule StJohns 1989 2006 - Apr Sun>=1 0:01 1:00 D
-Rule StJohns 2007 max - Mar Sun>=8 0:01 1:00 D
-Rule StJohns 2007 max - Nov Sun>=1 0:01 0 S
+Rule StJohns 2007 2011 - Mar Sun>=8 0:01 1:00 D
+Rule StJohns 2007 2010 - Nov Sun>=1 0:01 0 S
#
# St John's has an apostrophe, but Posix file names can't have apostrophes.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -1178,7 +1199,8 @@
-3:30:52 StJohns N%sT 1935 Mar 30
-3:30 StJohns N%sT 1942 May 11
-3:30 Canada N%sT 1946
- -3:30 StJohns N%sT
+ -3:30 StJohns N%sT 2011 Nov
+ -3:30 Canada N%sT

# most of east Labrador

@@ -1192,7 +1214,8 @@
-3:30 StJohns N%sT 1942 May 11
-3:30 Canada N%sT 1946
-3:30 StJohns N%sT 1966 Mar 15 2:00
- -4:00 StJohns A%sT
+ -4:00 StJohns A%sT 2011 Nov
+ -4:00 Canada A%sT


# west Labrador, Nova Scotia, Prince Edward I
@@ -1924,21 +1947,70 @@
# daylight saving....
# http://www.nnsl.com/frames/newspapers/2006-11/nov13_06none.html

-# From Chris Walton (2007-03-14):
-# Today I phoned the "hamlet office" to find out what Resolute was doing with
-# its clocks.
+# From Chris Walton (2011-03-21):
+# Back in 2007 I initiated the creation of a new "zone file" for Resolute
+# Bay. Resolute Bay is a small community located about 900km north of
+# the Arctic Circle. The zone file was required because Resolute Bay had
+# decided to use UTC-5 instead of UTC-6 for the winter of 2006-2007.
#
-# The individual that answered the phone confirmed that the clocks did not
-# move at the end of daylight saving on October 29/2006. He also told me that
-# the clocks did not move this past weekend (March 11/2007)....
+# According to new information which I received last week, Resolute Bay
+# went back to using UTC-6 in the winter of 2007-2008...
+#
+# On March 11/2007 most of Canada went onto daylight saving. On March
+# 14/2007 I phoned the Resolute Bay hamlet office to do a "time check." I
+# talked to somebody that was both knowledgeable and helpful. I was able
+# to confirm that Resolute Bay was still operating on UTC-5. It was
+# explained to me that Resolute Bay had been on the Eastern Time zone
+# (EST) in the winter, and was now back on the Central Time zone (CDT).
+# i.e. the time zone had changed twice in the last year but the clocks
+# had not moved. The residents had to know which time zone they were in
+# so they could follow the correct TV schedule...
+#
+# On Nov 02/2008 most of Canada went onto standard time. On Nov 03/2008 I
+# phoned the Resolute Bay hamlet office...[D]ue to the challenging nature
+# of the phone call, I decided to seek out an alternate source of
+# information. I found an e-mail address for somebody by the name of
+# Stephanie Adams whose job was listed as "Inns North Support Officer for
+# Arctic Co-operatives." I was under the impression that Stephanie lived
+# and worked in Resolute Bay...
+#
+# On March 14/2011 I phoned the hamlet office again. I was told that
+# Resolute Bay had been using Central Standard Time over the winter of
+# 2010-2011 and that the clocks had therefore been moved one hour ahead
+# on March 13/2011. The person I talked to was aware that Resolute Bay
+# had previously experimented with Eastern Standard Time but he could not
+# tell me when the practice had stopped.
+#
+# On March 17/2011 I searched the Web to find an e-mail address of
+# somebody that might be able to tell me exactly when Resolute Bay went
+# off Eastern Standard Time. I stumbled on the name "Aziz Kheraj." Aziz
+# used to be the mayor of Resolute Bay and he apparently owns half the
+# businesses including "South Camp Inn." This website has some info on
+# Aziz:
+# <a href="http://www.uphere.ca/node/493">
+# http://www.uphere.ca/node/493
+# </a>
+#
+# I sent Aziz an e-mail asking when Resolute Bay had stopped using
+# Eastern Standard Time.
+#
+# Aziz responded quickly with this: "hi, The time was not changed for the
+# 1 year only, the following year, the community went back to the old way
+# of "spring ahead-fall behind" currently we are zulu plus 5 hrs and in
+# the winter Zulu plus 6 hrs"
+#
+# This of course conflicted with everything I had ascertained in November 2008.
+#
+# I sent Aziz a copy of my 2008 e-mail exchange with Stephanie. Aziz
+# responded with this: "Hi, Stephanie lives in Winnipeg. I live here, You
+# may want to check with the weather office in Resolute Bay or do a
+# search on the weather through Env. Canada. web site"
+#
+# If I had realized the Stephanie did not live in Resolute Bay I would
+# never have contacted her. I now believe that all the information I
+# obtained in November 2008 should be ignored...
+# I apologize for reporting incorrect information in 2008.

-# From Chris Walton (2008-11-13):
-# ...the residents of Resolute believe that they are changing "time zones"
-# twice a year. In winter months, local time is qualified with "Eastern
-# Time" which is really "Eastern Standard Time (UTC-5)". In summer
-# months, local time is qualified with "Central Time" which is really
-# "Central Daylight Time (UTC-5)"...
-
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule NT_YK 1918 only - Apr 14 2:00 1:00 D
Rule NT_YK 1918 only - Oct 27 2:00 0 S
@@ -1965,14 +2037,12 @@
-6:00 Canada C%sT 2000 Oct 29 2:00
-5:00 Canada E%sT
# aka Qausuittuq
-# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Resolute 2006 max - Nov Sun>=1 2:00 0 ES
-Rule Resolute 2007 max - Mar Sun>=8 2:00 0 CD
Zone America/Resolute 0 - zzz 1947 Aug 31 # Resolute founded
-6:00 NT_YK C%sT 2000 Oct 29 2:00
-5:00 - EST 2001 Apr 1 3:00
-6:00 Canada C%sT 2006 Oct 29 2:00
- -5:00 Resolute %sT
+ -5:00 - EST 2007 Mar 11 3:00
+ -6:00 Canada C%sT
# aka Kangiqiniq
Zone America/Rankin_Inlet 0 - zzz 1957 # Rankin Inlet founded
-6:00 NT_YK C%sT 2000 Oct 29 2:00
@@ -2620,6 +2690,20 @@
# <a href="http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html">
# http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
# </a>
+#
+# From Steffen Thorsen (2011-10-30)
+# Cuba will end DST two weeks later this year. Instead of going back
+# tonight, it has been delayed to 2011-11-13 at 01:00.
+#
+# One source (Spanish)
+# <a href="http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html">
+# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html
+# </a>
+#
+# Our page:
+# <a href="http://www.timeanddate.com/news/time/cuba-time-changes-2011.html">
+# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
+# </a>

# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Cuba 1928 only - Jun 10 0:00 1:00 D
@@ -2651,12 +2735,14 @@
Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
Rule Cuba 2000 2004 - Apr Sun>=1 0:00s 1:00 D
-Rule Cuba 2006 max - Oct lastSun 0:00s 0 S
+Rule Cuba 2006 2010 - Oct lastSun 0:00s 0 S
Rule Cuba 2007 only - Mar Sun>=8 0:00s 1:00 D
Rule Cuba 2008 only - Mar Sun>=15 0:00s 1:00 D
Rule Cuba 2009 2010 - Mar Sun>=8 0:00s 1:00 D
Rule Cuba 2011 only - Mar Sun>=15 0:00s 1:00 D
+Rule Cuba 2011 only - Nov 13 0:00s 0 S
Rule Cuba 2012 max - Mar Sun>=8 0:00s 1:00 D
+Rule Cuba 2012 max - Oct lastSun 0:00s 0 S

# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Havana -5:29:28 - LMT 1890

Modified: branches/david-httpcaching/etc/olson/tzdata/southamerica
===================================================================
--- branches/david-httpcaching/etc/olson/tzdata/southamerica 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/etc/olson/tzdata/southamerica 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,5 +1,5 @@
# <pre>
-# @(#)southamerica 8.50
+# @(#)southamerica 8.52
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.

@@ -797,7 +797,40 @@
# <a href="http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html">
# http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
# </a>
+#
+# From Alexander Krivenyshev (2011-10-04):
+# State Bahia will return to Daylight savings time this year after 8 years off.
+# The announcement was made by Governor Jaques Wagner in an interview to a
+# television station in Salvador.

+# In Portuguese:
+# <a href="http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html">
+# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
+# </a> and
+# <a href="http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html">
+# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
+# </a>
+
+# From Guilherme Bernardes Rodrigues (2011-10-07):
+# There is news in the media, however there is still no decree about it.
+# I just send a e-mail to Zulmira Brand�o at
+# <a href="http://pcdsh01.on.br/">http://pcdsh01.on.br/</a> the
+# oficial agency about time in Brazil, and she confirmed that the old rule is
+# still in force.
+
+# From Guilherme Bernardes Rodrigues (2011-10-14)
+# It's official, the President signed a decree that includes Bahia in summer
+# time.
+# [ and in a second message (same day): ]
+# I found the decree.
+#
+# DECRETO No- 7.584, DE 13 DE OUTUBRO DE 2011
+# Link :
+# <a href="http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6">
+# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
+# </a>
+
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
# Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
# Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1034,7 +1067,8 @@
# of America/Salvador.
Zone America/Bahia -2:34:04 - LMT 1914
-3:00 Brazil BR%sT 2003 Sep 24
- -3:00 - BRT
+ -3:00 - BRT 2011 Oct 16
+ -3:00 Brazil BR%sT
#
# Goias (GO), Distrito Federal (DF), Minas Gerais (MG),
# Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR),

Modified: branches/david-httpcaching/samples/app/config/autoload.xml
===================================================================
--- branches/david-httpcaching/samples/app/config/autoload.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/samples/app/config/autoload.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,15 +2,15 @@
<ae:configurations xmlns="http://agavi.org/agavi/config/parts/autoload/1.1" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.1" parent="%core.system_config_dir%/autoload.xml">
<ae:configuration>
<autoloads>
- <autoload name="AgaviSampleAppBaseAction">%core.lib_dir%/action/AgaviSampleAppBaseAction.class.php</autoload>
- <autoload name="AgaviSampleAppBaseModel">%core.lib_dir%/model/AgaviSampleAppBaseModel.class.php</autoload>
- <autoload name="AgaviSampleAppBaseView">%core.lib_dir%/view/AgaviSampleAppBaseView.class.php</autoload>
+ <autoload class="AgaviSampleAppBaseAction">lib/action/AgaviSampleAppBaseAction.class.php</autoload>
+ <autoload class="AgaviSampleAppBaseModel">%core.lib_dir%/model/AgaviSampleAppBaseModel.class.php</autoload>
+ <autoload class="AgaviSampleAppBaseView">%core.lib_dir%/view/AgaviSampleAppBaseView.class.php</autoload>

- <autoload name="AgaviSampleAppLanguageRoutingCallback">%core.lib_dir%/routing/AgaviSampleAppLanguageRoutingCallback.class.php</autoload>
+ <autoload class="AgaviSampleAppLanguageRoutingCallback">%core.lib_dir%/routing/AgaviSampleAppLanguageRoutingCallback.class.php</autoload>

- <autoload name="AgaviSampleAppUser">%core.lib_dir%/user/AgaviSampleAppUser.class.php</autoload>
+ <autoload class="AgaviSampleAppUser">%core.lib_dir%/user/AgaviSampleAppUser.class.php</autoload>

- <autoload name="AgaviSampleAppProductValidator">%core.lib_dir%/validator/AgaviSampleAppProductValidator.class.php</autoload>
+ <autoload class="AgaviSampleAppProductValidator">%core.lib_dir%/validator/AgaviSampleAppProductValidator.class.php</autoload>
</autoloads>
</ae:configuration>
</ae:configurations>
\ No newline at end of file

Modified: branches/david-httpcaching/samples/app/modules/Confidential/config/autoload.xml
===================================================================
--- branches/david-httpcaching/samples/app/modules/Confidential/config/autoload.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/samples/app/modules/Confidential/config/autoload.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,9 +2,9 @@
<ae:configurations xmlns="http://agavi.org/agavi/config/parts/autoload/1.1" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.1">
<ae:configuration>
<autoloads>
- <autoload name="AgaviSampleAppConfidentialBaseAction">%core.module_dir%/Confidential/lib/action/AgaviSampleAppConfidentialBaseAction.class.php</autoload>
- <autoload name="AgaviSampleAppConfidentialBaseModel">%core.module_dir%/Confidential/lib/model/AgaviSampleAppConfidentialBaseModel.class.php</autoload>
- <autoload name="AgaviSampleAppConfidentialBaseView">%core.module_dir%/Confidential/lib/view/AgaviSampleAppConfidentialBaseView.class.php</autoload>
+ <autoload class="AgaviSampleAppConfidentialBaseAction">%core.module_dir%/Confidential/lib/action/AgaviSampleAppConfidentialBaseAction.class.php</autoload>
+ <autoload class="AgaviSampleAppConfidentialBaseModel">%core.module_dir%/Confidential/lib/model/AgaviSampleAppConfidentialBaseModel.class.php</autoload>
+ <autoload class="AgaviSampleAppConfidentialBaseView">%core.module_dir%/Confidential/lib/view/AgaviSampleAppConfidentialBaseView.class.php</autoload>
</autoloads>
</ae:configuration>
</ae:configurations>
\ No newline at end of file

Modified: branches/david-httpcaching/samples/app/modules/Default/config/autoload.xml
===================================================================
--- branches/david-httpcaching/samples/app/modules/Default/config/autoload.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/samples/app/modules/Default/config/autoload.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,9 +2,9 @@
<ae:configurations xmlns="http://agavi.org/agavi/config/parts/autoload/1.1" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.1">
<ae:configuration>
<autoloads>
- <autoload name="AgaviSampleAppDefaultBaseAction">%core.module_dir%/Default/lib/action/AgaviSampleAppDefaultBaseAction.class.php</autoload>
- <autoload name="AgaviSampleAppDefaultBaseModel">%core.module_dir%/Default/lib/model/AgaviSampleAppDefaultBaseModel.class.php</autoload>
- <autoload name="AgaviSampleAppDefaultBaseView">%core.module_dir%/Default/lib/view/AgaviSampleAppDefaultBaseView.class.php</autoload>
+ <autoload class="AgaviSampleAppDefaultBaseAction">%core.module_dir%/Default/lib/action/AgaviSampleAppDefaultBaseAction.class.php</autoload>
+ <autoload class="AgaviSampleAppDefaultBaseModel">%core.module_dir%/Default/lib/model/AgaviSampleAppDefaultBaseModel.class.php</autoload>
+ <autoload class="AgaviSampleAppDefaultBaseView">%core.module_dir%/Default/lib/view/AgaviSampleAppDefaultBaseView.class.php</autoload>
</autoloads>
</ae:configuration>
</ae:configurations>
\ No newline at end of file

Modified: branches/david-httpcaching/samples/app/modules/Disabled/config/autoload.xml
===================================================================
--- branches/david-httpcaching/samples/app/modules/Disabled/config/autoload.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/samples/app/modules/Disabled/config/autoload.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,9 +2,9 @@
<ae:configurations xmlns="http://agavi.org/agavi/config/parts/autoload/1.1" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.1">
<ae:configuration>
<autoloads>
- <autoload name="AgaviSampleAppDisabledBaseAction">%core.module_dir%/Disabled/lib/action/AgaviSampleAppDisabledBaseAction.class.php</autoload>
- <autoload name="AgaviSampleAppDisabledBaseModel">%core.module_dir%/Disabled/lib/model/AgaviSampleAppDisabledBaseModel.class.php</autoload>
- <autoload name="AgaviSampleAppDisabledBaseView">%core.module_dir%/Disabled/lib/view/AgaviSampleAppDisabledBaseView.class.php</autoload>
+ <autoload class="AgaviSampleAppDisabledBaseAction">%core.module_dir%/Disabled/lib/action/AgaviSampleAppDisabledBaseAction.class.php</autoload>
+ <autoload class="AgaviSampleAppDisabledBaseModel">%core.module_dir%/Disabled/lib/model/AgaviSampleAppDisabledBaseModel.class.php</autoload>
+ <autoload class="AgaviSampleAppDisabledBaseView">%core.module_dir%/Disabled/lib/view/AgaviSampleAppDisabledBaseView.class.php</autoload>
</autoloads>
</ae:configuration>
</ae:configurations>
\ No newline at end of file

Modified: branches/david-httpcaching/samples/app/modules/Products/config/autoload.xml
===================================================================
--- branches/david-httpcaching/samples/app/modules/Products/config/autoload.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/samples/app/modules/Products/config/autoload.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,9 +2,9 @@
<ae:configurations xmlns="http://agavi.org/agavi/config/parts/autoload/1.1" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.1">
<ae:configuration>
<autoloads>
- <autoload name="AgaviSampleAppProductsBaseAction">%core.module_dir%/Products/lib/action/AgaviSampleAppProductsBaseAction.class.php</autoload>
- <autoload name="AgaviSampleAppProductsBaseModel">%core.module_dir%/Products/lib/model/AgaviSampleAppProductsBaseModel.class.php</autoload>
- <autoload name="AgaviSampleAppProductsBaseView">%core.module_dir%/Products/lib/view/AgaviSampleAppProductsBaseView.class.php</autoload>
+ <autoload class="AgaviSampleAppProductsBaseAction">%core.module_dir%/Products/lib/action/AgaviSampleAppProductsBaseAction.class.php</autoload>
+ <autoload class="AgaviSampleAppProductsBaseModel">%core.module_dir%/Products/lib/model/AgaviSampleAppProductsBaseModel.class.php</autoload>
+ <autoload class="AgaviSampleAppProductsBaseView">%core.module_dir%/Products/lib/view/AgaviSampleAppProductsBaseView.class.php</autoload>
</autoloads>
</ae:configuration>
</ae:configurations>
\ No newline at end of file

Modified: branches/david-httpcaching/samples/test/run-tests.php
===================================================================
--- branches/david-httpcaching/samples/test/run-tests.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/samples/test/run-tests.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -17,8 +17,8 @@

AgaviTesting::bootstrap($env);

-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(AgaviConfig::get('core.agavi_dir'));
-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(AgaviConfig::get('core.cache_dir'));
+AgaviTesting::getCodeCoverageFilter()->addDirectoryToBlacklist(AgaviConfig::get('core.agavi_dir'));
+AgaviTesting::getCodeCoverageFilter()->addDirectoryToBlacklist(AgaviConfig::get('core.cache_dir'));

AgaviTesting::dispatch($arguments);

Modified: branches/david-httpcaching/src/agavi.php
===================================================================
--- branches/david-httpcaching/src/agavi.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/agavi.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -33,7 +33,7 @@
require(__DIR__ . '/config/AgaviConfig.class.php');

// check minimum PHP version
-AgaviConfig::set('core.minimum_php_version', '5.3.0');
+AgaviConfig::set('core.minimum_php_version', '5.3.2');
if(version_compare(PHP_VERSION, AgaviConfig::get('core.minimum_php_version'), '<') ) {
trigger_error('Agavi requires PHP version ' . AgaviConfig::get('core.minimum_php_version') . ' or greater', E_USER_ERROR);
}
@@ -47,6 +47,7 @@
// required files
require($agavi_config_directive_core_agavi_dir . '/version.php');
require($agavi_config_directive_core_agavi_dir . '/core/Agavi.class.php');
+require($agavi_config_directive_core_agavi_dir . '/util/AgaviAutoloader.class.php');
// required files for classes Agavi and ConfigCache to run
// consider this the bare minimum we need for bootstrapping
require($agavi_config_directive_core_agavi_dir . '/util/AgaviInflector.class.php');

Modified: branches/david-httpcaching/src/build/templates/app/config/autoload.xml.tmpl
===================================================================
--- branches/david-httpcaching/src/build/templates/app/config/autoload.xml.tmpl 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/build/templates/app/config/autoload.xml.tmpl 2011-12-26 16:19:15 UTC (rev 4910)
@@ -3,9 +3,9 @@

<ae:configuration>

- <autoload name="%%PROJECT_PREFIX%%BaseAction">%core.lib_dir%/action/%%PROJECT_PREFIX%%BaseAction.class.php</autoload>
- <autoload name="%%PROJECT_PREFIX%%BaseModel">%core.lib_dir%/model/%%PROJECT_PREFIX%%BaseModel.class.php</autoload>
- <autoload name="%%PROJECT_PREFIX%%BaseView">%core.lib_dir%/view/%%PROJECT_PREFIX%%BaseView.class.php</autoload>
+ <autoload class="%%PROJECT_PREFIX%%BaseAction">%core.lib_dir%/action/%%PROJECT_PREFIX%%BaseAction.class.php</autoload>
+ <autoload class="%%PROJECT_PREFIX%%BaseModel">%core.lib_dir%/model/%%PROJECT_PREFIX%%BaseModel.class.php</autoload>
+ <autoload class="%%PROJECT_PREFIX%%BaseView">%core.lib_dir%/view/%%PROJECT_PREFIX%%BaseView.class.php</autoload>

</ae:configuration>

Modified: branches/david-httpcaching/src/build/templates/app/modules/config/autoload.xml.tmpl
===================================================================
--- branches/david-httpcaching/src/build/templates/app/modules/config/autoload.xml.tmpl 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/build/templates/app/modules/config/autoload.xml.tmpl 2011-12-26 16:19:15 UTC (rev 4910)
@@ -3,9 +3,9 @@

<ae:configuration>

- <autoload name="%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseAction">%core.module_dir%/%%MODULE_NAME%%/lib/action/%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseAction.class.php</autoload>
- <autoload name="%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseModel">%core.module_dir%/%%MODULE_NAME%%/lib/model/%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseModel.class.php</autoload>
- <autoload name="%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseView">%core.module_dir%/%%MODULE_NAME%%/lib/view/%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseView.class.php</autoload>
+ <autoload class="%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseAction">%core.module_dir%/%%MODULE_NAME%%/lib/action/%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseAction.class.php</autoload>
+ <autoload class="%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseModel">%core.module_dir%/%%MODULE_NAME%%/lib/model/%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseModel.class.php</autoload>
+ <autoload class="%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseView">%core.module_dir%/%%MODULE_NAME%%/lib/view/%%PROJECT_PREFIX%%%%MODULE_NAME%%BaseView.class.php</autoload>

</ae:configuration>

Modified: branches/david-httpcaching/src/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl
===================================================================
--- branches/david-httpcaching/src/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl 2011-12-26 16:19:15 UTC (rev 4910)
@@ -11,62 +11,110 @@
}

body {
- width: 100%;
height: 100%;
margin: 0;
- padding: 0;
+ padding: 0 20%;
background-color: #FFF;
background-image: url('welcome/bg.png');
background-position: left top;
background-repeat: repeat-x;
- font-family: 'Trebuchet MS', Verdana, Tahoma, Arial, Helvetica, sans-serif;
- font-size: 10pt;
- color: #999;
+ font: 13px/20px Helvetica, Arial, Verdana, sans-serif;
+ color: #444;
+ text-align: center;
}

a, a:link, a:visited, a:active, a:hover {
- color: #AAF;
+ color: #339;
}

-div {
+h1 {
margin-top: 50px;
- padding-top: 340px;
+ padding-top: 360px;
background-image: url('welcome/plant.png');
background-position: top center;
background-repeat: no-repeat;
- text-align: center;
}

-h1 {
- color: #666;
+h2 {
+ margin-top: 2em;
}

-p.light {
- color: #CCC;
+div.tip, div.warning
+{
+ margin: 20px 0;
+ padding: 10px 20px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ -o-border-radius: 4px;
+ border-radius: 4px;
+ text-shadow: 0 1px 1px #fff;
+ text-align: left;
+ color: #333;
}
+div.tip
+{
+ background-color: #F9F3D2;
+ border-bottom: 1px solid #DEDBC6;
+}
+div.warning
+{
+ background-color: #F9D2D2;
+ border-bottom: 1px solid #DEC6C6;
+}

-p.light a, p.light a:link, p.light a:visited, p.light a:active, p.light a:hover {
- color: #CCF;
+div.tip h5, div.warning h5
+{
+ display: inline;
+ margin-bottom: 10px;
+ font-weight: bold;
+ text-shadow: 0 1px 1px #fff;
+ font-size: 110%;
}
+div.tip h5:after, div.warning h5:after
+{
+ content: ": ";
+}

+code {
+ padding: 1px 3px;
+ font-family: monospace;
+ background-color: #efefef;
+ border: 1px solid #ccc;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ -o-border-radius: 3px;
+ border-radius: 3px;
+}
+div.tip code {
+ background-color: #DEDBC6;
+}
+div.warning code {
+ background-color: #DEC6C6;
+}
+
</style>
</head>
<body>
- <div>
- <h1>Welcome to Agavi!</h1>
- <p>You successfully created your first project! Awesome!</p>
- <p>&nbsp;</p>
- <p>To get started, refer to the Agavi manual, or play around with the sample application that was included with this distribution.</p>
- <p>If you have any questions, join us in <b>#agavi</b> on <b>irc.freenode.net</b> or consult the "users" mailing list.</p>
- <p>&nbsp;</p>
- <p><strong>This page will appear until you remove the corresponding rule from the <code>routing.xml</code> configuration file.</strong></p>
- <p>To get rid of this page, delete the route from <code>app/config/routing.xml</code> and remove the directories <code>app/modules/Welcome/</code> and <code>pub/welcome/</code>.</p>
- <p>&nbsp;</p>
- <p><strong>Remember not to check in <code>pub/.htaccess</code> and <code>pub/index.php</code> into your version control system - always make copies of those from <code>dev/pub/</code>.</strong></p>
- <p>&nbsp;</p>
- <p><a href="http://www.agavi.org/">Agavi Homepage</a></p>
- <p>&nbsp;</p>
- <p>You are running <em><?php echo $t['agavi_release']; ?></em></p>
+ <h1>Welcome to Agavi!</h1>
+ <p>You successfully created your first project running <em><?php echo $t['agavi_release']; ?></em>, congratulations!</p>
+<?php if($t['warn_display_errors']):?>
+ <div class="warning">
+ <h5>Warning</h5>
+ You will not see error messages or exceptions because your PHP installation is not configured correctly for development. Please edit <?php if($t['php_ini_path']): ?><code><?php echo htmlspecialchars($t['php_ini_path']); ?></code><?php else: ?>your system's <code>php.ini</code><?php endif; ?> and change <code>display_errors</code> to <code>on</code>. While you're at it, make sure <code>error_reporting</code> is set to <code><?php echo $t['recommended_error_reporting']?></code>.
</div>
+<?php endif; ?>
+ <h2>Getting Started and Getting Help</h3>
+ <p>To get started, refer to the <a href="http://www.agavi.org/documentation">documentation</a>, or play around with the sample application that is included in the Agavi source distribution.</p>
+ <p>If you have any questions, <a href="https://webchat.freenode.net/?channels=agavi">join</a> us in <a href="irc://irc.freenode.net/agavi">#agavi</a> on <a href="http://www.freenode.net/">irc.freenode.net</a> or consult the <a href="http://www.agavi.org/support">other support sources</a>.</p>
+ <div class="tip">
+ <h5>Tip</h5>
+ This welcome page will appear until you remove the corresponding routing rule from <code>app/config/routing.xml</code>. Once you have done that, make sure you also delete the directories <code>app/modules/Welcome/</code> and <code>pub/welcome/</code>.
+ </div>
+ <h2>Other Resources</h2>
+ <p>Visit the <a href="http://www.agavi.org/">Agavi Website</a>, follow <a href="http://twitter.com/Agavi">@Agavi on Twitter</a>, or explore <a href="http://trac.agavi.org/">code and tickets</a>.</p>
+ <div class="tip">
+ <h5>Tip</h5>
+ Remember not to check <code>pub/.htaccess</code> and <code>pub/index.php</code> into your version control system; always make copies of those from <code>dev/pub/</code> or run <code>agavi public-create</code> to have them created.
+ </div>
</body>
</html>
\ No newline at end of file

Modified: branches/david-httpcaching/src/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl
===================================================================
--- branches/david-httpcaching/src/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl 2011-12-26 16:19:15 UTC (rev 4910)
@@ -9,6 +9,9 @@
$this->setupHtml($rd, 'simple');

$this->setAttribute('agavi_release', AgaviConfig::get('agavi.release'));
+ $this->setAttribute('warn_display_errors', !ini_get('display_errors'));
+ $this->setAttribute('php_ini_path', function_exists('php_ini_loaded_file') ? php_ini_loaded_file() : null); // 5.2.3 and later
+ $this->setAttribute('recommended_error_reporting', version_compare(PHP_VERSION, '5.4', '<') ? 'E_ALL | E_STRICT' : 'E_ALL'); // 5.4 and up have E_STRICT included in E_ALL
}
}

Modified: branches/david-httpcaching/src/config/AgaviAutoloadConfigHandler.class.php
===================================================================
--- branches/david-httpcaching/src/config/AgaviAutoloadConfigHandler.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/AgaviAutoloadConfigHandler.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -23,6 +23,7 @@
*
* @author Sean Kerr <sk...@mojavi.org>
* @author Dominik del Bondio <d...@bitxtender.com>
+ * @author David Zülke <david....@bitextender.com>
* @copyright Authors
* @copyright The Agavi Project
*
@@ -47,6 +48,7 @@
* @author Sean Kerr <sk...@mojavi.org>
* @author Dominik del Bondio <d...@bitxtender.com>
* @author Noah Fontes <noah....@bitextender.com>
+ * @author David Zülke <david....@bitextender.com>
* @since 0.9.0
*/
public function execute(AgaviXmlConfigDomDocument $document)
@@ -54,7 +56,7 @@
// set up our default namespace
$document->setDefaultNamespace(self::XML_NAMESPACE, 'autoload');

- $data = array();
+ $classes = $namespaces = array();

foreach($document->getConfigurationElements() as $configuration) {
if(!$configuration->has('autoloads')) {
@@ -64,36 +66,48 @@
// let's do our fancy work
foreach($configuration->get('autoloads') as $autoload) {
// we can have variables in the filename
- $file = AgaviToolkit::expandDirectives($autoload->getValue());
- // we need the filename w/o app dir prepended since the file could
- // be placed in the include path
- $originalFile = $file;
- // if the filename is not absolute we assume its relative to the app dir
- $file = self::replacePath($file);
-
- $class = $autoload->getAttribute('name');
-
- if(!($fp = @fopen($file, 'r', true))) {
- if($originalFile != $file && ($fpOriginal = @fopen($originalFile, 'r', true))) {
- $file = $originalFile;
- $fp = $fpOriginal;
- } else {
- // the class path doesn't exist
- $error = 'Configuration file "%s" specifies class "%s" with ' .
- 'nonexistent or unreadable file "%s"';
- $error = sprintf($error, $document->documentURI, $class, $file);
-
- throw new AgaviParseException($error);
- }
+ $path = AgaviToolkit::expandDirectives($autoload->getValue());
+
+ // sanity check; XML Schema can't do <xs:choice> on attributes...
+ if(($isClass = $autoload->hasAttribute('class')) && $autoload->hasAttribute('namespace')) {
+ $error = sprintf(
+ 'Configuration file "%s" specifies both "class" and "namespace" attribute for path "%s"',
+ $document->documentURI,
+ $path
+ );
+ throw new AgaviParseException($error);
}
- fclose($fp);
-
- $data[$class] = $file;
+
+ // prepend the app dir if the path is not absolute
+ $file = self::replacePath($path);
+
+ // check if absolute path is readable or try to resolve it against the include path
+ if(!file_exists($file) && ($path == $file || !($file = stream_resolve_include_path($path)))) {
+ // the class path doesn't exist and couldn't be resolved against the include path either
+ $error = sprintf(
+ 'Configuration file "%s" specifies %s "%s" with non-existent path "%s"',
+ $document->documentURI,
+ $isClass ? 'file' : 'namespace',
+ $isClass ? $autoload->getAttribute('class') : $autoload->getAttribute('namespace'),
+ $path
+ );
+ throw new AgaviParseException($error);
+ }
+
+ if($isClass) {
+ // it's a class
+ $classes[$autoload->getAttribute('class')] = $file;
+ } else {
+ // it's a whole namespace
+ // trim backslashes from the namespace and trailing slashes or backslashes from the path
+ $namespaces[trim($autoload->getAttribute('namespace'), '\\')] = rtrim($file, '/\\');
+ }
}
}

$code = array(
- 'return ' . var_export($data, true) . ';',
+ 'AgaviAutoloader::addClasses(' . var_export($classes, true) . ');',
+ 'AgaviAutoloader::addNamespaces(' . var_export($namespaces, true) . ');',
);

return $this->generate($code, $document->documentURI);

Modified: branches/david-httpcaching/src/config/AgaviConfigCache.class.php
===================================================================
--- branches/david-httpcaching/src/config/AgaviConfigCache.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/AgaviConfigCache.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -405,7 +405,7 @@
// extended XSL* classes
if(!AgaviConfig::get('core.skip_config_transformations', false)) {
if(!extension_loaded('xsl')) {
- throw new AgaviConfigurationException("The XSL extension for PHP is used by Agavi for performing transformations in the configuration system; this may be disabled by setting\nAgaviConfig::set('core.skip_config_transformations', true);\nbefore calling\nAgavi::bootstrap();\nin index.php (app/config.php is not the right place for this).\n\nAs a result, you *will* have to use the latest configuration file formats and namespaces as backwards compatibility is implemented through XSLT. Also, certain additional configuration file validations implemented via Schematron will not be performed.");
+ throw new AgaviConfigurationException("You do not have the XSL extension for PHP (ext/xsl) installed or enabled. The extension is used by Agavi to perform XSL transformations in the configuration system to guarantee forwards compatibility of applications.\n\nIf you do not want to or can not install ext/xsl, you may disable all transformations by setting\nAgaviConfig::set('core.skip_config_transformations', true);\nbefore calling\nAgavi::bootstrap();\nin index.php (app/config.php is not the right place for this because this is a setting that's specific to your environment or machine).\n\nKeep in mind that disabling transformations mean you *have* to use the latest configuration file formats and namespace versions. Also, certain additional configuration file validations implemented via Schematron will not be performed.");
}
require($agaviDir . '/util/AgaviXsltProcessor.class.php');
}

Modified: branches/david-httpcaching/src/config/AgaviXmlConfigParser.class.php
===================================================================
--- branches/david-httpcaching/src/config/AgaviXmlConfigParser.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/AgaviXmlConfigParser.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -603,6 +603,7 @@
// load the stylesheet document into an XSLTProcessor instance
try {
$proc = new AgaviXsltProcessor();
+ $proc->registerPHPFunctions();
$proc->importStylesheet($xsl);
} catch(Exception $e) {
throw new AgaviParseException(sprintf('Configuration file "%s" could not be parsed: Could not import XSL stylesheet "%s": %s', $document->documentURI, $xsl->documentURI, $e->getMessage()), 0, $e);

Modified: branches/david-httpcaching/src/config/defaults/autoload.xml
===================================================================
--- branches/david-httpcaching/src/config/defaults/autoload.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/defaults/autoload.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -4,304 +4,305 @@
<autoloads>

<!-- agavi/action -->
- <autoload name="AgaviAction">%core.agavi_dir%/action/AgaviAction.class.php</autoload>
+ <autoload class="AgaviAction">%core.agavi_dir%/action/AgaviAction.class.php</autoload>

<!-- agavi/config -->
- <autoload name="AgaviAutoloadConfigHandler">%core.agavi_dir%/config/AgaviAutoloadConfigHandler.class.php</autoload>
- <autoload name="AgaviBaseConfigHandler">%core.agavi_dir%/config/AgaviBaseConfigHandler.class.php</autoload>
- <autoload name="AgaviCachingConfigHandler">%core.agavi_dir%/config/AgaviCachingConfigHandler.class.php</autoload>
- <autoload name="AgaviCompileConfigHandler">%core.agavi_dir%/config/AgaviCompileConfigHandler.class.php</autoload>
- <autoload name="AgaviConfig">%core.agavi_dir%/config/AgaviConfig.class.php</autoload>
- <autoload name="AgaviConfigCache">%core.agavi_dir%/config/AgaviConfigCache.class.php</autoload>
- <autoload name="AgaviConfigHandler">%core.agavi_dir%/config/AgaviConfigHandler.class.php</autoload>
- <autoload name="AgaviConfigHandlersConfigHandler">%core.agavi_dir%/config/AgaviConfigHandlersConfigHandler.class.php</autoload>
- <autoload name="AgaviConfigParser">%core.agavi_dir%/config/AgaviConfigParser.class.php</autoload>
- <autoload name="AgaviConfigValueHolder">%core.agavi_dir%/config/AgaviConfigValueHolder.class.php</autoload>
- <autoload name="AgaviDatabaseConfigHandler">%core.agavi_dir%/config/AgaviDatabaseConfigHandler.class.php</autoload>
- <autoload name="AgaviFactoryConfigHandler">%core.agavi_dir%/config/AgaviFactoryConfigHandler.class.php</autoload>
- <autoload name="AgaviFilterConfigHandler">%core.agavi_dir%/config/AgaviFilterConfigHandler.class.php</autoload>
- <autoload name="AgaviILegacyConfigHandler">%core.agavi_dir%/config/AgaviILegacyConfigHandler.interface.php</autoload>
- <autoload name="AgaviIXmlConfigHandler">%core.agavi_dir%/config/AgaviIXmlConfigHandler.interface.php</autoload>
- <autoload name="AgaviLdmlConfigHandler">%core.agavi_dir%/config/AgaviLdmlConfigHandler.class.php</autoload>
- <autoload name="AgaviLdmlSupplementalConfigHandler">%core.agavi_dir%/config/AgaviLdmlSupplementalConfigHandler.class.php</autoload>
- <autoload name="AgaviLoggingConfigHandler">%core.agavi_dir%/config/AgaviLoggingConfigHandler.class.php</autoload>
- <autoload name="AgaviModuleConfigHandler">%core.agavi_dir%/config/AgaviModuleConfigHandler.class.php</autoload>
- <autoload name="AgaviOutputTypeConfigHandler">%core.agavi_dir%/config/AgaviOutputTypeConfigHandler.class.php</autoload>
- <autoload name="AgaviRbacDefinitionConfigHandler">%core.agavi_dir%/config/AgaviRbacDefinitionConfigHandler.class.php</autoload>
- <autoload name="AgaviReturnArrayConfigHandler">%core.agavi_dir%/config/AgaviReturnArrayConfigHandler.class.php</autoload>
- <autoload name="AgaviRoutingConfigHandler">%core.agavi_dir%/config/AgaviRoutingConfigHandler.class.php</autoload>
- <autoload name="AgaviSettingConfigHandler">%core.agavi_dir%/config/AgaviSettingConfigHandler.class.php</autoload>
- <autoload name="AgaviTranslationConfigHandler">%core.agavi_dir%/config/AgaviTranslationConfigHandler.class.php</autoload>
- <autoload name="AgaviTestSuitesConfigHandler">%core.agavi_dir%/config/AgaviTestSuitesConfigHandler.class.php</autoload>
- <autoload name="AgaviValidatorConfigHandler">%core.agavi_dir%/config/AgaviValidatorConfigHandler.class.php</autoload>
- <autoload name="AgaviWsdlConfigHandler">%core.agavi_dir%/config/AgaviWsdlConfigHandler.class.php</autoload>
- <autoload name="AgaviXmlConfigDomAttr">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomAttr.class.php</autoload>
- <autoload name="AgaviXmlConfigDomCharacterData">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomCharacterData.class.php</autoload>
- <autoload name="AgaviXmlConfigDomComment">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomComment.class.php</autoload>
- <autoload name="AgaviXmlConfigDomDocument">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomDocument.class.php</autoload>
- <autoload name="AgaviXmlConfigDomDocumentFragment">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomDocumentFragment.class.php</autoload>
- <autoload name="AgaviXmlConfigDomDocumentType">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomDocumentType.class.php</autoload>
- <autoload name="AgaviXmlConfigDomElement">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomElement.class.php</autoload>
- <autoload name="AgaviXmlConfigDomEntity">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomEntity.class.php</autoload>
- <autoload name="AgaviXmlConfigDomEntityReference">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomEntityReference.class.php</autoload>
- <autoload name="AgaviXmlConfigDomNode">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomNode.class.php</autoload>
- <autoload name="AgaviXmlConfigDomNotation">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomNotation.class.php</autoload>
- <autoload name="AgaviXmlConfigDomProcessingInstruction">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomProcessingInstruction.class.php</autoload>
- <autoload name="AgaviXmlConfigDomText">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomText.class.php</autoload>
- <autoload name="AgaviXmlConfigHandler">%core.agavi_dir%/config/AgaviXmlConfigHandler.class.php</autoload>
- <autoload name="AgaviXmlConfigParser">%core.agavi_dir%/config/AgaviXmlConfigParser.class.php</autoload>
+ <autoload class="AgaviAutoloadConfigHandler">%core.agavi_dir%/config/AgaviAutoloadConfigHandler.class.php</autoload>
+ <autoload class="AgaviBaseConfigHandler">%core.agavi_dir%/config/AgaviBaseConfigHandler.class.php</autoload>
+ <autoload class="AgaviCachingConfigHandler">%core.agavi_dir%/config/AgaviCachingConfigHandler.class.php</autoload>
+ <autoload class="AgaviCompileConfigHandler">%core.agavi_dir%/config/AgaviCompileConfigHandler.class.php</autoload>
+ <autoload class="AgaviConfig">%core.agavi_dir%/config/AgaviConfig.class.php</autoload>
+ <autoload class="AgaviConfigCache">%core.agavi_dir%/config/AgaviConfigCache.class.php</autoload>
+ <autoload class="AgaviConfigHandler">%core.agavi_dir%/config/AgaviConfigHandler.class.php</autoload>
+ <autoload class="AgaviConfigHandlersConfigHandler">%core.agavi_dir%/config/AgaviConfigHandlersConfigHandler.class.php</autoload>
+ <autoload class="AgaviConfigParser">%core.agavi_dir%/config/AgaviConfigParser.class.php</autoload>
+ <autoload class="AgaviConfigValueHolder">%core.agavi_dir%/config/AgaviConfigValueHolder.class.php</autoload>
+ <autoload class="AgaviDatabaseConfigHandler">%core.agavi_dir%/config/AgaviDatabaseConfigHandler.class.php</autoload>
+ <autoload class="AgaviFactoryConfigHandler">%core.agavi_dir%/config/AgaviFactoryConfigHandler.class.php</autoload>
+ <autoload class="AgaviFilterConfigHandler">%core.agavi_dir%/config/AgaviFilterConfigHandler.class.php</autoload>
+ <autoload class="AgaviILegacyConfigHandler">%core.agavi_dir%/config/AgaviILegacyConfigHandler.interface.php</autoload>
+ <autoload class="AgaviIXmlConfigHandler">%core.agavi_dir%/config/AgaviIXmlConfigHandler.interface.php</autoload>
+ <autoload class="AgaviLdmlConfigHandler">%core.agavi_dir%/config/AgaviLdmlConfigHandler.class.php</autoload>
+ <autoload class="AgaviLdmlSupplementalConfigHandler">%core.agavi_dir%/config/AgaviLdmlSupplementalConfigHandler.class.php</autoload>
+ <autoload class="AgaviLoggingConfigHandler">%core.agavi_dir%/config/AgaviLoggingConfigHandler.class.php</autoload>
+ <autoload class="AgaviModuleConfigHandler">%core.agavi_dir%/config/AgaviModuleConfigHandler.class.php</autoload>
+ <autoload class="AgaviOutputTypeConfigHandler">%core.agavi_dir%/config/AgaviOutputTypeConfigHandler.class.php</autoload>
+ <autoload class="AgaviRbacDefinitionConfigHandler">%core.agavi_dir%/config/AgaviRbacDefinitionConfigHandler.class.php</autoload>
+ <autoload class="AgaviReturnArrayConfigHandler">%core.agavi_dir%/config/AgaviReturnArrayConfigHandler.class.php</autoload>
+ <autoload class="AgaviRoutingConfigHandler">%core.agavi_dir%/config/AgaviRoutingConfigHandler.class.php</autoload>
+ <autoload class="AgaviSettingConfigHandler">%core.agavi_dir%/config/AgaviSettingConfigHandler.class.php</autoload>
+ <autoload class="AgaviTranslationConfigHandler">%core.agavi_dir%/config/AgaviTranslationConfigHandler.class.php</autoload>
+ <autoload class="AgaviTestSuitesConfigHandler">%core.agavi_dir%/config/AgaviTestSuitesConfigHandler.class.php</autoload>
+ <autoload class="AgaviValidatorConfigHandler">%core.agavi_dir%/config/AgaviValidatorConfigHandler.class.php</autoload>
+ <autoload class="AgaviWsdlConfigHandler">%core.agavi_dir%/config/AgaviWsdlConfigHandler.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomAttr">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomAttr.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomCharacterData">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomCharacterData.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomComment">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomComment.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomDocument">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomDocument.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomDocumentFragment">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomDocumentFragment.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomDocumentType">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomDocumentType.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomElement">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomElement.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomEntity">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomEntity.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomEntityReference">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomEntityReference.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomNode">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomNode.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomNotation">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomNotation.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomProcessingInstruction">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomProcessingInstruction.class.php</autoload>
+ <autoload class="AgaviXmlConfigDomText">%core.agavi_dir%/config/util/dom/AgaviXmlConfigDomText.class.php</autoload>
+ <autoload class="AgaviXmlConfigHandler">%core.agavi_dir%/config/AgaviXmlConfigHandler.class.php</autoload>
+ <autoload class="AgaviXmlConfigParser">%core.agavi_dir%/config/AgaviXmlConfigParser.class.php</autoload>

<!-- agavi/controller -->
- <autoload name="AgaviController">%core.agavi_dir%/controller/AgaviController.class.php</autoload>
- <autoload name="AgaviExecutionContainer">%core.agavi_dir%/controller/AgaviExecutionContainer.class.php</autoload>
- <autoload name="AgaviOutputType">%core.agavi_dir%/controller/AgaviOutputType.class.php</autoload>
- <autoload name="AgaviSoapController">%core.agavi_dir%/controller/AgaviSoapController.class.php</autoload>
- <autoload name="AgaviSoapControllerCallHandler">%core.agavi_dir%/controller/AgaviSoapControllerCallHandler.class.php</autoload>
+ <autoload class="AgaviController">%core.agavi_dir%/controller/AgaviController.class.php</autoload>
+ <autoload class="AgaviExecutionContainer">%core.agavi_dir%/controller/AgaviExecutionContainer.class.php</autoload>
+ <autoload class="AgaviOutputType">%core.agavi_dir%/controller/AgaviOutputType.class.php</autoload>
+ <autoload class="AgaviSoapController">%core.agavi_dir%/controller/AgaviSoapController.class.php</autoload>
+ <autoload class="AgaviSoapControllerCallHandler">%core.agavi_dir%/controller/AgaviSoapControllerCallHandler.class.php</autoload>

<!-- agavi/core -->
- <autoload name="Agavi">%core.agavi_dir%/core/Agavi.class.php</autoload>
- <autoload name="AgaviContext">%core.agavi_dir%/core/AgaviContext.class.php</autoload>
+ <autoload class="Agavi">%core.agavi_dir%/core/Agavi.class.php</autoload>
+ <autoload class="AgaviContext">%core.agavi_dir%/core/AgaviContext.class.php</autoload>

<!-- agavi/database -->
- <autoload name="AgaviDatabase">%core.agavi_dir%/database/AgaviDatabase.class.php</autoload>
- <autoload name="AgaviDatabaseManager">%core.agavi_dir%/database/AgaviDatabaseManager.class.php</autoload>
- <autoload name="AgaviDoctrine2Database">%core.agavi_dir%/database/AgaviDoctrine2Database.class.php</autoload>
- <autoload name="AgaviDoctrine2dbalDatabase">%core.agavi_dir%/database/AgaviDoctrine2dbalDatabase.class.php</autoload>
- <autoload name="AgaviDoctrine2ormDatabase">%core.agavi_dir%/database/AgaviDoctrine2ormDatabase.class.php</autoload>
- <autoload name="AgaviDoctrineDatabase">%core.agavi_dir%/database/AgaviDoctrineDatabase.class.php</autoload>
- <autoload name="AgaviDoctrineDatabaseEventListener">%core.agavi_dir%/database/doctrine/AgaviDoctrineDatabaseEventListener.class.php</autoload>
- <autoload name="AgaviMysqlDatabase">%core.agavi_dir%/database/AgaviMysqlDatabase.class.php</autoload>
- <autoload name="AgaviMysqliDatabase">%core.agavi_dir%/database/AgaviMysqliDatabase.class.php</autoload>
- <autoload name="AgaviPdoDatabase">%core.agavi_dir%/database/AgaviPdoDatabase.class.php</autoload>
- <autoload name="AgaviPostgresqlDatabase">%core.agavi_dir%/database/AgaviPostgresqlDatabase.class.php</autoload>
- <autoload name="AgaviPropelDatabase">%core.agavi_dir%/database/AgaviPropelDatabase.class.php</autoload>
- <autoload name="AgaviSqlsrvDatabase">%core.agavi_dir%/database/AgaviSqlsrvDatabase.class.php</autoload>
- <autoload name="AgaviZendclouddocumentserviceDatabase">%core.agavi_dir%/database/AgaviZendclouddocumentserviceDatabase.class.php</autoload>
+ <autoload class="AgaviDatabase">%core.agavi_dir%/database/AgaviDatabase.class.php</autoload>
+ <autoload class="AgaviDatabaseManager">%core.agavi_dir%/database/AgaviDatabaseManager.class.php</autoload>
+ <autoload class="AgaviDoctrine2Database">%core.agavi_dir%/database/AgaviDoctrine2Database.class.php</autoload>
+ <autoload class="AgaviDoctrine2dbalDatabase">%core.agavi_dir%/database/AgaviDoctrine2dbalDatabase.class.php</autoload>
+ <autoload class="AgaviDoctrine2ormDatabase">%core.agavi_dir%/database/AgaviDoctrine2ormDatabase.class.php</autoload>
+ <autoload class="AgaviDoctrineDatabase">%core.agavi_dir%/database/AgaviDoctrineDatabase.class.php</autoload>
+ <autoload class="AgaviDoctrineDatabaseEventListener">%core.agavi_dir%/database/doctrine/AgaviDoctrineDatabaseEventListener.class.php</autoload>
+ <autoload class="AgaviMysqlDatabase">%core.agavi_dir%/database/AgaviMysqlDatabase.class.php</autoload>
+ <autoload class="AgaviMysqliDatabase">%core.agavi_dir%/database/AgaviMysqliDatabase.class.php</autoload>
+ <autoload class="AgaviPdoDatabase">%core.agavi_dir%/database/AgaviPdoDatabase.class.php</autoload>
+ <autoload class="AgaviPostgresqlDatabase">%core.agavi_dir%/database/AgaviPostgresqlDatabase.class.php</autoload>
+ <autoload class="AgaviPropelDatabase">%core.agavi_dir%/database/AgaviPropelDatabase.class.php</autoload>
+ <autoload class="AgaviSqlsrvDatabase">%core.agavi_dir%/database/AgaviSqlsrvDatabase.class.php</autoload>
+ <autoload class="AgaviZendclouddocumentserviceDatabase">%core.agavi_dir%/database/AgaviZendclouddocumentserviceDatabase.class.php</autoload>

<!-- agavi/date -->
- <autoload name="AgaviCalendar">%core.agavi_dir%/date/AgaviCalendar.class.php</autoload>
- <autoload name="AgaviCalendarGrego">%core.agavi_dir%/date/AgaviCalendarGrego.class.php</autoload>
- <autoload name="AgaviDateDefinitions">%core.agavi_dir%/date/AgaviDateDefinitions.class.php</autoload>
- <autoload name="AgaviDateFormat">%core.agavi_dir%/date/AgaviDateFormat.class.php</autoload>
- <autoload name="AgaviGregorianCalendar">%core.agavi_dir%/date/AgaviGregorianCalendar.class.php</autoload>
- <autoload name="AgaviOlsonTimeZone">%core.agavi_dir%/date/AgaviOlsonTimeZone.class.php</autoload>
- <autoload name="AgaviSimpleTimeZone">%core.agavi_dir%/date/AgaviSimpleTimeZone.class.php</autoload>
- <autoload name="AgaviTimeZone">%core.agavi_dir%/date/AgaviTimeZone.class.php</autoload>
- <autoload name="AgaviTimeZoneDataParser">%core.agavi_dir%/date/AgaviTimeZoneDataParser.class.php</autoload>
+ <autoload class="AgaviCalendar">%core.agavi_dir%/date/AgaviCalendar.class.php</autoload>
+ <autoload class="AgaviCalendarGrego">%core.agavi_dir%/date/AgaviCalendarGrego.class.php</autoload>
+ <autoload class="AgaviDateDefinitions">%core.agavi_dir%/date/AgaviDateDefinitions.class.php</autoload>
+ <autoload class="AgaviDateFormat">%core.agavi_dir%/date/AgaviDateFormat.class.php</autoload>
+ <autoload class="AgaviGregorianCalendar">%core.agavi_dir%/date/AgaviGregorianCalendar.class.php</autoload>
+ <autoload class="AgaviOlsonTimeZone">%core.agavi_dir%/date/AgaviOlsonTimeZone.class.php</autoload>
+ <autoload class="AgaviSimpleTimeZone">%core.agavi_dir%/date/AgaviSimpleTimeZone.class.php</autoload>
+ <autoload class="AgaviTimeZone">%core.agavi_dir%/date/AgaviTimeZone.class.php</autoload>
+ <autoload class="AgaviTimeZoneDataParser">%core.agavi_dir%/date/AgaviTimeZoneDataParser.class.php</autoload>

<!-- agavi/exception -->
- <autoload name="AgaviAutoloadException">%core.agavi_dir%/exception/AgaviAutoloadException.class.php</autoload>
- <autoload name="AgaviCacheException">%core.agavi_dir%/exception/AgaviCacheException.class.php</autoload>
- <autoload name="AgaviConfigurationException">%core.agavi_dir%/exception/AgaviConfigurationException.class.php</autoload>
- <autoload name="AgaviControllerException">%core.agavi_dir%/exception/AgaviControllerException.class.php</autoload>
- <autoload name="AgaviDatabaseException">%core.agavi_dir%/exception/AgaviDatabaseException.class.php</autoload>
- <autoload name="AgaviException">%core.agavi_dir%/exception/AgaviException.class.php</autoload>
- <autoload name="AgaviFactoryException">%core.agavi_dir%/exception/AgaviFactoryException.class.php</autoload>
- <autoload name="AgaviFileException">%core.agavi_dir%/exception/AgaviFileException.class.php</autoload>
- <autoload name="AgaviFilterException">%core.agavi_dir%/exception/AgaviFilterException.class.php</autoload>
- <autoload name="AgaviInitializationException">%core.agavi_dir%/exception/AgaviInitializationException.class.php</autoload>
- <autoload name="AgaviDisabledModuleException">%core.agavi_dir%/exception/AgaviDisabledModuleException.class.php</autoload>
- <autoload name="AgaviLoggingException">%core.agavi_dir%/exception/AgaviLoggingException.class.php</autoload>
- <autoload name="AgaviParseException">%core.agavi_dir%/exception/AgaviParseException.class.php</autoload>
- <autoload name="AgaviRenderException">%core.agavi_dir%/exception/AgaviRenderException.class.php</autoload>
- <autoload name="AgaviSecurityException">%core.agavi_dir%/exception/AgaviSecurityException.class.php</autoload>
- <autoload name="AgaviStorageException">%core.agavi_dir%/exception/AgaviStorageException.class.php</autoload>
- <autoload name="AgaviUncacheableException">%core.agavi_dir%/exception/AgaviUncacheableException.class.php</autoload>
- <autoload name="AgaviValidatorException">%core.agavi_dir%/exception/AgaviValidatorException.class.php</autoload>
- <autoload name="AgaviViewException">%core.agavi_dir%/exception/AgaviViewException.class.php</autoload>
+ <autoload class="AgaviAutoloadException">%core.agavi_dir%/exception/AgaviAutoloadException.class.php</autoload>
+ <autoload class="AgaviCacheException">%core.agavi_dir%/exception/AgaviCacheException.class.php</autoload>
+ <autoload class="AgaviConfigurationException">%core.agavi_dir%/exception/AgaviConfigurationException.class.php</autoload>
+ <autoload class="AgaviControllerException">%core.agavi_dir%/exception/AgaviControllerException.class.php</autoload>
+ <autoload class="AgaviDatabaseException">%core.agavi_dir%/exception/AgaviDatabaseException.class.php</autoload>
+ <autoload class="AgaviException">%core.agavi_dir%/exception/AgaviException.class.php</autoload>
+ <autoload class="AgaviFactoryException">%core.agavi_dir%/exception/AgaviFactoryException.class.php</autoload>
+ <autoload class="AgaviFileException">%core.agavi_dir%/exception/AgaviFileException.class.php</autoload>
+ <autoload class="AgaviFilterException">%core.agavi_dir%/exception/AgaviFilterException.class.php</autoload>
+ <autoload class="AgaviInitializationException">%core.agavi_dir%/exception/AgaviInitializationException.class.php</autoload>
+ <autoload class="AgaviDisabledModuleException">%core.agavi_dir%/exception/AgaviDisabledModuleException.class.php</autoload>
+ <autoload class="AgaviLoggingException">%core.agavi_dir%/exception/AgaviLoggingException.class.php</autoload>
+ <autoload class="AgaviParseException">%core.agavi_dir%/exception/AgaviParseException.class.php</autoload>
+ <autoload class="AgaviRenderException">%core.agavi_dir%/exception/AgaviRenderException.class.php</autoload>
+ <autoload class="AgaviSecurityException">%core.agavi_dir%/exception/AgaviSecurityException.class.php</autoload>
+ <autoload class="AgaviStorageException">%core.agavi_dir%/exception/AgaviStorageException.class.php</autoload>
+ <autoload class="AgaviUncacheableException">%core.agavi_dir%/exception/AgaviUncacheableException.class.php</autoload>
+ <autoload class="AgaviValidatorException">%core.agavi_dir%/exception/AgaviValidatorException.class.php</autoload>
+ <autoload class="AgaviViewException">%core.agavi_dir%/exception/AgaviViewException.class.php</autoload>

<!-- agavi/filter -->
- <autoload name="AgaviDispatchFilter">%core.agavi_dir%/filter/AgaviDispatchFilter.class.php</autoload>
- <autoload name="AgaviExecutionFilter">%core.agavi_dir%/filter/AgaviExecutionFilter.class.php</autoload>
- <autoload name="AgaviExecutionTimeFilter">%core.agavi_dir%/filter/AgaviExecutionTimeFilter.class.php</autoload>
- <autoload name="AgaviFilter">%core.agavi_dir%/filter/AgaviFilter.class.php</autoload>
- <autoload name="AgaviFilterChain">%core.agavi_dir%/filter/AgaviFilterChain.class.php</autoload>
- <autoload name="AgaviFormPopulationFilter">%core.agavi_dir%/filter/AgaviFormPopulationFilter.class.php</autoload>
- <autoload name="AgaviIActionFilter">%core.agavi_dir%/filter/AgaviIActionFilter.interface.php</autoload>
- <autoload name="AgaviIFilter">%core.agavi_dir%/filter/AgaviIFilter.interface.php</autoload>
- <autoload name="AgaviIGlobalFilter">%core.agavi_dir%/filter/AgaviIGlobalFilter.interface.php</autoload>
- <autoload name="AgaviISecurityFilter">%core.agavi_dir%/filter/AgaviISecurityFilter.interface.php</autoload>
- <autoload name="AgaviSecurityFilter">%core.agavi_dir%/filter/AgaviSecurityFilter.class.php</autoload>
- <autoload name="AgaviTidyFilter">%core.agavi_dir%/filter/AgaviTidyFilter.class.php</autoload>
+ <autoload class="AgaviDispatchFilter">%core.agavi_dir%/filter/AgaviDispatchFilter.class.php</autoload>
+ <autoload class="AgaviExecutionFilter">%core.agavi_dir%/filter/AgaviExecutionFilter.class.php</autoload>
+ <autoload class="AgaviExecutionTimeFilter">%core.agavi_dir%/filter/AgaviExecutionTimeFilter.class.php</autoload>
+ <autoload class="AgaviFilter">%core.agavi_dir%/filter/AgaviFilter.class.php</autoload>
+ <autoload class="AgaviFilterChain">%core.agavi_dir%/filter/AgaviFilterChain.class.php</autoload>
+ <autoload class="AgaviFormPopulationFilter">%core.agavi_dir%/filter/AgaviFormPopulationFilter.class.php</autoload>
+ <autoload class="AgaviIActionFilter">%core.agavi_dir%/filter/AgaviIActionFilter.interface.php</autoload>
+ <autoload class="AgaviIFilter">%core.agavi_dir%/filter/AgaviIFilter.interface.php</autoload>
+ <autoload class="AgaviIGlobalFilter">%core.agavi_dir%/filter/AgaviIGlobalFilter.interface.php</autoload>
+ <autoload class="AgaviISecurityFilter">%core.agavi_dir%/filter/AgaviISecurityFilter.interface.php</autoload>
+ <autoload class="AgaviSecurityFilter">%core.agavi_dir%/filter/AgaviSecurityFilter.class.php</autoload>
+ <autoload class="AgaviTidyFilter">%core.agavi_dir%/filter/AgaviTidyFilter.class.php</autoload>

<!-- agavi/logging -->
- <autoload name="AgaviFileLoggerAppender">%core.agavi_dir%/logging/AgaviFileLoggerAppender.class.php</autoload>
- <autoload name="AgaviILogger">%core.agavi_dir%/logging/AgaviILogger.interface.php</autoload>
- <autoload name="AgaviJsonLoggerLayout">%core.agavi_dir%/logging/AgaviJsonLoggerLayout.class.php</autoload>
- <autoload name="AgaviLogger">%core.agavi_dir%/logging/AgaviLogger.class.php</autoload>
- <autoload name="AgaviLoggerAppender">%core.agavi_dir%/logging/AgaviLoggerAppender.class.php</autoload>
- <autoload name="AgaviLoggerLayout">%core.agavi_dir%/logging/AgaviLoggerLayout.class.php</autoload>
- <autoload name="AgaviLoggerManager">%core.agavi_dir%/logging/AgaviLoggerManager.class.php</autoload>
- <autoload name="AgaviLoggerMessage">%core.agavi_dir%/logging/AgaviLoggerMessage.class.php</autoload>
- <autoload name="AgaviPassthruLoggerLayout">%core.agavi_dir%/logging/AgaviPassthruLoggerLayout.class.php</autoload>
- <autoload name="AgaviRotatingFileLoggerAppender">%core.agavi_dir%/logging/AgaviRotatingFileLoggerAppender.class.php</autoload>
- <autoload name="AgaviScribeLoggerAppender">%core.agavi_dir%/logging/AgaviScribeLoggerAppender.class.php</autoload>
- <autoload name="AgaviStderrLoggerAppender">%core.agavi_dir%/logging/AgaviStderrLoggerAppender.class.php</autoload>
- <autoload name="AgaviStdoutLoggerAppender">%core.agavi_dir%/logging/AgaviStdoutLoggerAppender.class.php</autoload>
- <autoload name="AgaviStreamLoggerAppender">%core.agavi_dir%/logging/AgaviStreamLoggerAppender.class.php</autoload>
- <autoload name="AgaviTimestampLoggerLayout">%core.agavi_dir%/logging/AgaviTimestampLoggerLayout.class.php</autoload>
+ <autoload class="AgaviFileLoggerAppender">%core.agavi_dir%/logging/AgaviFileLoggerAppender.class.php</autoload>
+ <autoload class="AgaviILogger">%core.agavi_dir%/logging/AgaviILogger.interface.php</autoload>
+ <autoload class="AgaviJsonLoggerLayout">%core.agavi_dir%/logging/AgaviJsonLoggerLayout.class.php</autoload>
+ <autoload class="AgaviLogger">%core.agavi_dir%/logging/AgaviLogger.class.php</autoload>
+ <autoload class="AgaviLoggerAppender">%core.agavi_dir%/logging/AgaviLoggerAppender.class.php</autoload>
+ <autoload class="AgaviLoggerLayout">%core.agavi_dir%/logging/AgaviLoggerLayout.class.php</autoload>
+ <autoload class="AgaviLoggerManager">%core.agavi_dir%/logging/AgaviLoggerManager.class.php</autoload>
+ <autoload class="AgaviLoggerMessage">%core.agavi_dir%/logging/AgaviLoggerMessage.class.php</autoload>
+ <autoload class="AgaviPassthruLoggerLayout">%core.agavi_dir%/logging/AgaviPassthruLoggerLayout.class.php</autoload>
+ <autoload class="AgaviRotatingFileLoggerAppender">%core.agavi_dir%/logging/AgaviRotatingFileLoggerAppender.class.php</autoload>
+ <autoload class="AgaviScribeLoggerAppender">%core.agavi_dir%/logging/AgaviScribeLoggerAppender.class.php</autoload>
+ <autoload class="AgaviStderrLoggerAppender">%core.agavi_dir%/logging/AgaviStderrLoggerAppender.class.php</autoload>
+ <autoload class="AgaviStdoutLoggerAppender">%core.agavi_dir%/logging/AgaviStdoutLoggerAppender.class.php</autoload>
+ <autoload class="AgaviStreamLoggerAppender">%core.agavi_dir%/logging/AgaviStreamLoggerAppender.class.php</autoload>
+ <autoload class="AgaviTimestampLoggerLayout">%core.agavi_dir%/logging/AgaviTimestampLoggerLayout.class.php</autoload>

<!-- agavi/model -->
- <autoload name="AgaviIModel">%core.agavi_dir%/model/AgaviIModel.interface.php</autoload>
- <autoload name="AgaviISingletonModel">%core.agavi_dir%/model/AgaviISingletonModel.interface.php</autoload>
- <autoload name="AgaviModel">%core.agavi_dir%/model/AgaviModel.class.php</autoload>
+ <autoload class="AgaviIModel">%core.agavi_dir%/model/AgaviIModel.interface.php</autoload>
+ <autoload class="AgaviISingletonModel">%core.agavi_dir%/model/AgaviISingletonModel.interface.php</autoload>
+ <autoload class="AgaviModel">%core.agavi_dir%/model/AgaviModel.class.php</autoload>

<!-- agavi/renderer -->
- <autoload name="AgaviEzctemplateCustomBlocks">%core.agavi_dir%/renderer/ezctemplate/AgaviEzctemplateCustomBlocks.class.php</autoload>
- <autoload name="AgaviEzctemplateCustomFunctions">%core.agavi_dir%/renderer/ezctemplate/AgaviEzctemplateCustomFunctions.class.php</autoload>
- <autoload name="AgaviEzctemplateRenderer">%core.agavi_dir%/renderer/AgaviEzctemplateRenderer.class.php</autoload>
- <autoload name="AgaviEzctemplateTemplate">%core.agavi_dir%/renderer/ezctemplate/AgaviEzctemplateTemplate.class.php</autoload>
- <autoload name="AgaviIEzctemplateTemplate">%core.agavi_dir%/renderer/ezctemplate/AgaviIEzctemplateTemplate.interface.php</autoload>
- <autoload name="AgaviIReusableRenderer">%core.agavi_dir%/renderer/AgaviIReusableRenderer.interface.php</autoload>
- <autoload name="AgaviPhpRenderer">%core.agavi_dir%/renderer/AgaviPhpRenderer.class.php</autoload>
- <autoload name="AgaviPhptalRenderer">%core.agavi_dir%/renderer/AgaviPhptalRenderer.class.php</autoload>
- <autoload name="AgaviRenderer">%core.agavi_dir%/renderer/AgaviRenderer.class.php</autoload>
- <autoload name="AgaviSmartyRenderer">%core.agavi_dir%/renderer/AgaviSmartyRenderer.class.php</autoload>
- <autoload name="AgaviTwigRenderer">%core.agavi_dir%/renderer/AgaviTwigRenderer.class.php</autoload>
- <autoload name="AgaviXsltRenderer">%core.agavi_dir%/renderer/AgaviXsltRenderer.class.php</autoload>
+ <autoload class="AgaviEzctemplateCustomBlocks">%core.agavi_dir%/renderer/ezctemplate/AgaviEzctemplateCustomBlocks.class.php</autoload>
+ <autoload class="AgaviEzctemplateCustomFunctions">%core.agavi_dir%/renderer/ezctemplate/AgaviEzctemplateCustomFunctions.class.php</autoload>
+ <autoload class="AgaviEzctemplateRenderer">%core.agavi_dir%/renderer/AgaviEzctemplateRenderer.class.php</autoload>
+ <autoload class="AgaviEzctemplateTemplate">%core.agavi_dir%/renderer/ezctemplate/AgaviEzctemplateTemplate.class.php</autoload>
+ <autoload class="AgaviIEzctemplateTemplate">%core.agavi_dir%/renderer/ezctemplate/AgaviIEzctemplateTemplate.interface.php</autoload>
+ <autoload class="AgaviIReusableRenderer">%core.agavi_dir%/renderer/AgaviIReusableRenderer.interface.php</autoload>
+ <autoload class="AgaviPhpRenderer">%core.agavi_dir%/renderer/AgaviPhpRenderer.class.php</autoload>
+ <autoload class="AgaviPhptalRenderer">%core.agavi_dir%/renderer/AgaviPhptalRenderer.class.php</autoload>
+ <autoload class="AgaviRenderer">%core.agavi_dir%/renderer/AgaviRenderer.class.php</autoload>
+ <autoload class="AgaviSmartyRenderer">%core.agavi_dir%/renderer/AgaviSmartyRenderer.class.php</autoload>
+ <autoload class="AgaviTwigRenderer">%core.agavi_dir%/renderer/AgaviTwigRenderer.class.php</autoload>
+ <autoload class="AgaviXsltRenderer">%core.agavi_dir%/renderer/AgaviXsltRenderer.class.php</autoload>

<!-- agavi/request -->
- <autoload name="AgaviConsoleRequest">%core.agavi_dir%/request/AgaviConsoleRequest.class.php</autoload>
- <autoload name="AgaviConsoleRequestDataHolder">%core.agavi_dir%/request/AgaviConsoleRequestDataHolder.class.php</autoload>
- <autoload name="AgaviICookiesRequestDataHolder">%core.agavi_dir%/request/AgaviICookiesRequestDataHolder.interface.php</autoload>
- <autoload name="AgaviIFilesRequestDataHolder">%core.agavi_dir%/request/AgaviIFilesRequestDataHolder.interface.php</autoload>
- <autoload name="AgaviIHeadersRequestDataHolder">%core.agavi_dir%/request/AgaviIHeadersRequestDataHolder.interface.php</autoload>
- <autoload name="AgaviIParametersRequestDataHolder">%core.agavi_dir%/request/AgaviIParametersRequestDataHolder.interface.php</autoload>
- <autoload name="AgaviRequest">%core.agavi_dir%/request/AgaviRequest.class.php</autoload>
- <autoload name="AgaviRequestDataHolder">%core.agavi_dir%/request/AgaviRequestDataHolder.class.php</autoload>
- <autoload name="AgaviSecureWebRequest">%core.agavi_dir%/request/AgaviSecureWebRequest.class.php</autoload>
- <autoload name="AgaviSoapRequest">%core.agavi_dir%/request/AgaviSoapRequest.class.php</autoload>
- <autoload name="AgaviSoapRequestDataHolder">%core.agavi_dir%/request/AgaviSoapRequestDataHolder.class.php</autoload>
- <autoload name="AgaviUploadedFile">%core.agavi_dir%/request/AgaviUploadedFile.class.php</autoload>
- <autoload name="AgaviWebRequest">%core.agavi_dir%/request/AgaviWebRequest.class.php</autoload>
- <autoload name="AgaviWebRequestDataHolder">%core.agavi_dir%/request/AgaviWebRequestDataHolder.class.php</autoload>
- <autoload name="AgaviWebserviceRequest">%core.agavi_dir%/request/AgaviWebserviceRequest.class.php</autoload>
- <autoload name="AgaviWebserviceRequestDataHolder">%core.agavi_dir%/request/AgaviWebserviceRequestDataHolder.class.php</autoload>
- <autoload name="AgaviXmlrpcepiphpRequest">%core.agavi_dir%/request/AgaviXmlrpcepiphpRequest.class.php</autoload>
+ <autoload class="AgaviConsoleRequest">%core.agavi_dir%/request/AgaviConsoleRequest.class.php</autoload>
+ <autoload class="AgaviConsoleRequestDataHolder">%core.agavi_dir%/request/AgaviConsoleRequestDataHolder.class.php</autoload>
+ <autoload class="AgaviICookiesRequestDataHolder">%core.agavi_dir%/request/AgaviICookiesRequestDataHolder.interface.php</autoload>
+ <autoload class="AgaviIFilesRequestDataHolder">%core.agavi_dir%/request/AgaviIFilesRequestDataHolder.interface.php</autoload>
+ <autoload class="AgaviIHeadersRequestDataHolder">%core.agavi_dir%/request/AgaviIHeadersRequestDataHolder.interface.php</autoload>
+ <autoload class="AgaviIParametersRequestDataHolder">%core.agavi_dir%/request/AgaviIParametersRequestDataHolder.interface.php</autoload>
+ <autoload class="AgaviRequest">%core.agavi_dir%/request/AgaviRequest.class.php</autoload>
+ <autoload class="AgaviRequestDataHolder">%core.agavi_dir%/request/AgaviRequestDataHolder.class.php</autoload>
+ <autoload class="AgaviSecureWebRequest">%core.agavi_dir%/request/AgaviSecureWebRequest.class.php</autoload>
+ <autoload class="AgaviSoapRequest">%core.agavi_dir%/request/AgaviSoapRequest.class.php</autoload>
+ <autoload class="AgaviSoapRequestDataHolder">%core.agavi_dir%/request/AgaviSoapRequestDataHolder.class.php</autoload>
+ <autoload class="AgaviUploadedFile">%core.agavi_dir%/request/AgaviUploadedFile.class.php</autoload>
+ <autoload class="AgaviWebRequest">%core.agavi_dir%/request/AgaviWebRequest.class.php</autoload>
+ <autoload class="AgaviWebRequestDataHolder">%core.agavi_dir%/request/AgaviWebRequestDataHolder.class.php</autoload>
+ <autoload class="AgaviWebserviceRequest">%core.agavi_dir%/request/AgaviWebserviceRequest.class.php</autoload>
+ <autoload class="AgaviWebserviceRequestDataHolder">%core.agavi_dir%/request/AgaviWebserviceRequestDataHolder.class.php</autoload>
+ <autoload class="AgaviXmlrpcepiphpRequest">%core.agavi_dir%/request/AgaviXmlrpcepiphpRequest.class.php</autoload>

<!-- agavi/response -->
- <autoload name="AgaviResponse">%core.agavi_dir%/response/AgaviResponse.class.php</autoload>
- <autoload name="AgaviConsoleResponse">%core.agavi_dir%/response/AgaviConsoleResponse.class.php</autoload>
- <autoload name="AgaviSoapResponse">%core.agavi_dir%/response/AgaviSoapResponse.class.php</autoload>
- <autoload name="AgaviWebResponse">%core.agavi_dir%/response/AgaviWebResponse.class.php</autoload>
- <autoload name="AgaviXmlrpcepiphpResponse">%core.agavi_dir%/response/AgaviXmlrpcepiphpResponse.class.php</autoload>
+ <autoload class="AgaviResponse">%core.agavi_dir%/response/AgaviResponse.class.php</autoload>
+ <autoload class="AgaviConsoleResponse">%core.agavi_dir%/response/AgaviConsoleResponse.class.php</autoload>
+ <autoload class="AgaviSoapResponse">%core.agavi_dir%/response/AgaviSoapResponse.class.php</autoload>
+ <autoload class="AgaviWebResponse">%core.agavi_dir%/response/AgaviWebResponse.class.php</autoload>
+ <autoload class="AgaviXmlrpcepiphpResponse">%core.agavi_dir%/response/AgaviXmlrpcepiphpResponse.class.php</autoload>

<!-- agavi/routing -->
- <autoload name="AgaviConsoleRouting">%core.agavi_dir%/routing/AgaviConsoleRouting.class.php</autoload>
- <autoload name="AgaviHttpRedirectRoutingCallback">%core.agavi_dir%/routing/AgaviHttpRedirectRoutingCallback.class.php</autoload>
- <autoload name="AgaviILegacyRoutingCallback">%core.agavi_dir%/routing/AgaviILegacyRoutingCallback.interface.php</autoload>
- <autoload name="AgaviIRoutingSource">%core.agavi_dir%/routing/AgaviIRoutingSource.interface.php</autoload>
- <autoload name="AgaviIRoutingValue">%core.agavi_dir%/routing/AgaviIRoutingValue.interface.php</autoload>
- <autoload name="AgaviRouting">%core.agavi_dir%/routing/AgaviRouting.class.php</autoload>
- <autoload name="AgaviRoutingArraySource">%core.agavi_dir%/routing/AgaviRoutingArraySource.class.php</autoload>
- <autoload name="AgaviRoutingCallback">%core.agavi_dir%/routing/AgaviRoutingCallback.class.php</autoload>
- <autoload name="AgaviRoutingValue">%core.agavi_dir%/routing/AgaviRoutingValue.class.php</autoload>
- <autoload name="AgaviRoutingUserSource">%core.agavi_dir%/routing/AgaviRoutingUserSource.class.php</autoload>
- <autoload name="AgaviSoapRouting">%core.agavi_dir%/routing/AgaviSoapRouting.class.php</autoload>
- <autoload name="AgaviWebRouting">%core.agavi_dir%/routing/AgaviWebRouting.class.php</autoload>
- <autoload name="AgaviWebserviceRouting">%core.agavi_dir%/routing/AgaviWebserviceRouting.class.php</autoload>
- <autoload name="AgaviXmlrpcepiphpRouting">%core.agavi_dir%/routing/AgaviXmlrpcepiphpRouting.class.php</autoload>
+ <autoload class="AgaviConsoleRouting">%core.agavi_dir%/routing/AgaviConsoleRouting.class.php</autoload>
+ <autoload class="AgaviHttpRedirectRoutingCallback">%core.agavi_dir%/routing/AgaviHttpRedirectRoutingCallback.class.php</autoload>
+ <autoload class="AgaviILegacyRoutingCallback">%core.agavi_dir%/routing/AgaviILegacyRoutingCallback.interface.php</autoload>
+ <autoload class="AgaviIRoutingSource">%core.agavi_dir%/routing/AgaviIRoutingSource.interface.php</autoload>
+ <autoload class="AgaviIRoutingValue">%core.agavi_dir%/routing/AgaviIRoutingValue.interface.php</autoload>
+ <autoload class="AgaviRouting">%core.agavi_dir%/routing/AgaviRouting.class.php</autoload>
+ <autoload class="AgaviRoutingArraySource">%core.agavi_dir%/routing/AgaviRoutingArraySource.class.php</autoload>
+ <autoload class="AgaviRoutingCallback">%core.agavi_dir%/routing/AgaviRoutingCallback.class.php</autoload>
+ <autoload class="AgaviRoutingValue">%core.agavi_dir%/routing/AgaviRoutingValue.class.php</autoload>
+ <autoload class="AgaviRoutingUserSource">%core.agavi_dir%/routing/AgaviRoutingUserSource.class.php</autoload>
+ <autoload class="AgaviSoapRouting">%core.agavi_dir%/routing/AgaviSoapRouting.class.php</autoload>
+ <autoload class="AgaviWebRouting">%core.agavi_dir%/routing/AgaviWebRouting.class.php</autoload>
+ <autoload class="AgaviWebserviceRouting">%core.agavi_dir%/routing/AgaviWebserviceRouting.class.php</autoload>
+ <autoload class="AgaviXmlrpcepiphpRouting">%core.agavi_dir%/routing/AgaviXmlrpcepiphpRouting.class.php</autoload>

<!-- agavi/storage -->
- <autoload name="AgaviMysqlSessionStorage">%core.agavi_dir%/storage/AgaviMysqlSessionStorage.class.php</autoload>
- <autoload name="AgaviNullStorage">%core.agavi_dir%/storage/AgaviNullStorage.class.php</autoload>
- <autoload name="AgaviPdoSessionStorage">%core.agavi_dir%/storage/AgaviPdoSessionStorage.class.php</autoload>
- <autoload name="AgaviPostgresqlSessionStorage">%core.agavi_dir%/storage/AgaviPostgresqlSessionStorage.class.php</autoload>
- <autoload name="AgaviSessionStorage">%core.agavi_dir%/storage/AgaviSessionStorage.class.php</autoload>
- <autoload name="AgaviSqlsrvSessionStorage">%core.agavi_dir%/storage/AgaviSqlsrvSessionStorage.class.php</autoload>
- <autoload name="AgaviStorage">%core.agavi_dir%/storage/AgaviStorage.class.php</autoload>
- <autoload name="AgaviWindowsazureSessionStorage">%core.agavi_dir%/storage/AgaviWindowsazureSessionStorage.class.php</autoload>
+ <autoload class="AgaviMysqlSessionStorage">%core.agavi_dir%/storage/AgaviMysqlSessionStorage.class.php</autoload>
+ <autoload class="AgaviNullStorage">%core.agavi_dir%/storage/AgaviNullStorage.class.php</autoload>
+ <autoload class="AgaviPdoSessionStorage">%core.agavi_dir%/storage/AgaviPdoSessionStorage.class.php</autoload>
+ <autoload class="AgaviPostgresqlSessionStorage">%core.agavi_dir%/storage/AgaviPostgresqlSessionStorage.class.php</autoload>
+ <autoload class="AgaviSessionStorage">%core.agavi_dir%/storage/AgaviSessionStorage.class.php</autoload>
+ <autoload class="AgaviSqlsrvSessionStorage">%core.agavi_dir%/storage/AgaviSqlsrvSessionStorage.class.php</autoload>
+ <autoload class="AgaviStorage">%core.agavi_dir%/storage/AgaviStorage.class.php</autoload>
+ <autoload class="AgaviWindowsazureSessionStorage">%core.agavi_dir%/storage/AgaviWindowsazureSessionStorage.class.php</autoload>

<!-- agavi/translation -->
- <autoload name="AgaviBasicTranslator">%core.agavi_dir%/translation/AgaviBasicTranslator.class.php</autoload>
- <autoload name="AgaviCurrencyFormatter">%core.agavi_dir%/translation/AgaviCurrencyFormatter.class.php</autoload>
- <autoload name="AgaviDateFormatter">%core.agavi_dir%/translation/AgaviDateFormatter.class.php</autoload>
- <autoload name="AgaviGettextTranslator">%core.agavi_dir%/translation/AgaviGettextTranslator.class.php</autoload>
- <autoload name="AgaviITranslator">%core.agavi_dir%/translation/AgaviITranslator.interface.php</autoload>
- <autoload name="AgaviLocale">%core.agavi_dir%/translation/AgaviLocale.class.php</autoload>
- <autoload name="AgaviNumberFormatter">%core.agavi_dir%/translation/AgaviNumberFormatter.class.php</autoload>
- <autoload name="AgaviSimpleTranslator">%core.agavi_dir%/translation/AgaviSimpleTranslator.class.php</autoload>
- <autoload name="AgaviTranslationManager">%core.agavi_dir%/translation/AgaviTranslationManager.class.php</autoload>
+ <autoload class="AgaviBasicTranslator">%core.agavi_dir%/translation/AgaviBasicTranslator.class.php</autoload>
+ <autoload class="AgaviCurrencyFormatter">%core.agavi_dir%/translation/AgaviCurrencyFormatter.class.php</autoload>
+ <autoload class="AgaviDateFormatter">%core.agavi_dir%/translation/AgaviDateFormatter.class.php</autoload>
+ <autoload class="AgaviGettextTranslator">%core.agavi_dir%/translation/AgaviGettextTranslator.class.php</autoload>
+ <autoload class="AgaviITranslator">%core.agavi_dir%/translation/AgaviITranslator.interface.php</autoload>
+ <autoload class="AgaviLocale">%core.agavi_dir%/translation/AgaviLocale.class.php</autoload>
+ <autoload class="AgaviNumberFormatter">%core.agavi_dir%/translation/AgaviNumberFormatter.class.php</autoload>
+ <autoload class="AgaviSimpleTranslator">%core.agavi_dir%/translation/AgaviSimpleTranslator.class.php</autoload>
+ <autoload class="AgaviTranslationManager">%core.agavi_dir%/translation/AgaviTranslationManager.class.php</autoload>

<!-- agavi/translation/gettext -->
- <autoload name="AgaviGettextMoReader">%core.agavi_dir%/translation/gettext/AgaviGettextMoReader.class.php</autoload>
+ <autoload class="AgaviGettextMoReader">%core.agavi_dir%/translation/gettext/AgaviGettextMoReader.class.php</autoload>

<!-- agavi/user -->
- <autoload name="AgaviISecurityUser">%core.agavi_dir%/user/AgaviISecurityUser.interface.php</autoload>
- <autoload name="AgaviRbacSecurityUser">%core.agavi_dir%/user/AgaviRbacSecurityUser.class.php</autoload>
- <autoload name="AgaviSecurityUser">%core.agavi_dir%/user/AgaviSecurityUser.class.php</autoload>
- <autoload name="AgaviUser">%core.agavi_dir%/user/AgaviUser.class.php</autoload>
+ <autoload class="AgaviISecurityUser">%core.agavi_dir%/user/AgaviISecurityUser.interface.php</autoload>
+ <autoload class="AgaviRbacSecurityUser">%core.agavi_dir%/user/AgaviRbacSecurityUser.class.php</autoload>
+ <autoload class="AgaviSecurityUser">%core.agavi_dir%/user/AgaviSecurityUser.class.php</autoload>
+ <autoload class="AgaviUser">%core.agavi_dir%/user/AgaviUser.class.php</autoload>

<!-- agavi/util -->
- <autoload name="AgaviArrayPathDefinition">%core.agavi_dir%/util/AgaviArrayPathDefinition.class.php</autoload>
- <autoload name="AgaviAttributeHolder">%core.agavi_dir%/util/AgaviAttributeHolder.class.php</autoload>
- <autoload name="AgaviDecimalFormatter">%core.agavi_dir%/util/AgaviDecimalFormatter.class.php</autoload>
- <autoload name="AgaviInflector">%core.agavi_dir%/util/AgaviInflector.class.php</autoload>
- <autoload name="AgaviParameterHolder">%core.agavi_dir%/util/AgaviParameterHolder.class.php</autoload>
- <autoload name="AgaviSchematronProcessor">%core.agavi_dir%/util/AgaviSchematronProcessor.class.php</autoload>
- <autoload name="AgaviToolkit">%core.agavi_dir%/util/AgaviToolkit.class.php</autoload>
- <autoload name="AgaviVirtualArrayPath">%core.agavi_dir%/util/AgaviVirtualArrayPath.class.php</autoload>
- <autoload name="AgaviRecursiveDirectoryFilterIterator">%core.agavi_dir%/util/AgaviRecursiveDirectoryFilterIterator.class.php</autoload>
- <autoload name="AgaviXsltProcessor">%core.agavi_dir%/util/AgaviXsltProcessor.class.php</autoload>
+ <autoload class="AgaviArrayPathDefinition">%core.agavi_dir%/util/AgaviArrayPathDefinition.class.php</autoload>
+ <autoload class="AgaviAttributeHolder">%core.agavi_dir%/util/AgaviAttributeHolder.class.php</autoload>
+ <autoload class="AgaviDecimalFormatter">%core.agavi_dir%/util/AgaviDecimalFormatter.class.php</autoload>
+ <autoload class="AgaviInflector">%core.agavi_dir%/util/AgaviInflector.class.php</autoload>
+ <autoload class="AgaviParameterHolder">%core.agavi_dir%/util/AgaviParameterHolder.class.php</autoload>
+ <autoload class="AgaviSchematronProcessor">%core.agavi_dir%/util/AgaviSchematronProcessor.class.php</autoload>
+ <autoload class="AgaviToolkit">%core.agavi_dir%/util/AgaviToolkit.class.php</autoload>
+ <autoload class="AgaviVirtualArrayPath">%core.agavi_dir%/util/AgaviVirtualArrayPath.class.php</autoload>
+ <autoload class="AgaviRecursiveDirectoryFilterIterator">%core.agavi_dir%/util/AgaviRecursiveDirectoryFilterIterator.class.php</autoload>
+ <autoload class="AgaviXsltProcessor">%core.agavi_dir%/util/AgaviXsltProcessor.class.php</autoload>

<!-- agavi/validator -->
- <autoload name="AgaviAndoperatorValidator">%core.agavi_dir%/validator/AgaviAndoperatorValidator.class.php</autoload>
- <autoload name="AgaviArraylengthValidator">%core.agavi_dir%/validator/AgaviArraylengthValidator.class.php</autoload>
- <autoload name="AgaviBaseFileValidator">%core.agavi_dir%/validator/AgaviBaseFileValidator.class.php</autoload>
- <autoload name="AgaviBooleanValidator">%core.agavi_dir%/validator/AgaviBooleanValidator.class.php</autoload>
- <autoload name="AgaviDateTimeValidator">%core.agavi_dir%/validator/AgaviDateTimeValidator.class.php</autoload>
- <autoload name="AgaviDependencyManager">%core.agavi_dir%/validator/AgaviDependencyManager.class.php</autoload>
- <autoload name="AgaviEmailValidator">%core.agavi_dir%/validator/AgaviEmailValidator.class.php</autoload>
- <autoload name="AgaviEqualsValidator">%core.agavi_dir%/validator/AgaviEqualsValidator.class.php</autoload>
- <autoload name="AgaviFileValidator">%core.agavi_dir%/validator/AgaviFileValidator.class.php</autoload>
- <autoload name="AgaviImageFileValidator">%core.agavi_dir%/validator/AgaviImageFileValidator.class.php</autoload>
- <autoload name="AgaviInarrayValidator">%core.agavi_dir%/validator/AgaviInarrayValidator.class.php</autoload>
- <autoload name="AgaviIsNotEmptyValidator">%core.agavi_dir%/validator/AgaviIsNotEmptyValidator.class.php</autoload>
- <autoload name="AgaviIssetValidator">%core.agavi_dir%/validator/AgaviIssetValidator.class.php</autoload>
- <autoload name="AgaviIValidatorContainer">%core.agavi_dir%/validator/AgaviIValidatorContainer.interface.php</autoload>
- <autoload name="AgaviIValidationReportQuery">%core.agavi_dir%/validator/AgaviIValidationReportQuery.interface.php</autoload>
- <autoload name="AgaviNotoperatorValidator">%core.agavi_dir%/validator/AgaviNotoperatorValidator.class.php</autoload>
- <autoload name="AgaviNumberValidator">%core.agavi_dir%/validator/AgaviNumberValidator.class.php</autoload>
- <autoload name="AgaviOperatorValidator">%core.agavi_dir%/validator/AgaviOperatorValidator.class.php</autoload>
- <autoload name="AgaviOroperatorValidator">%core.agavi_dir%/validator/AgaviOroperatorValidator.class.php</autoload>
- <autoload name="AgaviRegexValidator">%core.agavi_dir%/validator/AgaviRegexValidator.class.php</autoload>
- <autoload name="AgaviSetValidator">%core.agavi_dir%/validator/AgaviSetValidator.class.php</autoload>
- <autoload name="AgaviStringValidator">%core.agavi_dir%/validator/AgaviStringValidator.class.php</autoload>
- <autoload name="AgaviValidationArgument">%core.agavi_dir%/validator/AgaviValidationArgument.class.php</autoload>
- <autoload name="AgaviValidationError">%core.agavi_dir%/validator/AgaviValidationError.class.php</autoload>
- <autoload name="AgaviValidationIncident">%core.agavi_dir%/validator/AgaviValidationIncident.class.php</autoload>
- <autoload name="AgaviValidationManager">%core.agavi_dir%/validator/AgaviValidationManager.class.php</autoload>
- <autoload name="AgaviValidationReport">%core.agavi_dir%/validator/AgaviValidationReport.class.php</autoload>
- <autoload name="AgaviValidationReportQuery">%core.agavi_dir%/validator/AgaviValidationReportQuery.class.php</autoload>
- <autoload name="AgaviValidator">%core.agavi_dir%/validator/AgaviValidator.class.php</autoload>
- <autoload name="AgaviXoroperatorValidator">%core.agavi_dir%/validator/AgaviXoroperatorValidator.class.php</autoload>
+ <autoload class="AgaviAndoperatorValidator">%core.agavi_dir%/validator/AgaviAndoperatorValidator.class.php</autoload>
+ <autoload class="AgaviArraylengthValidator">%core.agavi_dir%/validator/AgaviArraylengthValidator.class.php</autoload>
+ <autoload class="AgaviBaseFileValidator">%core.agavi_dir%/validator/AgaviBaseFileValidator.class.php</autoload>
+ <autoload class="AgaviBooleanValidator">%core.agavi_dir%/validator/AgaviBooleanValidator.class.php</autoload>
+ <autoload class="AgaviDateTimeValidator">%core.agavi_dir%/validator/AgaviDateTimeValidator.class.php</autoload>
+ <autoload class="AgaviDependencyManager">%core.agavi_dir%/validator/AgaviDependencyManager.class.php</autoload>
+ <autoload class="AgaviEmailValidator">%core.agavi_dir%/validator/AgaviEmailValidator.class.php</autoload>
+ <autoload class="AgaviEqualsValidator">%core.agavi_dir%/validator/AgaviEqualsValidator.class.php</autoload>
+ <autoload class="AgaviFileValidator">%core.agavi_dir%/validator/AgaviFileValidator.class.php</autoload>
+ <autoload class="AgaviImageFileValidator">%core.agavi_dir%/validator/AgaviImageFileValidator.class.php</autoload>
+ <autoload class="AgaviInarrayValidator">%core.agavi_dir%/validator/AgaviInarrayValidator.class.php</autoload>
+ <autoload class="AgaviIsNotEmptyValidator">%core.agavi_dir%/validator/AgaviIsNotEmptyValidator.class.php</autoload>
+ <autoload class="AgaviIssetValidator">%core.agavi_dir%/validator/AgaviIssetValidator.class.php</autoload>
+ <autoload class="AgaviIValidatorContainer">%core.agavi_dir%/validator/AgaviIValidatorContainer.interface.php</autoload>
+ <autoload class="AgaviIValidationReportQuery">%core.agavi_dir%/validator/AgaviIValidationReportQuery.interface.php</autoload>
+ <autoload class="AgaviNotoperatorValidator">%core.agavi_dir%/validator/AgaviNotoperatorValidator.class.php</autoload>
+ <autoload class="AgaviNumberValidator">%core.agavi_dir%/validator/AgaviNumberValidator.class.php</autoload>
+ <autoload class="AgaviOperatorValidator">%core.agavi_dir%/validator/AgaviOperatorValidator.class.php</autoload>
+ <autoload class="AgaviOroperatorValidator">%core.agavi_dir%/validator/AgaviOroperatorValidator.class.php</autoload>
+ <autoload class="AgaviRegexValidator">%core.agavi_dir%/validator/AgaviRegexValidator.class.php</autoload>
+ <autoload class="AgaviSetValidator">%core.agavi_dir%/validator/AgaviSetValidator.class.php</autoload>
+ <autoload class="AgaviStringValidator">%core.agavi_dir%/validator/AgaviStringValidator.class.php</autoload>
+ <autoload class="AgaviValidationArgument">%core.agavi_dir%/validator/AgaviValidationArgument.class.php</autoload>
+ <autoload class="AgaviValidationError">%core.agavi_dir%/validator/AgaviValidationError.class.php</autoload>
+ <autoload class="AgaviValidationIncident">%core.agavi_dir%/validator/AgaviValidationIncident.class.php</autoload>
+ <autoload class="AgaviValidationManager">%core.agavi_dir%/validator/AgaviValidationManager.class.php</autoload>
+ <autoload class="AgaviValidationReport">%core.agavi_dir%/validator/AgaviValidationReport.class.php</autoload>
+ <autoload class="AgaviValidationReportQuery">%core.agavi_dir%/validator/AgaviValidationReportQuery.class.php</autoload>
+ <autoload class="AgaviValidator">%core.agavi_dir%/validator/AgaviValidator.class.php</autoload>
+ <autoload class="AgaviXoroperatorValidator">%core.agavi_dir%/validator/AgaviXoroperatorValidator.class.php</autoload>

<!-- agavi/view -->
- <autoload name="AgaviFileTemplateLayer">%core.agavi_dir%/view/AgaviFileTemplateLayer.class.php</autoload>
- <autoload name="AgaviStreamTemplateLayer">%core.agavi_dir%/view/AgaviStreamTemplateLayer.class.php</autoload>
- <autoload name="AgaviTemplateLayer">%core.agavi_dir%/view/AgaviTemplateLayer.class.php</autoload>
- <autoload name="AgaviView">%core.agavi_dir%/view/AgaviView.class.php</autoload>
+ <autoload class="AgaviFileTemplateLayer">%core.agavi_dir%/view/AgaviFileTemplateLayer.class.php</autoload>
+ <autoload class="AgaviStreamTemplateLayer">%core.agavi_dir%/view/AgaviStreamTemplateLayer.class.php</autoload>
+ <autoload class="AgaviTemplateLayer">%core.agavi_dir%/view/AgaviTemplateLayer.class.php</autoload>
+ <autoload class="AgaviView">%core.agavi_dir%/view/AgaviView.class.php</autoload>

<!-- agavi/testing -->
- <autoload name="AgaviIFlowTestCase">%core.agavi_dir%/testing/AgaviIFlowTestCase.interface.php</autoload>
- <autoload name="AgaviIFragmentTestCase">%core.agavi_dir%/testing/AgaviIFragmentTestCase.interface.php</autoload>
- <autoload name="AgaviIRemoteTestCase">%core.agavi_dir%/testing/AgaviIRemoteTestCase.interface.php</autoload>
- <autoload name="AgaviITestCase">%core.agavi_dir%/testing/AgaviITestCase.interface.php</autoload>
- <autoload name="AgaviIUnitTestCase">%core.agavi_dir%/testing/AgaviIUnitTestCase.interface.php</autoload>
+ <autoload class="AgaviIFlowTestCase">%core.agavi_dir%/testing/AgaviIFlowTestCase.interface.php</autoload>
+ <autoload class="AgaviIFragmentTestCase">%core.agavi_dir%/testing/AgaviIFragmentTestCase.interface.php</autoload>
+ <autoload class="AgaviIRemoteTestCase">%core.agavi_dir%/testing/AgaviIRemoteTestCase.interface.php</autoload>
+ <autoload class="AgaviITestCase">%core.agavi_dir%/testing/AgaviITestCase.interface.php</autoload>
+ <autoload class="AgaviIUnitTestCase">%core.agavi_dir%/testing/AgaviIUnitTestCase.interface.php</autoload>

- <autoload name="AgaviActionTestCase">%core.agavi_dir%/testing/AgaviActionTestCase.class.php</autoload>
- <autoload name="AgaviFlowTestCase">%core.agavi_dir%/testing/AgaviFlowTestCase.class.php</autoload>
- <autoload name="AgaviFragmentTestCase">%core.agavi_dir%/testing/AgaviFragmentTestCase.class.php</autoload>
- <autoload name="AgaviModelTestCase">%core.agavi_dir%/testing/AgaviModelTestCase.class.php</autoload>
- <autoload name="AgaviSeleniumTestCase">%core.agavi_dir%/testing/AgaviSeleniumTestCase.class.php</autoload>
- <autoload name="AgaviUnitTestCase">%core.agavi_dir%/testing/AgaviUnitTestCase.class.php</autoload>
- <autoload name="AgaviViewTestCase">%core.agavi_dir%/testing/AgaviViewTestCase.class.php</autoload>
- <autoload name="AgaviPhpUnitTestCase">%core.agavi_dir%/testing/AgaviPhpUnitTestCase.class.php</autoload>
+ <autoload class="AgaviActionTestCase">%core.agavi_dir%/testing/AgaviActionTestCase.class.php</autoload>
+ <autoload class="AgaviFlowTestCase">%core.agavi_dir%/testing/AgaviFlowTestCase.class.php</autoload>
+ <autoload class="AgaviFragmentTestCase">%core.agavi_dir%/testing/AgaviFragmentTestCase.class.php</autoload>
+ <autoload class="AgaviModelTestCase">%core.agavi_dir%/testing/AgaviModelTestCase.class.php</autoload>
+ <autoload class="AgaviSeleniumTestCase">%core.agavi_dir%/testing/AgaviSeleniumTestCase.class.php</autoload>
+ <autoload class="AgaviUnitTestCase">%core.agavi_dir%/testing/AgaviUnitTestCase.class.php</autoload>
+ <autoload class="AgaviViewTestCase">%core.agavi_dir%/testing/AgaviViewTestCase.class.php</autoload>
+ <autoload class="AgaviPhpUnitTestCase">%core.agavi_dir%/testing/AgaviPhpUnitTestCase.class.php</autoload>

- <autoload name="AgaviTestSuite">%core.agavi_dir%/testing/AgaviTestSuite.class.php</autoload>
+ <autoload class="AgaviTestSuite">%core.agavi_dir%/testing/AgaviTestSuite.class.php</autoload>

- <autoload name="AgaviConstraintActionHandlesMethod">%core.agavi_dir%/testing/PHPUnit/Constraint/AgaviConstraintActionHandlesMethod.php</autoload>
- <autoload name="AgaviConstraintViewHandlesOutputType">%core.agavi_dir%/testing/PHPUnit/Constraint/AgaviConstraintViewHandlesOutputType.php</autoload>
+ <autoload class="AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility">%core.agavi_dir%/testing/AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility.class.php</autoload>
+ <autoload class="AgaviConstraintActionHandlesMethod">%core.agavi_dir%/testing/PHPUnit/Constraint/AgaviConstraintActionHandlesMethod.php</autoload>
+ <autoload class="AgaviConstraintViewHandlesOutputType">%core.agavi_dir%/testing/PHPUnit/Constraint/AgaviConstraintViewHandlesOutputType.php</autoload>
</autoloads>
</ae:configuration>
</ae:configurations>

Modified: branches/david-httpcaching/src/config/defaults/compile.xml
===================================================================
--- branches/david-httpcaching/src/config/defaults/compile.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/defaults/compile.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -8,11 +8,15 @@
<compile>%core.agavi_dir%/controller/AgaviController.class.php</compile>
<compile>%core.agavi_dir%/controller/AgaviExecutionContainer.class.php</compile>
<compile>%core.agavi_dir%/controller/AgaviOutputType.class.php</compile>
+ <compile>%core.agavi_dir%/filter/AgaviIFilter.interface.php</compile>
+ <compile>%core.agavi_dir%/filter/AgaviIGlobalFilter.interface.php</compile>
+ <compile>%core.agavi_dir%/filter/AgaviIActionFilter.interface.php</compile>
<compile>%core.agavi_dir%/filter/AgaviFilter.class.php</compile>
<compile>%core.agavi_dir%/filter/AgaviDispatchFilter.class.php</compile>
<compile>%core.agavi_dir%/filter/AgaviExecutionFilter.class.php</compile>
<compile>%core.agavi_dir%/filter/AgaviFilterChain.class.php</compile>
<compile>%core.agavi_dir%/renderer/AgaviRenderer.class.php</compile>
+ <compile>%core.agavi_dir%/request/AgaviIParametersRequestDataHolder.interface.php</compile>
<compile>%core.agavi_dir%/request/AgaviRequestDataHolder.class.php</compile>
<compile>%core.agavi_dir%/request/AgaviRequest.class.php</compile>
<compile>%core.agavi_dir%/response/AgaviResponse.class.php</compile>

Modified: branches/david-httpcaching/src/config/xsd/parts/autoload.xsd
===================================================================
--- branches/david-httpcaching/src/config/xsd/parts/autoload.xsd 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/xsd/parts/autoload.xsd 2011-12-26 16:19:15 UTC (rev 4910)
@@ -11,7 +11,9 @@
schemaLocation="../_types.xsd" />

<xs:complexType name="autoload" mixed="true">
- <xs:attribute name="name" type="types_1_0:php_class" use="required" />
+ <!-- we only allow either attribute, but there is no way to express that in XML Schema, so the config handler will have to do the check... :( -->
+ <xs:attribute name="class" type="types_1_0:php_class" />
+ <xs:attribute name="namespace" type="types_1_0:php_class" />
</xs:complexType>

<xs:complexType name="autoloads">

Modified: branches/david-httpcaching/src/config/xsd/parts/filters.xsd
===================================================================
--- branches/david-httpcaching/src/config/xsd/parts/filters.xsd 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/xsd/parts/filters.xsd 2011-12-26 16:19:15 UTC (rev 4910)
@@ -20,7 +20,7 @@
<xs:attribute name="name">
<xs:simpleType>
<xs:restriction base="xs:string">
- <xs:pattern value="[^Aa][^Gg][^Aa][^Vv][^Ii].*" />
+ <xs:pattern value="(([^Aa].*)|([Aa][^Gg].*)|([Aa][Gg][^Aa].*)|([Aa][Gg][Aa][^Vv].*)|([Aa][Gg][Aa][Vv][^Ii].*))" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>

Modified: branches/david-httpcaching/src/config/xsl/autoload.xsl
===================================================================
--- branches/david-httpcaching/src/config/xsl/autoload.xsl 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/xsl/autoload.xsl 2011-12-26 16:19:15 UTC (rev 4910)
@@ -23,6 +23,13 @@
</xsl:template>

<!-- 1.0 backwards compatibility for 1.1 -->
+ <xsl:template match="autoload_1_0:autoload">
+ <xsl:element name="autoload" namespace="{$autoload_1_1}">
+ <xsl:attribute name="class"><xsl:value-of select="@name" /></xsl:attribute>
+ <xsl:copy-of select="@*[local-name() != 'name']" />
+ <xsl:apply-templates />
+ </xsl:element>
+ </xsl:template>
<xsl:template match="autoload_1_0:*">
<xsl:element name="{local-name()}" namespace="{$autoload_1_1}">
<xsl:copy-of select="@*" />

Modified: branches/david-httpcaching/src/config/xsl/validators.xsl
===================================================================
--- branches/david-httpcaching/src/config/xsl/validators.xsl 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/config/xsl/validators.xsl 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,6 +2,7 @@
<xsl:stylesheet
version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:php="http://php.net/xsl"
xmlns:envelope_0_11="http://agavi.org/agavi/1.0/config"
xmlns:validators_1_0="http://agavi.org/agavi/config/parts/validators/1.0"
xmlns:validators_1_1="http://agavi.org/agavi/config/parts/validators/1.1"
@@ -31,6 +32,25 @@
</xsl:template>

<!-- 1.0 backwards compatibility for 1.1 -->
+ <!-- <validator> elements with <arguments base="..." />... -->
+ <xsl:template match="validators_1_0:validator[validators_1_0:arguments[@base]]">
+ <xsl:element name="{local-name()}" namespace="{$validators_1_1}">
+ <!-- ... have their attributes copied, but not "provides", or "depends" with a value starting on "["... -->
+ <xsl:copy-of select="@*[not(local-name()='provides' and not(local-name()='depends' and substring(.,1,1)='['))]" />
+ <!-- since those get special rules -->
+ <xsl:apply-templates select="@provides | @depends[substring(.,1,1)='[']" />
+ <xsl:apply-templates />
+ </xsl:element>
+ </xsl:template>
+ <!-- rule for "provides" attribute in <validator> with <arguments base="..." /> -->
+ <xsl:template match="validators_1_0:validator[validators_1_0:arguments[@base]]/@provides">
+ <xsl:attribute name="provides"><xsl:value-of select="php:function('AgaviDependencyManager::populateArgumentBaseKeyRefs', concat(../validators_1_0:arguments/@base,'[',.,']'))" /></xsl:attribute>
+ </xsl:template>
+ <!-- rule for "depends" attribute with value starting on "[" in <validator> with <arguments base="..." /> -->
+ <xsl:template match="validators_1_0:validator[validators_1_0:arguments[@base]]/@depends[substring(.,1,1)='[']">
+ <xsl:attribute name="depends"><xsl:value-of select="php:function('AgaviDependencyManager::populateArgumentBaseKeyRefs', concat(../validators_1_0:arguments/@base,.))" /></xsl:attribute>
+ </xsl:template>
+ <!-- rule for all other elements -->
<xsl:template match="validators_1_0:*">
<xsl:element name="{local-name()}" namespace="{$validators_1_1}">
<xsl:copy-of select="@*" />

Modified: branches/david-httpcaching/src/controller/AgaviController.class.php
===================================================================
--- branches/david-httpcaching/src/controller/AgaviController.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/controller/AgaviController.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -165,7 +165,7 @@

$moduleAutoload = AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/config/autoload.xml';
if(is_readable($moduleAutoload)) {
- Agavi::$autoloads = array_merge(Agavi::$autoloads, include(AgaviConfigCache::checkConfig($moduleAutoload)));
+ AgaviConfigCache::load($moduleAutoload);
}

if(AgaviConfig::get('modules.' . $lowerModuleName . '.enabled')) {

Modified: branches/david-httpcaching/src/core/Agavi.class.php
===================================================================
--- branches/david-httpcaching/src/core/Agavi.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/core/Agavi.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -30,30 +30,6 @@
final class Agavi
{
/**
- * @var array An assoc array of classes and files used for autoloading.
- */
- public static $autoloads = array();
-
- /**
- * Handles autoloading of classes
- *
- * @param string A class name.
- *
- * @author David Zülke <d...@bitxtender.com>
- * @since 0.11.0
- */
- public static function __autoload($class)
- {
- if(isset(self::$autoloads[$class])) {
- // class exists, let's include it
- require(self::$autoloads[$class]);
- }
-
- // If the class doesn't exist in autoload.xml there's not a lot we can do.
- // Hopefully, another registered autoloader will be able to help :)
- }
-
- /**
* Startup the Agavi core
*
* @param string environment the environment to use for this session.
@@ -64,7 +40,7 @@
public static function bootstrap($environment = null)
{
// set up our __autoload
- spl_autoload_register(array('Agavi', '__autoload'));
+ spl_autoload_register(array('AgaviAutoloader', 'loadClass'));

try {
if($environment === null) {
@@ -111,7 +87,7 @@
if(!is_readable($autoload)) {
$autoload = AgaviConfig::get('core.system_config_dir') . '/autoload.xml';
}
- self::$autoloads = include(AgaviConfigCache::checkConfig($autoload));
+ AgaviConfigCache::load($autoload);

// load base settings
AgaviConfigCache::load(AgaviConfig::get('core.config_dir') . '/settings.xml');

Modified: branches/david-httpcaching/src/database/AgaviDoctrine2Database.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviDoctrine2Database.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviDoctrine2Database.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -99,7 +99,7 @@
*/
public function shutdown()
{
- // not necessary; zere is meat in ze building!
+ $this->connection = $this->resource = null;
}
}

Modified: branches/david-httpcaching/src/database/AgaviDoctrine2dbalDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviDoctrine2dbalDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviDoctrine2dbalDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -53,7 +53,7 @@
*/
public function getResource()
{
- return $this->connection->getWrappedConnection();
+ return $this->getConnection()->getWrappedConnection();
}

/**

Modified: branches/david-httpcaching/src/database/AgaviDoctrine2ormDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviDoctrine2ormDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviDoctrine2ormDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -169,7 +169,7 @@
*/
public function getResource()
{
- return $this->connection->getConnection();
+ return $this->getConnection()->getConnection();
}
}

Modified: branches/david-httpcaching/src/database/AgaviDoctrineDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviDoctrineDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviDoctrineDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -63,7 +63,7 @@
*/
public function getResource()
{
- return $this->connection->getDbh();
+ return $this->getConnection()->getDbh();
}

/**

Modified: branches/david-httpcaching/src/database/AgaviMysqlDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviMysqlDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviMysqlDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -199,6 +199,7 @@
{
if($this->connection != null) {
@mysql_close($this->connection);
+ $this->connection = $this->resource = null;
}
}
}

Modified: branches/david-httpcaching/src/database/AgaviMysqliDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviMysqliDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviMysqliDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -164,6 +164,7 @@
{
if($this->connection != null) {
$this->connection->close();
+ $this->connection = $this->resource = null;
}
}
}

Modified: branches/david-httpcaching/src/database/AgaviPdoDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviPdoDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviPdoDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -108,7 +108,7 @@
}
}

- $this->connection = new PDO($dsn, $username, $password, $options);
+ $this->connection = $this->resource = new PDO($dsn, $username, $password, $options);

// default connection attributes
$attributes = array(
@@ -143,7 +143,7 @@
public function shutdown()
{
// assigning null to a previously open connection object causes a disconnect
- $this->connection = null;
+ $this->connection = $this->resource = null;
}
}

Modified: branches/david-httpcaching/src/database/AgaviPostgresqlDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviPostgresqlDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviPostgresqlDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -166,6 +166,7 @@
{
if($this->connection != null) {
@pg_close($this->connection);
+ $this->connection = $this->resource = null;
}
}
}

Modified: branches/david-httpcaching/src/database/AgaviPropelDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviPropelDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviPropelDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -165,7 +165,7 @@
*/
public function shutdown()
{
- $this->connection = null;
+ $this->connection = $this->resource = null;
}
}

Modified: branches/david-httpcaching/src/database/AgaviSqlsrvDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviSqlsrvDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviSqlsrvDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -67,6 +67,7 @@
$this->connection = null;
throw new AgaviDatabaseException(sprintf("%s\n\n%s", sprintf('Could not open database connection "%s".', $this->getName()), implode("\n", $this->getErrors())));
}
+ $this->resource =& $this->connection;

foreach((array)$this->getParameter('init_queries') as $query) {
sqlsrv_query($this->connection, $query);
@@ -111,6 +112,7 @@
{
if($this->connection) {
sqlsrv_close($this->connection);
+ $this->connection = $this->resource = null;
}
}
}

Modified: branches/david-httpcaching/src/database/AgaviZendclouddocumentserviceDatabase.class.php
===================================================================
--- branches/david-httpcaching/src/database/AgaviZendclouddocumentserviceDatabase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/database/AgaviZendclouddocumentserviceDatabase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -124,7 +124,7 @@
*/
public function shutdown()
{
- // nothing to do here
+ $this->connection = $this->resource = null;
}

/**

Modified: branches/david-httpcaching/src/filter/AgaviExecutionFilter.class.php
===================================================================
--- branches/david-httpcaching/src/filter/AgaviExecutionFilter.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/filter/AgaviExecutionFilter.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -237,7 +237,7 @@

if(is_object($val) && is_callable(array($val, '__toString'))) {
$val = $val->__toString();
- } elseif(is_object($val) && function_exists('spl_object_hash')) {
+ } elseif(is_object($val)) {
$val = spl_object_hash($val);
}

Modified: branches/david-httpcaching/src/filter/AgaviFormPopulationFilter.class.php
===================================================================
--- branches/david-httpcaching/src/filter/AgaviFormPopulationFilter.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/filter/AgaviFormPopulationFilter.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -272,14 +272,27 @@

$forms = array();
if(is_array($populate)) {
- $query = array();
- foreach(array_keys($populate) as $id) {
+ $queries = array();
+ foreach($populate as $id => $data) {
if(is_string($id)) {
- $query[] = sprintf('@id="%s"', $id);
+ $id = sprintf('@id="%s"', $id);
+ if($data === true) {
+ // prepend to the array to give re-populates preferential treatment, see #1461
+ array_unshift($queries, $id);
+ } else {
+ $queries[] = $id;
+ }
}
}
- if($query) {
- $forms = $this->xpath->query(sprintf('//%1$sform[%2$s]', $this->xmlnsPrefix, implode(' or ', $query)));
+ if($queries) {
+ // we must assemble the array by hand as neither '//form[@id="foo"] or //form[@id="bar"]' nor '//form[@id="foo"] || //form[@id="bar"]' will order the elements as given in the query (order of element in the document is used instead and that can be a problem for error insertion, see #1461)
+ $forms = array();
+ foreach($queries as $query) {
+ $form = $this->xpath->query(sprintf('//%1$sform[%2$s]', $this->xmlnsPrefix, $query));
+ if($form->length) {
+ $forms[] = $form->item(0);
+ }
+ }
}
} else {
$forms = $this->xpath->query(sprintf('//%1$sform[@action]', $this->xmlnsPrefix));

Modified: branches/david-httpcaching/src/filter/AgaviSecurityFilter.class.php
===================================================================
--- branches/david-httpcaching/src/filter/AgaviSecurityFilter.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/filter/AgaviSecurityFilter.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -53,14 +53,14 @@
// get the current action instance
$actionInstance = $container->getActionInstance();

- // get the credential required for this action
- $credential = $actionInstance->getCredentials();
-
if(!$actionInstance->isSecure()) {
// the action instance does not require authentication, so we can continue in the chain and then bail out early
return $filterChain->execute($container);
}

+ // get the credential required for this action
+ $credential = $actionInstance->getCredentials();
+
// credentials can be anything you wish; a string, array, object, etc.
// as long as you add the same exact data to the user as a credential,
// it will use it and authorize the user as having the credential

Modified: branches/david-httpcaching/src/filter/AgaviTidyFilter.class.php
===================================================================
--- branches/david-httpcaching/src/filter/AgaviTidyFilter.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/filter/AgaviTidyFilter.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -40,7 +40,7 @@
* @author David Zülke <david....@bitextender.com>
* @since 1.0.0
*/
- public function executeOnce(AgaviFilterChain $filterChain, AgaviExecutionContainer $container)
+ public function execute(AgaviFilterChain $filterChain, AgaviExecutionContainer $container)
{
// nothing to do so far. let's carry on in the chain
$filterChain->execute($container);

Modified: branches/david-httpcaching/src/renderer/AgaviPhptalRenderer.class.php
===================================================================
--- branches/david-httpcaching/src/renderer/AgaviPhptalRenderer.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/renderer/AgaviPhptalRenderer.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -99,6 +99,10 @@
trigger_error('Support for PHPTAL versions older than 1.2 is deprecated and will be removed in Agavi 1.2.', E_USER_DEPRECATED);
}

+ if($this->hasParameter('encoding')) {
+ $phptal->setEncoding($this->getParameter('encoding'));
+ }
+
return $phptal;
}

Modified: branches/david-httpcaching/src/renderer/AgaviSmartyRenderer.class.php
===================================================================
--- branches/david-httpcaching/src/renderer/AgaviSmartyRenderer.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/renderer/AgaviSmartyRenderer.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -123,7 +123,7 @@

$this->smarty = $this->createEngineInstance();

- $this->isSmarty2 = !defined("Smarty::SMARTY_VERSION") || (strpos(Smarty::SMARTY_VERSION, 'Smarty-3') !== 0);
+ $this->isSmarty2 = !defined("Smarty::SMARTY_VERSION") || !preg_match('#^Smarty.?3#', Smarty::SMARTY_VERSION, $matches);

if($this->isSmarty2) {
$this->smarty->config_dir = AgaviConfig::get('core.config_dir');

Modified: branches/david-httpcaching/src/request/AgaviConsoleRequest.class.php
===================================================================
--- branches/david-httpcaching/src/request/AgaviConsoleRequest.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/request/AgaviConsoleRequest.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -81,30 +81,29 @@
$prev = $arg;
}

- $_FILES = array();
- if($this->getParameter('read_stdin', false)) {
- $stdinFile = tempnam(AgaviConfig::get('core.cache_dir'), 'stdin_');
- $stdin = fopen('php://stdin', 'rb');
- stream_set_blocking($stdin, false);
- $size = stream_copy_to_stream($stdin, $handle = fopen($stdinFile, 'wb'));
- fclose($handle);
+ $files = array();
+ if($this->getParameter('read_stdin', true) && defined('STDIN') && ($stdinMeta = stream_get_meta_data(STDIN)) && !$stdinMeta['seekable']) {
+ // if stream_get_meta_data() reports STDIN as not seekable, that means something was piped into our process, and we should put that into a file
+ // the alternative method to determine this is via posix_isatty(STDIN) which returns false in the same situation, but that requires the posix extension and also doesn't work on Windows
+ $stdinName = $this->getParameter('stdin_file_name', 'stdin_file');

- $_FILES = array(
- $this->getParameter('stdin_file_name', 'stdin_file') => array(
- 'name' => $stdinFile,
+ $ufc = $this->getParameter('uploaded_file_class', 'AgaviUploadedFile');
+ $files = array(
+ $stdinName => new $ufc(array(
+ 'name' => $stdinName,
'type' => 'application/octet-stream',
- 'size' => $size,
- 'tmp_name' => $stdinFile,
+ 'size' => -1, // we're not buffering, so -1 is a good choice probably (better than 0 anyway)
+ 'stream' => STDIN,
'error' => UPLOAD_ERR_OK,
'is_uploaded_file' => false,
- )
+ ))
);
}

$rdhc = $this->getParameter('request_data_holder_class');
$this->setRequestData(new $rdhc(array(
constant("$rdhc::SOURCE_PARAMETERS") => array(),
- constant("$rdhc::SOURCE_FILES") => $_FILES,
+ constant("$rdhc::SOURCE_FILES") => $files,
)));
$rd = $this->getRequestData();

Modified: branches/david-httpcaching/src/request/AgaviConsoleRequestDataHolder.class.php
===================================================================
--- branches/david-httpcaching/src/request/AgaviConsoleRequestDataHolder.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/request/AgaviConsoleRequestDataHolder.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -39,11 +39,6 @@
* @var array An array of files uploaded during the request.
*/
protected $files = array();
-
- /**
- * @var string The name of the AgaviUploadedFile implementation to use.
- */
- protected $uploadedFileClass = 'AgaviUploadedFile';

/**
* Retrieve an array of file information.

Modified: branches/david-httpcaching/src/request/AgaviUploadedFile.class.php
===================================================================
--- branches/david-httpcaching/src/request/AgaviUploadedFile.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/request/AgaviUploadedFile.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -71,6 +71,11 @@
protected $contents;

/**
+ * @var resource A resource pointer to the stream with the contents.
+ */
+ protected $stream;
+
+ /**
* @var array An array to map get* method name fragments to indices.
*/
protected static $indexMap = array(
@@ -82,12 +87,13 @@
'is_uploaded_file' => 'isUploadedFile',
'is_moved' => 'isMoved',
'contents' => 'contents',
+ 'stream' => 'stream',
);

/**
* Constructor.
*
- * @param $flags int Flags, overridden to be ArrayObject::ARRAY_AS_PROPS.
+ * @param array The fields for this file.
*
* @see ArrayObject::__construct()
*
@@ -99,20 +105,24 @@
$defaults = array(
'name' => null,
'type' => null,
- 'size' => 0,
+ 'size' => -1,
'tmp_name' => null,
- 'error' => UPLOAD_ERR_NO_FILE,
- 'is_uploaded_file' => true,
+ 'error' => UPLOAD_ERR_OK,
+ 'is_uploaded_file' => false,
'contents' => null,
+ 'stream' => null,
);
$array = array_merge($defaults, $array, array('is_moved' => false)); // make sure it's marked not moved by default

- // we either need a tmp_name or contents
+ // we need exactly one of tmp_name, contents or stream
if(
- (isset($array['tmp_name']) && isset($array['contents'])) ||
- (!isset($array['tmp_name']) && !isset($array['contents']))
+ isset($array['tmp_name'], $array['contents'], $array['stream']) ||
+ isset($array['tmp_name'], $array['contents']) ||
+ isset($array['tmp_name'], $array['stream']) ||
+ isset($array['contents'], $array['stream']) ||
+ (!isset($array['tmp_name']) && !isset($array['contents']) && !isset($array['stream']))
) {
- throw new InvalidArgumentException('Value for either key "tmp_name" or "contents" (but not both) must be supplied.');
+ throw new InvalidArgumentException('Value for exactly one of keys "tmp_name", "contents" or "stream" must be supplied.');
}

// fill local props
@@ -124,19 +134,6 @@
}

/**
- * Destructor. Removes the tempfile.
- *
- * @author David Zülke <d...@bitxtender.com>
- * @since 0.11.0
- */
- public function __destruct()
- {
- if(!$this->getIsMoved() && !$this->getIsUploadedFile() && $this->hasTmpName()) {
- @unlink($this->getTmpName());
- }
- }
-
- /**
* Property access overload.
*
* @param string The key to fetch.
@@ -287,17 +284,23 @@
*/
public function getTmpName()
{
- if(!$this->hasTmpName()) {
+ if(!$this->hasTmpName() && !$this->hasOpenStream()) {
// have faith in the ctor :)
- $this->tmpName = tempnam(AgaviConfig::get('core.cache_dir'), 'AgaviUploadedFile_');
- if(!is_writable($this->tmpName)) {
- $error = 'Temporary file path "%s" is not writable';
+ $this->stream = tmpfile();
+ if(!$this->stream) {
+ $error = 'Cannot create temporary file via tmpfile()';
$error = sprintf($error, $directory);
throw new AgaviFileException($error);
}
- file_put_contents($this->tmpName, $this->contents);
+ fwrite($this->stream, $this->contents);
+ rewind($this->stream);
}

+ if($this->hasOpenStream()) {
+ $meta = stream_get_meta_data($this->getStream());
+ return $meta['uri'];
+ }
+
return $this->tmpName;
}

@@ -383,7 +386,7 @@
*/
public function isMovable()
{
- return !$this->getIsMoved();
+ return $this->hasTmpName() && !$this->getIsMoved();
}

/**
@@ -399,12 +402,18 @@
public function getContents()
{
// for a file where we wrote the contents to a temp file in getTmpName(), we can always return contents
- if($this->hasError() || (!$this->isMovable() && !$this->hasBufferedContents())) {
+ if($this->hasError() || (!$this->isMovable() && !$this->hasBufferedContents() && !$this->hasOpenStream())) {
throw new AgaviException('Cannot get contents of erroneous or moved file.');
}

// we intentionally don't store the result of file_get_contents() here to keep memory usage low
- return $this->hasBufferedContents() ? $this->contents : file_get_contents($this->getTmpName());
+ return
+ $this->hasBufferedContents()
+ ? $this->contents
+ : $this->hasOpenStream()
+ ? stream_get_contents($this->getStream(), -1, 0)
+ : file_get_contents($this->getTmpName())
+ ;
}

/**
@@ -423,9 +432,25 @@
}

/**
+ * Check if there is an open stream resource for this uploaded file.
+ * Will be true if this object has been constructed with a resource pointer,
+ * or if it has been constructed with raw contents and after getStream() has
+ * been called once.
+ *
+ * @return bool Whether there is an open stream with the file contents.
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @since 1.1.0
+ */
+ public function hasOpenStream()
+ {
+ return isset($this->stream);
+ }
+
+ /**
* Retrieve a stream handle of the uploaded file.
*
- * @param string The fopen mode, defaults to 'rb'.
+ * @param string The fopen mode, defaults to 'rb'. Only used for files.
*
* @return resource The stream.
*
@@ -436,11 +461,18 @@
*/
public function getStream($mode = 'rb')
{
- if($this->hasError() || !$this->isMovable()) {
+ if($this->hasError() || (!$this->isMovable() && !$this->hasBufferedContents() && !$this->hasOpenStream())) {
throw new AgaviException('Cannot get contents of erroneous or moved file.');
}

- return fopen($this->getTmpName(), $mode);
+ if(!$this->hasOpenStream() && $this->hasBufferedContents()) {
+ // copy the contents into a temp stream
+ $this->stream = fopen('php://temp', 'rb+');
+ fputs($this->stream, $this->getContents());
+ rewind($this->stream);
+ }
+
+ return $this->hasOpenStream() ? $this->stream : fopen($this->getTmpName(), $mode);
}

/**

Modified: branches/david-httpcaching/src/request/AgaviWebRequest.class.php
===================================================================
--- branches/david-httpcaching/src/request/AgaviWebRequest.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/request/AgaviWebRequest.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -289,7 +289,7 @@
$rla = ini_get('register_long_arrays');

// very first thing to do: remove magic quotes
- if(function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
+ if(get_magic_quotes_gpc()) {
trigger_error('Support for php.ini directive "magic_quotes_gpc" is deprecated and will be dropped in Agavi 1.2. The setting is deprecated in PHP 5.3 and will be removed in PHP 5.4. Please refer to the PHP manual for details.', E_USER_DEPRECATED);
$_GET = self::clearMagicQuotes($_GET);
$_POST = self::clearMagicQuotes($_POST);
@@ -421,6 +421,9 @@
$this->urlQuery = $parts['query'];
unset($parts);

+ $files = array();
+ $ufc = $this->getParameter('uploaded_file_class', 'AgaviUploadedFile');
+
if($this->getMethod() == $methods['PUT']) {

if(isset($_SERVER['CONTENT_TYPE']) && $this->getParameter('http_put_decode_urlencoded', true) && preg_match('#^application/x-www-form-urlencoded(;[^;]+)*?$#', $_SERVER['CONTENT_TYPE'])) {
@@ -433,31 +436,33 @@
// some other data via PUT. we need to populate $_FILES manually
$httpBody = file_get_contents('php://input');

- $_FILES = array(
- $this->getParameter('http_put_file_name', 'put_file') => array(
+ $files = array(
+ $this->getParameter('http_put_file_name', 'put_file') => new $ufc(array(
'name' => $this->getMethod(),
'type' => isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : 'application/octet-stream',
'size' => strlen($httpBody),
'contents' => $httpBody,
'error' => UPLOAD_ERR_OK,
'is_uploaded_file' => false,
- )
+ ))
);
}
} elseif($this->getMethod() == $methods['POST'] && (!isset($_SERVER['CONTENT_TYPE']) || (isset($_SERVER['CONTENT_TYPE']) && !preg_match('#^(application/x-www-form-urlencoded|multipart/form-data)(;[^;]+)*?$#', $_SERVER['CONTENT_TYPE'])))) {
// POST, but no regular urlencoded data or file upload. lets put the request payload into a file
$httpBody = file_get_contents('php://input');

- $_FILES = array(
- $this->getParameter('http_post_file_name', 'post_file') => array(
+ $files = array(
+ $this->getParameter('http_post_file_name', 'post_file') => new $ufc(array(
'name' => $this->getMethod(),
'type' => isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : 'application/octet-stream',
'size' => strlen($httpBody),
'contents' => $httpBody,
'error' => UPLOAD_ERR_OK,
'is_uploaded_file' => false,
- )
+ ))
);
+ } elseif($this->getMethod() == $methods['POST'] && isset($_SERVER['CONTENT_TYPE']) && preg_match('#^multipart/form-data(;[^;]+)*?$#', $_SERVER['CONTENT_TYPE'])) {
+ $files = static::fixFilesArray($_FILES, $ufc);
}

$headers = array();
@@ -474,12 +479,64 @@
$this->setRequestData(new $rdhc(array(
constant("$rdhc::SOURCE_PARAMETERS") => array_merge($_GET, $_POST),
constant("$rdhc::SOURCE_COOKIES") => $_COOKIE,
- constant("$rdhc::SOURCE_FILES") => $_FILES,
+ constant("$rdhc::SOURCE_FILES") => $files,
constant("$rdhc::SOURCE_HEADERS") => $headers,
)));
}

/**
+ * Corrects the order of $_FILES for arrays of files.
+ * The cleaned up array of AgaviUploadedFile objects is returned.
+ *
+ * @param array The array to work on.
+ * @param string Name of the wrapper uploaded file class to instantiate.
+ * @param array Array of indices used during recursion, initially empty.
+ * @param array Output buffer used during recursion, initially empty.
+ *
+ * @author David Zülke <d...@bitxtender.com>
+ * @since 1.1.0
+ */
+ protected static function fixFilesArray($input, $uploadedFileClass = 'AgaviUploadedFile', $index = array(), &$output = array())
+ {
+ $fromIndex = $index;
+ if(count($fromIndex) > 0) {
+ $first = array_shift($fromIndex);
+ array_unshift($fromIndex, $first, 'error');
+ }
+ $sub = AgaviArrayPathDefinition::getValue($fromIndex, $input);
+ $theIndices = array();
+ foreach(array('name', 'type', 'size', 'tmp_name', 'error', 'is_uploaded_file') as $name) {
+ $theIndex = $fromIndex;
+ $first = array_shift($theIndex);
+ array_shift($theIndex);
+ array_unshift($theIndex, $first, $name);
+ $theIndices[$name] = $theIndex;
+ }
+ if(is_array($sub)) {
+ foreach($sub as $key => $value) {
+ $toIndex = array_merge($index, array($key));
+ if(is_array($value)) {
+ static::fixFilesArray($input, $uploadedFileClass, $toIndex, $output);
+ } else {
+ foreach($theIndices as $name => $theIndex) {
+ $data[$name] = AgaviArrayPathDefinition::getValue(array_merge($theIndex, array($key)), $input, $name == 'is_uploaded_file' ? true : null);
+ }
+ $data = new $uploadedFileClass($data);
+ AgaviArrayPathDefinition::setValue($toIndex, $output, $data);
+ }
+ }
+ } else {
+ foreach($theIndices as $name => $theIndex) {
+ $data[$name] = AgaviArrayPathDefinition::getValue($theIndex, $input, $name == 'is_uploaded_file' ? true : null);
+ }
+ $data = new $uploadedFileClass($data);
+ AgaviArrayPathDefinition::setValue($index, $output, $data);
+ }
+
+ return $output;
+ }
+
+ /**
* Do any necessary startup work after initialization.
*
* This method is not called directly after initialize().

Modified: branches/david-httpcaching/src/request/AgaviWebRequestDataHolder.class.php
===================================================================
--- branches/david-httpcaching/src/request/AgaviWebRequestDataHolder.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/request/AgaviWebRequestDataHolder.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -60,11 +60,6 @@
* @var array An array of headers sent with the request.
*/
protected $headers = array();
-
- /**
- * @var string The name of the AgaviUploadedFile implementation to use.
- */
- protected $uploadedFileClass = 'AgaviUploadedFile';

/**
* Checks if there is a value of a parameter is empty or not set.
@@ -594,57 +589,6 @@
}

/**
- * Corrects the order of $_FILES for arrays of files.
- * The cleaned up array of AgaviUploadedFile objects is put into $this->files.
- *
- * @param array Array of indices used during recursion, initially empty.
- *
- * @author David Zülke <d...@bitxtender.com>
- * @since 0.11.0
- */
- protected function fixFilesArray(&$input = array(), $index = array())
- {
- $fromIndex = $index;
- if(count($fromIndex) > 0) {
- $first = array_shift($fromIndex);
- array_unshift($fromIndex, $first, 'error');
- } else {
- // first call
- $input = $this->files;
- $this->files = array();
- }
- $sub = AgaviArrayPathDefinition::getValue($fromIndex, $input);
- $theIndices = array();
- foreach(array('name', 'type', 'size', 'tmp_name', 'error', 'is_uploaded_file', 'contents') as $name) {
- $theIndex = $fromIndex;
- $first = array_shift($theIndex);
- array_shift($theIndex);
- array_unshift($theIndex, $first, $name);
- $theIndices[$name] = $theIndex;
- }
- if(is_array($sub)) {
- foreach($sub as $key => $value) {
- $toIndex = array_merge($index, array($key));
- if(is_array($value)) {
- $this->fixFilesArray($input, $toIndex);
- } else {
- foreach($theIndices as $name => $theIndex) {
- $data[$name] = AgaviArrayPathDefinition::getValue(array_merge($theIndex, array($key)), $input, $name == 'is_uploaded_file' ? true : null);
- }
- $data = new $this->uploadedFileClass($data);
- AgaviArrayPathDefinition::setValue($toIndex, $this->files, $data);
- }
- }
- } else {
- foreach($theIndices as $name => $theIndex) {
- $data[$name] = AgaviArrayPathDefinition::getValue($theIndex, $input, $name == 'is_uploaded_file' ? true : null);
- }
- $data = new $this->uploadedFileClass($data);
- AgaviArrayPathDefinition::setValue($index, $this->files, $data);
- }
- }
-
- /**
* Constructor
*
* @param array An associative array of request data source names and
@@ -661,16 +605,6 @@

// call the parent ctor which handles the actual loading of the data
parent::__construct($data);
-
- // now fix the files array if necessary
- if($this->files) {
- foreach(new RecursiveIteratorIterator(new RecursiveArrayIterator($this->files), RecursiveIteratorIterator::LEAVES_ONLY) as $leaf) {
- if(!($leaf instanceof AgaviUploadedFile)) {
- $this->fixFilesArray();
- }
- break;
- }
- }
}

/**

Modified: branches/david-httpcaching/src/routing/AgaviWebRouting.class.php
===================================================================
--- branches/david-httpcaching/src/routing/AgaviWebRouting.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/routing/AgaviWebRouting.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -169,7 +169,7 @@
$parsedRuQuery = $parsedInput = '';
parse_str($ru['query'], $parsedRuQuery);
parse_str($this->input, $parsedInput);
- if(function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
+ if(get_magic_quotes_gpc()) {
$parsedRuQuery = AgaviWebRequest::clearMagicQuotes($parsedRuQuery);
$parsedInput = AgaviWebRequest::clearMagicQuotes($parsedInput, false /* start on the first level */);
}

Copied: branches/david-httpcaching/src/testing/AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility.class.php (from rev 4909, trunk/src/testing/AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility.class.php)
===================================================================
--- branches/david-httpcaching/src/testing/AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility.class.php (rev 0)
+++ branches/david-httpcaching/src/testing/AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -0,0 +1,54 @@
+<?php
+
+// +---------------------------------------------------------------------------+
+// | This file is part of the Agavi package. |
+// | Copyright (c) 2005-2011 the Agavi Project. |
+// | |
+// | For the full copyright and license information, please view the LICENSE |
+// | file that was distributed with this source code. You can also view the |
+// | LICENSE file online at http://www.agavi.org/LICENSE.txt |
+// | vi: set noexpandtab: |
+// | Local Variables: |
+// | indent-tabs-mode: t |
+// | End: |
+// +---------------------------------------------------------------------------+
+
+/**
+ * Base constraint that caters for breaking changes between PHPUnit 3.5 and 3.6.
+ * Concrete constraints must implement match().
+ *
+ * @package agavi
+ * @subpackage testing
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @copyright The Agavi Project
+ *
+ * @since 1.0.7
+ *
+ * @version $Id$
+ */
+abstract class AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility extends PHPUnit_Framework_Constraint
+{
+ /**
+ * Overridden function to cover differences between PHPUnit 3.5 and 3.6.
+ * Intentionally made final so people have to use match() from now on.
+ * match() should be abstract really, but isn't, the usual PHPUnit quality...
+ *
+ * @param mixed The item to evaluate.
+ * @param string Additional information about the test (3.6+).
+ * @param bool Whether to return a result or throw an exception (3.6+).
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @since 1.0.7
+ */
+ public function evaluate($other, $description = '', $returnResult = false)
+ {
+ if(version_compare(PHPUnit_Runner_Version::id(), '3.6', '<')) {
+ return $this->matches($other);
+ } else {
+ return parent::evaluate($other, $description, $returnResult);
+ }
+ }
+}
+
+?>
\ No newline at end of file

Modified: branches/david-httpcaching/src/testing/AgaviFlowTestCase.class.php
===================================================================
--- branches/david-httpcaching/src/testing/AgaviFlowTestCase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing/AgaviFlowTestCase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -31,6 +31,11 @@
abstract class AgaviFlowTestCase extends AgaviPhpUnitTestCase implements AgaviIFlowTestCase
{
/**
+ * @var string the name of the context to use, null for default context
+ */
+ protected $contextName = null;
+
+ /**
* @var string the fake routing input
*/
protected $input;
@@ -53,9 +58,17 @@
$this->setRunTestInSeparateProcess(true);
}

+ /**
+ * Return the context defined for this test (or the default one).
+ *
+ * @return AgaviContext The context instance defined for this test.
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @since 1.0.7
+ */
public function getContext()
{
- return AgaviContext::getInstance();
+ return AgaviContext::getInstance($this->contextName);
}

/**

Modified: branches/david-httpcaching/src/testing/AgaviFragmentTestCase.class.php
===================================================================
--- branches/david-httpcaching/src/testing/AgaviFragmentTestCase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing/AgaviFragmentTestCase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -30,7 +30,6 @@
*/
abstract class AgaviFragmentTestCase extends AgaviPhpUnitTestCase implements AgaviIFragmentTestCase
{
-
/**
* @var string the name of the context to use, null for default context
*/
@@ -99,10 +98,10 @@
}

/**
- * retrieve the application context
+ * Return the context defined for this test (or the default one).
+ *
+ * @return AgaviContext The context instance defined for this test.
*
- * @return AgaviContext the application context
- *
* @author Felix Gilcher <felix....@bitextender.com>
* @since 1.0.0
*/

Modified: branches/david-httpcaching/src/testing/AgaviTesting.class.php
===================================================================
--- branches/david-httpcaching/src/testing/AgaviTesting.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing/AgaviTesting.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -31,6 +31,32 @@
class AgaviTesting
{
/**
+ * @var PHP_CodeCoverage_Filter The code coverage filter for our tests.
+ */
+ public static $codeCoverageFilter = null;
+
+ /**
+ * Get the code coverage filter instance we will use for tests.
+ * When running PHPUnit 3.5, this will return the singleton instance.
+ * When running PHPUnit 3.6, this will return the instance we hold internally;
+ * this same instance will be passed to PHPUnit in AgaviTesting::dispatch().
+ *
+ * @return PHP_CodeCoverage_Filter The code coverage filter for our tests.
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @since 1.0.7
+ */
+ public static function getCodeCoverageFilter()
+ {
+ if(self::$codeCoverageFilter === null) {
+ // PHP_CodeCoverage doesn't expose any version info, we'll have to check if there is a static getInstance method
+ self::$codeCoverageFilter = method_exists('PHP_CodeCoverage_Filter', 'getInstance') ? PHP_CodeCoverage_Filter::getInstance() : new PHP_CodeCoverage_Filter();
+ }
+
+ return self::$codeCoverageFilter;
+ }
+
+ /**
* Startup the Agavi core
*
* @param string environment the environment to use for this session.
@@ -64,8 +90,21 @@
$GLOBALS['AGAVI_CONFIG'] = AgaviConfig::toArray();
}

- public static function dispatch($arguments = array())
- {
+ /**
+ * Dispatch the test run.
+ *
+ * @param array An array of arguments configuring PHPUnit behavior.
+ * @param bool Whether exit() should be called with an appropriate shell
+ * exit status to indicate success or failures/errors.
+ *
+ * @return PHPUnit_Framework_TestResult The PHPUnit result object.
+ *
+ * @author Felix Gilcher <felix....@bitextender.com>
+ * @author David Zülke <david....@bitextender.com>
+ * @since 1.0.0
+ */
+ public static function dispatch($arguments = array(), $exit = true)
+ {

$suites = include AgaviConfigCache::checkConfig(AgaviConfig::get('core.testing_dir').'/config/suites.xml');
$master_suite = new AgaviTestSuite('Master');
@@ -79,7 +118,7 @@
if(empty($suites[$name])) {
throw new InvalidArgumentException(sprintf('Invalid suite name %1$s.', $name));
}
-
+
$master_suite->addTest(self::createSuite($name, $suites[$name]));
}

@@ -96,11 +135,43 @@
}
}

- $runner = new PHPUnit_TextUI_TestRunner();
- $runner->doRun($master_suite, $arguments);
+ if(version_compare(PHPUnit_Runner_Version::id(), '3.6', '<')) {
+ // PHP_CodeCoverage_Filter is a singleton
+ $runner = new PHPUnit_TextUI_TestRunner();
+ } else {
+ // PHP_CodeCoverage_Filter instance must be passed to the test runner
+ $runner = new PHPUnit_TextUI_TestRunner(null, self::$codeCoverageFilter);
+ }
+ $result = $runner->doRun($master_suite, $arguments);
+ if($exit) {
+ // bai
+ exit(self::getExitStatus($result));
+ } else {
+ // return result so calling code can use it
+ return $result;
+ }
}

/**
+ * Compute a shell exit status for the given result.
+ * Behaves like PHPUnit_TextUI_Command.
+ *
+ * @param PHPUnit_Framework_TestResult The test result object.
+ *
+ * @return int The shell exit code.
+ */
+ public static function getExitStatus(PHPUnit_Framework_TestResult $result)
+ {
+ if($result->wasSuccessful()) {
+ return PHPUnit_TextUI_TestRunner::SUCCESS_EXIT;
+ } elseif($result->errorCount()) {
+ return PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT;
+ } else {
+ return PHPUnit_TextUI_TestRunner::FAILURE_EXIT;
+ }
+ }
+
+ /**
* Initialize a suite from the given instructions and add registered tests.
*
* @param string Name of the suite
@@ -154,6 +225,7 @@
public static function processCommandlineOptions()
{
$longOptions = array(
+ 'configuration=',
'coverage-html=',
'coverage-clover=',
'coverage-source=',
@@ -185,6 +257,10 @@

foreach($options[0] as $option) {
switch($option[0]) {
+ case '--configuration':
+ $arguments['configuration'] = $option[1];
+ break;
+
case '--coverage-clover':
case '--coverage-xml':
if(self::checkCodeCoverageDeps()) {
@@ -306,6 +382,8 @@
--log-metrics <file> Write metrics report in XML format.
--log-pmd <file> Write violations report in PMD XML format.

+ --configuration <file> PHPUnit XML configuration file to use.
+
--coverage-html <dir> Generate code coverage report in HTML format.
--coverage-clover <file> Write code coverage data in Clover XML format.
--coverage-source <dir> Write code coverage / source data in XML format.

Modified: branches/david-httpcaching/src/testing/AgaviUnitTestCase.class.php
===================================================================
--- branches/david-httpcaching/src/testing/AgaviUnitTestCase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing/AgaviUnitTestCase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -30,8 +30,11 @@
*/
abstract class AgaviUnitTestCase extends AgaviPhpUnitTestCase implements AgaviIUnitTestCase
{
+ /**
+ * @var string the name of the context to use, null for default context
+ */
protected $contextName = null;
-
+
/**
* Constructs a test case with the given name.
*
@@ -44,10 +47,17 @@
parent::__construct($name, $data, $dataName);
$this->setRunTestInSeparateProcess(true);
}
-
+
+ /**
+ * Return the context defined for this test (or the default one).
+ *
+ * @return AgaviContext The context instance defined for this test.
+ *
+ * @author Felix Gilcher <felix....@bitextender.com>
+ * @since 1.0.0
+ */
public function getContext()
{
return AgaviContext::getInstance($this->contextName);
}
-
}
\ No newline at end of file

Modified: branches/david-httpcaching/src/testing/AgaviViewTestCase.class.php
===================================================================
--- branches/david-httpcaching/src/testing/AgaviViewTestCase.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing/AgaviViewTestCase.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -206,7 +206,7 @@
if(!($response instanceof AgaviWebResponse)) {
$this->fail(sprintf($message . ' (response is not an AgaviWebResponse)', $expected));
}
- $this->assertEquals($expectedValue, $response->getHeader($expected), sprintf($message, $expected, $expectedValue));
+ $this->assertEquals($expectedValue, $response->getHttpHeader($expected), sprintf($message, $expected, $expectedValue));
}

/**

Modified: branches/david-httpcaching/src/testing/PHPUnit/Constraint/AgaviConstraintActionHandlesMethod.php
===================================================================
--- branches/david-httpcaching/src/testing/PHPUnit/Constraint/AgaviConstraintActionHandlesMethod.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing/PHPUnit/Constraint/AgaviConstraintActionHandlesMethod.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -14,7 +14,7 @@
*
* @version $Id$
*/
-class AgaviConstraintActionHandlesMethod extends PHPUnit_Framework_Constraint
+class AgaviConstraintActionHandlesMethod extends AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility
{
/**
* @var AgaviAction The Action instance.
@@ -50,9 +50,9 @@
* @return bool The result of the evaluation.
*
* @author Felix Gilcher <felix....@bitextender.com>
- * @since 1.0.0
+ * @since 1.0.7
*/
- public function evaluate($other)
+ public function matches($other)
{
$executeMethod = 'execute' . $other;
if(is_callable(array($this->actionInstance, $executeMethod)) || ($this->acceptGeneric && is_callable(array($this->actionInstance, 'execute')))) {

Modified: branches/david-httpcaching/src/testing/PHPUnit/Constraint/AgaviConstraintViewHandlesOutputType.php
===================================================================
--- branches/david-httpcaching/src/testing/PHPUnit/Constraint/AgaviConstraintViewHandlesOutputType.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing/PHPUnit/Constraint/AgaviConstraintViewHandlesOutputType.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -14,7 +14,7 @@
*
* @version $Id$
*/
-class AgaviConstraintViewHandlesOutputType extends PHPUnit_Framework_Constraint
+class AgaviConstraintViewHandlesOutputType extends AgaviBaseConstraintBecausePhpunitSucksAtBackwardsCompatibility
{
/**
* @var AgaviView The View instance.
@@ -50,9 +50,9 @@
* @return bool The result of the evaluation.
*
* @author Felix Gilcher <felix....@bitextender.com>
- * @since 1.0.0
+ * @since 1.0.7
*/
- public function evaluate($other)
+ public function matches($other)
{
$executeMethod = 'execute' . $other;
if(is_callable(array($this->viewInstance, $executeMethod)) || ($this->acceptGeneric && is_callable(array($this->viewInstance, 'execute')))) {

Modified: branches/david-httpcaching/src/testing/templates/TestCaseMethod.tpl
===================================================================
--- branches/david-httpcaching/src/testing/templates/TestCaseMethod.tpl 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing/templates/TestCaseMethod.tpl 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,26 +1,59 @@
<?php
+
+// ***
+// This file is based on https://github.com/sebastianbergmann/phpunit/blob/3.5.15/PHPUnit/Framework/Process/TestCaseMethod.tpl.dist and https://github.com/sebastianbergmann/phpunit/blob/3.6.4/PHPUnit/Framework/Process/TestCaseMethod.tpl.dist with some lines commented out and a version switch inside __phpunit_run_isolated_test() to cater for the different code coverage collection mechanisms between versions
+// ***
+
+set_include_path('{include_path}');
+// removal reason: testing.php includes that one
+// require_once 'PHPUnit/Autoload.php';
+ob_start();
+
function __phpunit_run_isolated_test()
{
+ if (!class_exists('{className}')) {
+ require_once '{filename}';
+ }
+
$result = new PHPUnit_Framework_TestResult;
- $result->collectRawCodeCoverageInformation({collectCodeCoverageInformation});

+ if(version_compare(PHPUnit_Runner_Version::id(), '3.6', '<')) { // testing.php includes Version.php
+ $result->collectRawCodeCoverageInformation({collectCodeCoverageInformation});
+ } else {
+ if ({collectCodeCoverageInformation}) {
+ $result->setCodeCoverage(new PHP_CodeCoverage);
+ }
+ }
+
+ $result->strictMode({strict});
+
$test = new {className}('{methodName}', unserialize('{data}'), '{dataName}');
$test->setDependencyInput(unserialize('{dependencyInput}'));
$test->setInIsolation(TRUE);
+
+ ob_end_clean();
+ ob_start();
$test->run($result);
+ $output = ob_get_clean();

print serialize(
array(
'testResult' => $test->getResult(),
'numAssertions' => $test->getNumAssertions(),
- 'result' => $result
+ 'result' => $result,
+ 'output' => $output
)
);
+
+ ob_start();
}

+{constants}
+// removal reason: will screw up order of inclusions, we have autoloaders for this
+/*{included_files}*/
{globals}
-set_include_path('{include_path}');

+// *** BEGIN CUSTOM AGAVI CODE ***
require_once('testing.php');
AgaviConfig::fromArray($GLOBALS['AGAVI_CONFIG']);
unset($GLOBALS['AGAVI_CONFIG']);
@@ -40,9 +73,14 @@
if('' != '{agavi_default_context}') {
AgaviConfig::set('core.default_context', '{agavi_default_context}');
}
+// *** END CUSTOM AGAVI CODE ***

-require_once '{filename}';
+// removal reason: will screw up order of inclusions, we have autoloaders for this
+// if (isset($GLOBALS['__PHPUNIT_BOOTSTRAP'])) {
+// require_once $GLOBALS['__PHPUNIT_BOOTSTRAP'];
+// unset($GLOBALS['__PHPUNIT_BOOTSTRAP']);
+// }

-
-__phpunit_run_isolated_test()
-?>
+__phpunit_run_isolated_test();
+ob_end_clean();
+?>
\ No newline at end of file

Modified: branches/david-httpcaching/src/testing.php
===================================================================
--- branches/david-httpcaching/src/testing.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/testing.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -37,8 +37,8 @@

// changing the init procedure in a minor release... good job, PHPUnit...
require_once('PHPUnit/Runner/Version.php');
-if(version_compare(PHPUnit_Runner_Version::id(), '3.5', '<')) {
- trigger_error('Agavi requires PHPUnit version 3.5 or higher', E_USER_ERROR);
+if(version_compare(PHPUnit_Runner_Version::id(), '3.5.2', '<')) {
+ trigger_error('Agavi requires PHPUnit version 3.5.2 or higher', E_USER_ERROR);
}
// load PHPUnit basics
require_once('PHPUnit/Autoload.php');

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Abidjan.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Abidjan.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Abidjan.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Abidjan".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Abidjan',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Accra.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Accra.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Accra.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Accra".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -122,7 +122,7 @@
'startYear' => 1943,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Accra',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Addis_Ababa.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Addis_Ababa.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Addis_Ababa.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Addis_Ababa".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1937,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Addis_Ababa',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Algiers.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Algiers.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Algiers.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Algiers".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -235,7 +235,7 @@
'startYear' => 1982,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Algiers',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Asmara.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Asmara.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Asmara.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Asmara".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1937,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Asmara',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bamako.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bamako.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bamako.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Bamako".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1961,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Bamako',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bangui.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bangui.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bangui.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Bangui".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Bangui',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Banjul.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Banjul.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Banjul.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Banjul".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1965,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Banjul',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bissau.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bissau.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bissau.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Bissau".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1976,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Bissau',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Blantyre.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Blantyre.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Blantyre.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Blantyre".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1904,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Blantyre',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Brazzaville.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Brazzaville.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Brazzaville.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Brazzaville".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Brazzaville',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bujumbura.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bujumbura.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Bujumbura.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Bujumbura".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1890,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Bujumbura',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Cairo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Cairo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Cairo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Cairo".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -666,7 +666,7 @@
'startYear' => 2011,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Cairo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Casablanca.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Casablanca.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Casablanca.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Casablanca".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -182,7 +182,7 @@
'startYear' => 2012,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Casablanca',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ceuta.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ceuta.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ceuta.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Ceuta".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -306,7 +306,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Africa/Ceuta',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Conakry.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Conakry.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Conakry.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Conakry".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1961,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Conakry',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Dakar.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Dakar.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Dakar.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Dakar".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1942,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Dakar',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Dar_es_Salaam.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Dar_es_Salaam.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Dar_es_Salaam.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Dar_es_Salaam".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -26,7 +26,7 @@
),
1 =>
array (
- 'rawOffset' => 9885,
+ 'rawOffset' => 9900,
'dstOffset' => 0,
'name' => 'BEAUT',
),
@@ -45,7 +45,7 @@
),
2 =>
array (
- 'time' => -284006685,
+ 'time' => -284006700,
'type' => 0,
),
),
@@ -57,7 +57,7 @@
'startYear' => 1961,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Dar_es_Salaam',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Djibouti.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Djibouti.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Djibouti.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Djibouti".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Djibouti',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Douala.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Douala.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Douala.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Douala".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Douala',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_El_Aaiun.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_El_Aaiun.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_El_Aaiun.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/El_Aaiun".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1977,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/El_Aaiun',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Freetown.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Freetown.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Freetown.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Freetown".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -226,7 +226,7 @@
'startYear' => 1963,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Freetown',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Gaborone.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Gaborone.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Gaborone.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Gaborone".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1945,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Gaborone',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Harare.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Harare.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Harare.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Harare".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1904,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Harare',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Johannesburg.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Johannesburg.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Johannesburg.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Johannesburg".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -77,7 +77,7 @@
'startYear' => 1945,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Johannesburg',
);

Copied: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Juba.php (from rev 4909, trunk/src/translation/data/timezones/Africa_47_Juba.php)
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Juba.php (rev 0)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Juba.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -0,0 +1,225 @@
+<?php
+
+/**
+ * Data file for timezone "Africa/Juba".
+ * Compiled from olson file "africa", version 8.33.
+ *
+ * @package agavi
+ * @subpackage translation
+ *
+ * @copyright Authors
+ * @copyright The Agavi Project
+ *
+ * @since 0.11.0
+ *
+ * @version $Id$
+ */
+
+return array (
+ 'types' =>
+ array (
+ 0 =>
+ array (
+ 'rawOffset' => 7200,
+ 'dstOffset' => 0,
+ 'name' => 'CAT',
+ ),
+ 1 =>
+ array (
+ 'rawOffset' => 7200,
+ 'dstOffset' => 3600,
+ 'name' => 'CAST',
+ ),
+ 2 =>
+ array (
+ 'rawOffset' => 10800,
+ 'dstOffset' => 0,
+ 'name' => 'EAT',
+ ),
+ ),
+ 'rules' =>
+ array (
+ 0 =>
+ array (
+ 'time' => -1230775584,
+ 'type' => 0,
+ ),
+ 1 =>
+ array (
+ 'time' => 10360800,
+ 'type' => 1,
+ ),
+ 2 =>
+ array (
+ 'time' => 24786000,
+ 'type' => 0,
+ ),
+ 3 =>
+ array (
+ 'time' => 41810400,
+ 'type' => 1,
+ ),
+ 4 =>
+ array (
+ 'time' => 56322000,
+ 'type' => 0,
+ ),
+ 5 =>
+ array (
+ 'time' => 73432800,
+ 'type' => 1,
+ ),
+ 6 =>
+ array (
+ 'time' => 87944400,
+ 'type' => 0,
+ ),
+ 7 =>
+ array (
+ 'time' => 104882400,
+ 'type' => 1,
+ ),
+ 8 =>
+ array (
+ 'time' => 119480400,
+ 'type' => 0,
+ ),
+ 9 =>
+ array (
+ 'time' => 136332000,
+ 'type' => 1,
+ ),
+ 10 =>
+ array (
+ 'time' => 151016400,
+ 'type' => 0,
+ ),
+ 11 =>
+ array (
+ 'time' => 167781600,
+ 'type' => 1,
+ ),
+ 12 =>
+ array (
+ 'time' => 182552400,
+ 'type' => 0,
+ ),
+ 13 =>
+ array (
+ 'time' => 199231200,
+ 'type' => 1,
+ ),
+ 14 =>
+ array (
+ 'time' => 214174800,
+ 'type' => 0,
+ ),
+ 15 =>
+ array (
+ 'time' => 230680800,
+ 'type' => 1,
+ ),
+ 16 =>
+ array (
+ 'time' => 245710800,
+ 'type' => 0,
+ ),
+ 17 =>
+ array (
+ 'time' => 262735200,
+ 'type' => 1,
+ ),
+ 18 =>
+ array (
+ 'time' => 277246800,
+ 'type' => 0,
+ ),
+ 19 =>
+ array (
+ 'time' => 294184800,
+ 'type' => 1,
+ ),
+ 20 =>
+ array (
+ 'time' => 308782800,
+ 'type' => 0,
+ ),
+ 21 =>
+ array (
+ 'time' => 325634400,
+ 'type' => 1,
+ ),
+ 22 =>
+ array (
+ 'time' => 340405200,
+ 'type' => 0,
+ ),
+ 23 =>
+ array (
+ 'time' => 357084000,
+ 'type' => 1,
+ ),
+ 24 =>
+ array (
+ 'time' => 371941200,
+ 'type' => 0,
+ ),
+ 25 =>
+ array (
+ 'time' => 388533600,
+ 'type' => 1,
+ ),
+ 26 =>
+ array (
+ 'time' => 403477200,
+ 'type' => 0,
+ ),
+ 27 =>
+ array (
+ 'time' => 419983200,
+ 'type' => 1,
+ ),
+ 28 =>
+ array (
+ 'time' => 435013200,
+ 'type' => 0,
+ ),
+ 29 =>
+ array (
+ 'time' => 452037600,
+ 'type' => 1,
+ ),
+ 30 =>
+ array (
+ 'time' => 466635600,
+ 'type' => 0,
+ ),
+ 31 =>
+ array (
+ 'time' => 483487200,
+ 'type' => 1,
+ ),
+ 32 =>
+ array (
+ 'time' => 498171600,
+ 'type' => 0,
+ ),
+ 33 =>
+ array (
+ 'time' => 947930400,
+ 'type' => 2,
+ ),
+ ),
+ 'finalRule' =>
+ array (
+ 'type' => 'static',
+ 'name' => 'EAT',
+ 'offset' => 10800,
+ 'startYear' => 2001,
+ ),
+ 'source' => 'africa',
+ 'version' => '8.33',
+ 'name' => 'Africa/Juba',
+);
+
+?>
\ No newline at end of file

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kampala.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kampala.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kampala.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Kampala".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -32,7 +32,7 @@
),
2 =>
array (
- 'rawOffset' => 9885,
+ 'rawOffset' => 9900,
'dstOffset' => 0,
'name' => 'BEAUT',
),
@@ -56,7 +56,7 @@
),
3 =>
array (
- 'time' => -410237085,
+ 'time' => -410237100,
'type' => 0,
),
),
@@ -68,7 +68,7 @@
'startYear' => 1957,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Kampala',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Khartoum.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Khartoum.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Khartoum.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Khartoum".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -218,7 +218,7 @@
'startYear' => 2001,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Khartoum',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kigali.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kigali.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kigali.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Kigali".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1936,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Kigali',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kinshasa.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kinshasa.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Kinshasa.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Kinshasa".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1898,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Kinshasa',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lagos.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lagos.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lagos.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Lagos".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1920,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Lagos',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Libreville.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Libreville.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Libreville.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Libreville".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Libreville',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lome.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lome.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lome.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Lome".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1893,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Lome',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Luanda.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Luanda.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Luanda.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Luanda".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Luanda',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lubumbashi.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lubumbashi.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lubumbashi.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Lubumbashi".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1898,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Lubumbashi',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lusaka.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lusaka.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Lusaka.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Lusaka".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1904,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Lusaka',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Malabo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Malabo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Malabo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Malabo".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1964,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Malabo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Maputo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Maputo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Maputo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Maputo".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1904,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Maputo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Maseru.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Maseru.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Maseru.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Maseru".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1945,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Maseru',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Mbabane.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Mbabane.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Mbabane.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Mbabane".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1904,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Mbabane',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Mogadishu.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Mogadishu.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Mogadishu.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Mogadishu".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1957,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Mogadishu',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Monrovia.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Monrovia.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Monrovia.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Monrovia".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1973,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Monrovia',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Nairobi.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Nairobi.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Nairobi.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Nairobi".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -32,7 +32,7 @@
),
2 =>
array (
- 'rawOffset' => 9885,
+ 'rawOffset' => 9900,
'dstOffset' => 0,
'name' => 'BEAUT',
),
@@ -56,7 +56,7 @@
),
3 =>
array (
- 'time' => -315629085,
+ 'time' => -315629100,
'type' => 0,
),
),
@@ -68,7 +68,7 @@
'startYear' => 1960,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Nairobi',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ndjamena.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ndjamena.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ndjamena.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Ndjamena".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1981,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Ndjamena',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Niamey.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Niamey.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Niamey.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Niamey".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1961,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Niamey',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Nouakchott.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Nouakchott.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Nouakchott.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Nouakchott".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1961,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Nouakchott',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ouagadougou.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ouagadougou.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Ouagadougou.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Ouagadougou".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Ouagadougou',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Porto_45_Novo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Porto_45_Novo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Porto_45_Novo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Porto-Novo".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1935,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Porto-Novo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Sao_Tome.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Sao_Tome.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Sao_Tome.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Sao_Tome".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1913,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Sao_Tome',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Tripoli.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Tripoli.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Tripoli.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Tripoli".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -193,7 +193,7 @@
'startYear' => 1998,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Tripoli',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Tunis.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Tunis.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Tunis.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Tunis".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -217,7 +217,7 @@
'startYear' => 2009,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Tunis',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Africa_47_Windhoek.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Africa_47_Windhoek.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Africa_47_Windhoek.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Africa/Windhoek".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -123,7 +123,7 @@
'startYear' => 1995,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Africa/Windhoek',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Adak.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Adak.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Adak.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Adak".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -769,7 +769,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Adak',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Anchorage.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Anchorage.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Anchorage.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Anchorage".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -769,7 +769,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Anchorage',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Anguilla.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Anguilla.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Anguilla.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Anguilla".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Anguilla',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Antigua.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Antigua.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Antigua.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Antigua".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1952,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Antigua',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Araguaina.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Araguaina.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Araguaina.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Araguaina".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -302,7 +302,7 @@
'startYear' => 2004,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Araguaina',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Buenos_Aires.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Buenos_Aires.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Buenos_Aires.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Buenos_Aires".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -374,7 +374,7 @@
'startYear' => 2010,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Buenos_Aires',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Catamarca.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Catamarca.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Catamarca.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Catamarca".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -397,7 +397,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Catamarca',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Cordoba.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Cordoba.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Cordoba.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Cordoba".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -391,7 +391,7 @@
'startYear' => 2010,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Cordoba',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Jujuy.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Jujuy.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Jujuy.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Jujuy".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -398,7 +398,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Jujuy',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_La_Rioja.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_La_Rioja.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_La_Rioja.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/La_Rioja".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -391,7 +391,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/La_Rioja',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Mendoza.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Mendoza.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Mendoza.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Mendoza".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -403,7 +403,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Mendoza',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Rio_Gallegos.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Rio_Gallegos.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Rio_Gallegos.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Rio_Gallegos".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -386,7 +386,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Rio_Gallegos',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Salta.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Salta.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Salta.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Salta".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -387,7 +387,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Salta',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_San_Juan.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_San_Juan.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_San_Juan.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/San_Juan".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -391,7 +391,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/San_Juan',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_San_Luis.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_San_Luis.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_San_Luis.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/San_Luis".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -392,7 +392,7 @@
'startYear' => 2010,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/San_Luis',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Tucuman.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Tucuman.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Tucuman.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Tucuman".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -401,7 +401,7 @@
'startYear' => 2010,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Tucuman',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Ushuaia.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Ushuaia.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Argentina_47_Ushuaia.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Argentina/Ushuaia".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -386,7 +386,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Argentina/Ushuaia',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Aruba.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Aruba.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Aruba.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Aruba".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1966,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Aruba',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Asuncion.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Asuncion.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Asuncion.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Asuncion".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -451,7 +451,7 @@
'startYear' => 2010,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Asuncion',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Atikokan.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Atikokan.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Atikokan.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Atikokan".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -106,7 +106,7 @@
'startYear' => 1946,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Atikokan',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Bahia.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Bahia.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Bahia.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Bahia".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -333,16 +333,303 @@
'time' => 1064372400,
'type' => 0,
),
+ 60 =>
+ array (
+ 'time' => 1318734000,
+ 'type' => 1,
+ ),
+ 61 =>
+ array (
+ 'time' => 1330221600,
+ 'type' => 0,
+ ),
+ 62 =>
+ array (
+ 'time' => 1350788400,
+ 'type' => 1,
+ ),
+ 63 =>
+ array (
+ 'time' => 1361066400,
+ 'type' => 0,
+ ),
+ 64 =>
+ array (
+ 'time' => 1382238000,
+ 'type' => 1,
+ ),
+ 65 =>
+ array (
+ 'time' => 1392516000,
+ 'type' => 0,
+ ),
+ 66 =>
+ array (
+ 'time' => 1413687600,
+ 'type' => 1,
+ ),
+ 67 =>
+ array (
+ 'time' => 1424570400,
+ 'type' => 0,
+ ),
+ 68 =>
+ array (
+ 'time' => 1445137200,
+ 'type' => 1,
+ ),
+ 69 =>
+ array (
+ 'time' => 1456020000,
+ 'type' => 0,
+ ),
+ 70 =>
+ array (
+ 'time' => 1476586800,
+ 'type' => 1,
+ ),
+ 71 =>
+ array (
+ 'time' => 1487469600,
+ 'type' => 0,
+ ),
+ 72 =>
+ array (
+ 'time' => 1508036400,
+ 'type' => 1,
+ ),
+ 73 =>
+ array (
+ 'time' => 1518919200,
+ 'type' => 0,
+ ),
+ 74 =>
+ array (
+ 'time' => 1540090800,
+ 'type' => 1,
+ ),
+ 75 =>
+ array (
+ 'time' => 1550368800,
+ 'type' => 0,
+ ),
+ 76 =>
+ array (
+ 'time' => 1571540400,
+ 'type' => 1,
+ ),
+ 77 =>
+ array (
+ 'time' => 1581818400,
+ 'type' => 0,
+ ),
+ 78 =>
+ array (
+ 'time' => 1602990000,
+ 'type' => 1,
+ ),
+ 79 =>
+ array (
+ 'time' => 1613872800,
+ 'type' => 0,
+ ),
+ 80 =>
+ array (
+ 'time' => 1634439600,
+ 'type' => 1,
+ ),
+ 81 =>
+ array (
+ 'time' => 1645322400,
+ 'type' => 0,
+ ),
+ 82 =>
+ array (
+ 'time' => 1665889200,
+ 'type' => 1,
+ ),
+ 83 =>
+ array (
+ 'time' => 1677376800,
+ 'type' => 0,
+ ),
+ 84 =>
+ array (
+ 'time' => 1697338800,
+ 'type' => 1,
+ ),
+ 85 =>
+ array (
+ 'time' => 1708221600,
+ 'type' => 0,
+ ),
+ 86 =>
+ array (
+ 'time' => 1729393200,
+ 'type' => 1,
+ ),
+ 87 =>
+ array (
+ 'time' => 1739671200,
+ 'type' => 0,
+ ),
+ 88 =>
+ array (
+ 'time' => 1760842800,
+ 'type' => 1,
+ ),
+ 89 =>
+ array (
+ 'time' => 1771725600,
+ 'type' => 0,
+ ),
+ 90 =>
+ array (
+ 'time' => 1792292400,
+ 'type' => 1,
+ ),
+ 91 =>
+ array (
+ 'time' => 1803175200,
+ 'type' => 0,
+ ),
+ 92 =>
+ array (
+ 'time' => 1823742000,
+ 'type' => 1,
+ ),
+ 93 =>
+ array (
+ 'time' => 1834624800,
+ 'type' => 0,
+ ),
+ 94 =>
+ array (
+ 'time' => 1855191600,
+ 'type' => 1,
+ ),
+ 95 =>
+ array (
+ 'time' => 1866074400,
+ 'type' => 0,
+ ),
+ 96 =>
+ array (
+ 'time' => 1887246000,
+ 'type' => 1,
+ ),
+ 97 =>
+ array (
+ 'time' => 1897524000,
+ 'type' => 0,
+ ),
+ 98 =>
+ array (
+ 'time' => 1918695600,
+ 'type' => 1,
+ ),
+ 99 =>
+ array (
+ 'time' => 1928973600,
+ 'type' => 0,
+ ),
+ 100 =>
+ array (
+ 'time' => 1950145200,
+ 'type' => 1,
+ ),
+ 101 =>
+ array (
+ 'time' => 1960423200,
+ 'type' => 0,
+ ),
+ 102 =>
+ array (
+ 'time' => 1981594800,
+ 'type' => 1,
+ ),
+ 103 =>
+ array (
+ 'time' => 1992477600,
+ 'type' => 0,
+ ),
+ 104 =>
+ array (
+ 'time' => 2013044400,
+ 'type' => 1,
+ ),
+ 105 =>
+ array (
+ 'time' => 2024532000,
+ 'type' => 0,
+ ),
+ 106 =>
+ array (
+ 'time' => 2044494000,
+ 'type' => 1,
+ ),
+ 107 =>
+ array (
+ 'time' => 2055376800,
+ 'type' => 0,
+ ),
+ 108 =>
+ array (
+ 'time' => 2076548400,
+ 'type' => 1,
+ ),
+ 109 =>
+ array (
+ 'time' => 2086826400,
+ 'type' => 0,
+ ),
+ 110 =>
+ array (
+ 'time' => 2107998000,
+ 'type' => 1,
+ ),
+ 111 =>
+ array (
+ 'time' => 2118880800,
+ 'type' => 0,
+ ),
+ 112 =>
+ array (
+ 'time' => 2139447600,
+ 'type' => 1,
+ ),
+ 113 =>
+ array (
+ 'time' => 2150330400,
+ 'type' => 0,
+ ),
),
'finalRule' =>
array (
- 'type' => 'static',
- 'name' => 'BRT',
+ 'type' => 'dynamic',
'offset' => -10800,
- 'startYear' => 2004,
+ 'name' => 'BR%sT',
+ 'save' => 3600,
+ 'start' =>
+ array (
+ 'month' => 9,
+ 'date' => '15',
+ 'day_of_week' => -1,
+ 'time' => 0,
+ 'type' => 0,
+ ),
+ 'end' =>
+ array (
+ 'month' => 1,
+ 'date' => '15',
+ 'day_of_week' => -1,
+ 'time' => 0,
+ 'type' => 0,
+ ),
+ 'startYear' => 2038,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Bahia',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Bahia_Banderas.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Bahia_Banderas.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Bahia_Banderas.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Bahia_Banderas".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -186,7 +186,7 @@
'startYear' => 2002,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Bahia_Banderas',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Barbados.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Barbados.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Barbados.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Barbados".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -103,7 +103,7 @@
'startYear' => 1981,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Barbados',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Belem.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Belem.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Belem.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Belem".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -192,7 +192,7 @@
'startYear' => 1989,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Belem',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Belize.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Belize.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Belize.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Belize".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -328,7 +328,7 @@
'startYear' => 1984,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Belize',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Blanc_45_Sablon.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Blanc_45_Sablon.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Blanc_45_Sablon.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Blanc-Sablon".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -95,7 +95,7 @@
'startYear' => 1971,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Blanc-Sablon',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Boa_Vista.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Boa_Vista.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Boa_Vista.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Boa_Vista".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -217,7 +217,7 @@
'startYear' => 2001,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Boa_Vista',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Bogota.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Bogota.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Bogota.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Bogota".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -67,7 +67,7 @@
'startYear' => 1994,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Bogota',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Boise.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Boise.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Boise.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Boise".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -555,7 +555,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Boise',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Cambridge_Bay.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Cambridge_Bay.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Cambridge_Bay.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Cambridge_Bay".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -420,7 +420,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Cambridge_Bay',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Campo_Grande.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Campo_Grande.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Campo_Grande.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Campo_Grande".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -704,7 +704,7 @@
'startYear' => 2038,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Campo_Grande',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Cancun.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Cancun.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Cancun.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Cancun".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -162,7 +162,7 @@
'startYear' => 2002,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Cancun',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Caracas.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Caracas.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Caracas.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Caracas".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -68,7 +68,7 @@
'startYear' => 2008,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Caracas',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Cayenne.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Cayenne.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Cayenne.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Cayenne".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1968,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Cayenne',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Cayman.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Cayman.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Cayman.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Cayman".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1913,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Cayman',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Chicago.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Chicago.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Chicago.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Chicago".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -983,7 +983,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Chicago',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Chihuahua.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Chihuahua.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Chihuahua.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Chihuahua".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -186,7 +186,7 @@
'startYear' => 2002,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Chihuahua',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Costa_Rica.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Costa_Rica.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Costa_Rica.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Costa_Rica".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -103,7 +103,7 @@
'startYear' => 1993,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Costa_Rica',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Cuiaba.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Cuiaba.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Cuiaba.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Cuiaba".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -704,7 +704,7 @@
'startYear' => 2038,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Cuiaba',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Curacao.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Curacao.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Curacao.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Curacao".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1966,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Curacao',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Danmarkshavn.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Danmarkshavn.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Danmarkshavn.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Danmarkshavn".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -224,7 +224,7 @@
'startYear' => 1997,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'America/Danmarkshavn',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Dawson.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Dawson.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Dawson.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Dawson".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -538,7 +538,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Dawson',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Dawson_Creek.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Dawson_Creek.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Dawson_Creek.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Dawson_Creek".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -361,7 +361,7 @@
'startYear' => 1973,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Dawson_Creek',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Denver.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Denver.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Denver.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Denver".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -587,7 +587,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Denver',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Detroit.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Detroit.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Detroit.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Detroit".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -504,7 +504,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Detroit',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Dominica.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Dominica.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Dominica.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Dominica".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Dominica',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Edmonton.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Edmonton.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Edmonton.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Edmonton".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -552,7 +552,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Edmonton',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Eirunepe.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Eirunepe.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Eirunepe.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Eirunepe".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -223,7 +223,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Eirunepe',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_El_Salvador.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_El_Salvador.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_El_Salvador.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/El_Salvador".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -72,7 +72,7 @@
'startYear' => 1989,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/El_Salvador',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Fortaleza.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Fortaleza.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Fortaleza.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Fortaleza".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -257,7 +257,7 @@
'startYear' => 2003,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Fortaleza',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Glace_Bay.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Glace_Bay.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Glace_Bay.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Glace_Bay".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -497,7 +497,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Glace_Bay',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Godthab.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Godthab.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Godthab.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Godthab".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -240,7 +240,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'America/Godthab',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Goose_Bay.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Goose_Bay.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Goose_Bay.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Goose_Bay".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -821,6 +821,41 @@
'time' => 1194145260,
'type' => 7,
),
+ 148 =>
+ array (
+ 'time' => 1205035260,
+ 'type' => 8,
+ ),
+ 149 =>
+ array (
+ 'time' => 1225594860,
+ 'type' => 7,
+ ),
+ 150 =>
+ array (
+ 'time' => 1236484860,
+ 'type' => 8,
+ ),
+ 151 =>
+ array (
+ 'time' => 1257044460,
+ 'type' => 7,
+ ),
+ 152 =>
+ array (
+ 'time' => 1268539260,
+ 'type' => 8,
+ ),
+ 153 =>
+ array (
+ 'time' => 1289098860,
+ 'type' => 7,
+ ),
+ 154 =>
+ array (
+ 'time' => 1299988860,
+ 'type' => 8,
+ ),
),
'finalRule' =>
array (
@@ -833,7 +868,7 @@
'month' => 2,
'date' => '8',
'day_of_week' => -1,
- 'time' => 60000,
+ 'time' => 7200000,
'type' => 0,
),
'end' =>
@@ -841,13 +876,13 @@
'month' => 10,
'date' => '1',
'day_of_week' => -1,
- 'time' => 60000,
+ 'time' => 7200000,
'type' => 0,
),
- 'startYear' => 2007,
+ 'startYear' => 2012,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Goose_Bay',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Grand_Turk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Grand_Turk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Grand_Turk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Grand_Turk".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -371,7 +371,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Grand_Turk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Grenada.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Grenada.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Grenada.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Grenada".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Grenada',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Guadeloupe.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Guadeloupe.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Guadeloupe.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Guadeloupe".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Guadeloupe',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Guatemala.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Guatemala.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Guatemala.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Guatemala".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -92,7 +92,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Guatemala',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Guayaquil.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Guayaquil.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Guayaquil.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Guayaquil".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1932,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Guayaquil',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Guyana.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Guyana.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Guyana.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Guyana".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -74,7 +74,7 @@
'startYear' => 1992,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Guyana',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Halifax.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Halifax.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Halifax.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Halifax".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -937,7 +937,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Halifax',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Havana.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Havana.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Havana.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Havana".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -562,7 +562,7 @@
),
103 =>
array (
- 'time' => 1319950800,
+ 'time' => 1321160400,
'type' => 3,
),
104 =>
@@ -570,6 +570,11 @@
'time' => 1331442000,
'type' => 2,
),
+ 105 =>
+ array (
+ 'time' => 1351400400,
+ 'type' => 3,
+ ),
),
'finalRule' =>
array (
@@ -596,7 +601,7 @@
'startYear' => 2012,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Havana',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Hermosillo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Hermosillo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Hermosillo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Hermosillo".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -134,7 +134,7 @@
'startYear' => 2000,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Hermosillo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Indianapolis.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Indianapolis.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Indianapolis.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Indiana/Indianapolis".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -314,7 +314,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Indiana/Indianapolis',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Knox.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Knox.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Knox.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Indiana/Knox".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -568,7 +568,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Indiana/Knox',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Marengo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Marengo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Marengo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Indiana/Marengo".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -324,7 +324,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Indiana/Marengo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Petersburg.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Petersburg.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Petersburg.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Indiana/Petersburg".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -378,7 +378,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Indiana/Petersburg',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Tell_City.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Tell_City.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Tell_City.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Indiana/Tell_City".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -314,7 +314,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Indiana/Tell_City',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Vevay.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Vevay.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Vevay.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Indiana/Vevay".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -209,7 +209,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Indiana/Vevay',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Vincennes.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Vincennes.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Vincennes.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Indiana/Vincennes".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -314,7 +314,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Indiana/Vincennes',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Winamac.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Winamac.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Indiana_47_Winamac.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Indiana/Winamac".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -350,7 +350,7 @@
'startYear' => 2008,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Indiana/Winamac',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Inuvik.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Inuvik.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Inuvik.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Inuvik".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -479,7 +479,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Inuvik',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Iqaluit.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Iqaluit.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Iqaluit.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Iqaluit".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -404,7 +404,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Iqaluit',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Jamaica.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Jamaica.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Jamaica.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Jamaica".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -169,7 +169,7 @@
'startYear' => 1985,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Jamaica',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Juneau.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Juneau.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Juneau.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Juneau".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -551,7 +551,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Juneau',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Kentucky_47_Louisville.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Kentucky_47_Louisville.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Kentucky_47_Louisville.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Kentucky/Louisville".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -720,7 +720,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Kentucky/Louisville',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Kentucky_47_Monticello.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Kentucky_47_Monticello.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Kentucky_47_Monticello.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Kentucky/Monticello".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -544,7 +544,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Kentucky/Monticello',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_La_Paz.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_La_Paz.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_La_Paz.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/La_Paz".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1933,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/La_Paz',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Lima.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Lima.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Lima.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Lima".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -127,7 +127,7 @@
'startYear' => 1995,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Lima',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Los_Angeles.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Los_Angeles.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Los_Angeles.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Los_Angeles".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -717,7 +717,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Los_Angeles',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Maceio.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Maceio.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Maceio.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Maceio".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -277,7 +277,7 @@
'startYear' => 2003,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Maceio',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Managua.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Managua.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Managua.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Managua".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -139,7 +139,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Managua',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Manaus.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Manaus.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Manaus.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Manaus".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -212,7 +212,7 @@
'startYear' => 1995,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Manaus',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Martinique.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Martinique.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Martinique.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Martinique".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -68,7 +68,7 @@
'startYear' => 1981,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Martinique',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Matamoros.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Matamoros.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Matamoros.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Matamoros".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -154,7 +154,7 @@
'startYear' => 2002,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Matamoros',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Mazatlan.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Mazatlan.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Mazatlan.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Mazatlan".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -186,7 +186,7 @@
'startYear' => 2002,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Mazatlan',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Menominee.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Menominee.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Menominee.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Menominee".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -508,7 +508,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Menominee',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Merida.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Merida.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Merida.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Merida".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -150,7 +150,7 @@
'startYear' => 2002,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Merida',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Metlakatla.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Metlakatla.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Metlakatla.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Metlakatla".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -54,12 +54,6 @@
'dstOffset' => 0,
'name' => 'MeST',
),
- 6 =>
- array (
- 'rawOffset' => -28800,
- 'dstOffset' => 3600,
- 'name' => 'MeST',
- ),
),
'rules' =>
array (
@@ -258,273 +252,16 @@
'time' => 436356000,
'type' => 5,
),
- 39 =>
- array (
- 'time' => 452080800,
- 'type' => 6,
- ),
- 40 =>
- array (
- 'time' => 467802000,
- 'type' => 5,
- ),
- 41 =>
- array (
- 'time' => 483530400,
- 'type' => 6,
- ),
- 42 =>
- array (
- 'time' => 499251600,
- 'type' => 5,
- ),
- 43 =>
- array (
- 'time' => 514980000,
- 'type' => 6,
- ),
- 44 =>
- array (
- 'time' => 530701200,
- 'type' => 5,
- ),
- 45 =>
- array (
- 'time' => 544615200,
- 'type' => 6,
- ),
- 46 =>
- array (
- 'time' => 562150800,
- 'type' => 5,
- ),
- 47 =>
- array (
- 'time' => 576064800,
- 'type' => 6,
- ),
- 48 =>
- array (
- 'time' => 594205200,
- 'type' => 5,
- ),
- 49 =>
- array (
- 'time' => 607514400,
- 'type' => 6,
- ),
- 50 =>
- array (
- 'time' => 625654800,
- 'type' => 5,
- ),
- 51 =>
- array (
- 'time' => 638964000,
- 'type' => 6,
- ),
- 52 =>
- array (
- 'time' => 657104400,
- 'type' => 5,
- ),
- 53 =>
- array (
- 'time' => 671018400,
- 'type' => 6,
- ),
- 54 =>
- array (
- 'time' => 688554000,
- 'type' => 5,
- ),
- 55 =>
- array (
- 'time' => 702468000,
- 'type' => 6,
- ),
- 56 =>
- array (
- 'time' => 720003600,
- 'type' => 5,
- ),
- 57 =>
- array (
- 'time' => 733917600,
- 'type' => 6,
- ),
- 58 =>
- array (
- 'time' => 752058000,
- 'type' => 5,
- ),
- 59 =>
- array (
- 'time' => 765367200,
- 'type' => 6,
- ),
- 60 =>
- array (
- 'time' => 783507600,
- 'type' => 5,
- ),
- 61 =>
- array (
- 'time' => 796816800,
- 'type' => 6,
- ),
- 62 =>
- array (
- 'time' => 814957200,
- 'type' => 5,
- ),
- 63 =>
- array (
- 'time' => 828871200,
- 'type' => 6,
- ),
- 64 =>
- array (
- 'time' => 846406800,
- 'type' => 5,
- ),
- 65 =>
- array (
- 'time' => 860320800,
- 'type' => 6,
- ),
- 66 =>
- array (
- 'time' => 877856400,
- 'type' => 5,
- ),
- 67 =>
- array (
- 'time' => 891770400,
- 'type' => 6,
- ),
- 68 =>
- array (
- 'time' => 909306000,
- 'type' => 5,
- ),
- 69 =>
- array (
- 'time' => 923220000,
- 'type' => 6,
- ),
- 70 =>
- array (
- 'time' => 941360400,
- 'type' => 5,
- ),
- 71 =>
- array (
- 'time' => 954669600,
- 'type' => 6,
- ),
- 72 =>
- array (
- 'time' => 972810000,
- 'type' => 5,
- ),
- 73 =>
- array (
- 'time' => 986119200,
- 'type' => 6,
- ),
- 74 =>
- array (
- 'time' => 1004259600,
- 'type' => 5,
- ),
- 75 =>
- array (
- 'time' => 1018173600,
- 'type' => 6,
- ),
- 76 =>
- array (
- 'time' => 1035709200,
- 'type' => 5,
- ),
- 77 =>
- array (
- 'time' => 1049623200,
- 'type' => 6,
- ),
- 78 =>
- array (
- 'time' => 1067158800,
- 'type' => 5,
- ),
- 79 =>
- array (
- 'time' => 1081072800,
- 'type' => 6,
- ),
- 80 =>
- array (
- 'time' => 1099213200,
- 'type' => 5,
- ),
- 81 =>
- array (
- 'time' => 1112522400,
- 'type' => 6,
- ),
- 82 =>
- array (
- 'time' => 1130662800,
- 'type' => 5,
- ),
- 83 =>
- array (
- 'time' => 1143972000,
- 'type' => 6,
- ),
- 84 =>
- array (
- 'time' => 1162112400,
- 'type' => 5,
- ),
- 85 =>
- array (
- 'time' => 1173607200,
- 'type' => 6,
- ),
- 86 =>
- array (
- 'time' => 1194166800,
- 'type' => 5,
- ),
),
'finalRule' =>
array (
- 'type' => 'dynamic',
- 'offset' => -28800,
+ 'type' => 'static',
'name' => 'MeST',
- 'save' => 3600,
- 'start' =>
- array (
- 'month' => 2,
- 'date' => '8',
- 'day_of_week' => -1,
- 'time' => 7200000,
- 'type' => 0,
- ),
- 'end' =>
- array (
- 'month' => 10,
- 'date' => '1',
- 'day_of_week' => -1,
- 'time' => 7200000,
- 'type' => 0,
- ),
- 'startYear' => 2007,
+ 'offset' => -28800,
+ 'startYear' => 1984,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Metlakatla',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Mexico_City.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Mexico_City.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Mexico_City.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Mexico_City".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -227,7 +227,7 @@
'startYear' => 2003,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Mexico_City',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Miquelon.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Miquelon.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Miquelon.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Miquelon".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -290,7 +290,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Miquelon',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Moncton.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Moncton.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Moncton.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Moncton".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -848,7 +848,7 @@
'startYear' => 2008,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Moncton',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Monterrey.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Monterrey.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Monterrey.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Monterrey".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -154,7 +154,7 @@
'startYear' => 2002,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Monterrey',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Montevideo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Montevideo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Montevideo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Montevideo".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -444,7 +444,7 @@
'startYear' => 2007,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Montevideo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Montreal.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Montreal.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Montreal.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Montreal".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -962,7 +962,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Montreal',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Montserrat.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Montserrat.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Montserrat.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Montserrat".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Montserrat',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Nassau.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Nassau.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Nassau.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Nassau".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -515,7 +515,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Nassau',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_New_York.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_New_York.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_New_York.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/New_York".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -977,7 +977,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/New_York',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Nipigon.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Nipigon.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Nipigon.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Nipigon".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -452,7 +452,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Nipigon',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Nome.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Nome.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Nome.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Nome".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -769,7 +769,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Nome',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Noronha.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Noronha.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Noronha.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Noronha".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -257,7 +257,7 @@
'startYear' => 2003,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Noronha',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_Beulah.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_Beulah.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_Beulah.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/North_Dakota/Beulah".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -527,7 +527,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/North_Dakota/Beulah',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_Center.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_Center.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_Center.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/North_Dakota/Center".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -544,7 +544,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/North_Dakota/Center',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_New_Salem.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_New_Salem.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_North_Dakota_47_New_Salem.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/North_Dakota/New_Salem".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -544,7 +544,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/North_Dakota/New_Salem',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Ojinaga.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Ojinaga.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Ojinaga.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Ojinaga".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -186,7 +186,7 @@
'startYear' => 2002,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Ojinaga',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Panama.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Panama.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Panama.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Panama".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1909,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Panama',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Pangnirtung.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Pangnirtung.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Pangnirtung.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Pangnirtung".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -426,7 +426,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Pangnirtung',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Paramaribo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Paramaribo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Paramaribo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Paramaribo".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -85,7 +85,7 @@
'startYear' => 1985,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Paramaribo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Phoenix.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Phoenix.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Phoenix.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Phoenix".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -120,7 +120,7 @@
'startYear' => 1969,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Phoenix',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Port_45_au_45_Prince.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Port_45_au_45_Prince.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Port_45_au_45_Prince.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Port-au-Prince".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -238,7 +238,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Port-au-Prince',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Port_of_Spain.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Port_of_Spain.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Port_of_Spain.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Port_of_Spain".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Port_of_Spain',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Porto_Velho.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Porto_Velho.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Porto_Velho.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Porto_Velho".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -192,7 +192,7 @@
'startYear' => 1989,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Porto_Velho',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Puerto_Rico.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Puerto_Rico.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Puerto_Rico.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Puerto_Rico".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -73,7 +73,7 @@
'startYear' => 1947,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Puerto_Rico',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Rainy_River.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Rainy_River.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Rainy_River.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Rainy_River".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -452,7 +452,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Rainy_River',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Rankin_Inlet.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Rankin_Inlet.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Rankin_Inlet.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Rankin_Inlet".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -371,7 +371,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Rankin_Inlet',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Recife.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Recife.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Recife.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Recife".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -257,7 +257,7 @@
'startYear' => 2003,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Recife',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Regina.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Regina.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Regina.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Regina".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -331,7 +331,7 @@
'startYear' => 1961,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Regina',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Resolute.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Resolute.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Resolute.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Resolute".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -42,18 +42,6 @@
'dstOffset' => 0,
'name' => 'EST',
),
- 4 =>
- array (
- 'rawOffset' => -18000,
- 'dstOffset' => 0,
- 'name' => 'T',
- ),
- 5 =>
- array (
- 'rawOffset' => -18000,
- 'dstOffset' => 0,
- 'name' => 'CDT',
- ),
),
'rules' =>
array (
@@ -350,37 +338,37 @@
58 =>
array (
'time' => 1162108800,
- 'type' => 4,
+ 'type' => 3,
),
59 =>
array (
- 'time' => 1162710000,
- 'type' => 3,
+ 'time' => 1173600000,
+ 'type' => 2,
),
60 =>
array (
- 'time' => 1173596400,
- 'type' => 5,
+ 'time' => 1194159600,
+ 'type' => 0,
),
),
'finalRule' =>
array (
'type' => 'dynamic',
- 'offset' => -18000,
- 'name' => '%sT',
- 'save' => 0,
+ 'offset' => -21600,
+ 'name' => 'C%sT',
+ 'save' => 3600,
'start' =>
array (
- 'month' => 10,
- 'date' => '1',
+ 'month' => 2,
+ 'date' => '8',
'day_of_week' => -1,
'time' => 7200000,
'type' => 0,
),
'end' =>
array (
- 'month' => 2,
- 'date' => '8',
+ 'month' => 10,
+ 'date' => '1',
'day_of_week' => -1,
'time' => 7200000,
'type' => 0,
@@ -388,7 +376,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Resolute',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Rio_Branco.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Rio_Branco.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Rio_Branco.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Rio_Branco".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -203,7 +203,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Rio_Branco',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Santa_Isabel.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Santa_Isabel.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Santa_Isabel.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Santa_Isabel".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -502,7 +502,7 @@
'startYear' => 2003,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Santa_Isabel',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Santarem.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Santarem.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Santarem.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Santarem".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -203,7 +203,7 @@
'startYear' => 2009,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Santarem',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Santiago.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Santiago.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Santiago.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Santiago".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -697,7 +697,7 @@
'startYear' => 2012,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Santiago',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Santo_Domingo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Santo_Domingo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Santo_Domingo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Santo_Domingo".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -151,7 +151,7 @@
'startYear' => 2001,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Santo_Domingo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Sao_Paulo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Sao_Paulo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Sao_Paulo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Sao_Paulo".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -715,7 +715,7 @@
'startYear' => 2038,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'America/Sao_Paulo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Scoresbysund.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Scoresbysund.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Scoresbysund.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Scoresbysund".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -252,7 +252,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'America/Scoresbysund',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Sitka.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Sitka.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Sitka.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Sitka".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -71,7 +71,7 @@
array (
0 =>
array (
- 'time' => -3225258073,
+ 'time' => -3225365927,
'type' => 0,
),
1 =>
@@ -535,7 +535,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Sitka',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_St_Johns.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_St_Johns.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_St_Johns.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/St_Johns".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -979,6 +979,41 @@
'time' => 1194143460,
'type' => 3,
),
+ 182 =>
+ array (
+ 'time' => 1205033460,
+ 'type' => 4,
+ ),
+ 183 =>
+ array (
+ 'time' => 1225593060,
+ 'type' => 3,
+ ),
+ 184 =>
+ array (
+ 'time' => 1236483060,
+ 'type' => 4,
+ ),
+ 185 =>
+ array (
+ 'time' => 1257042660,
+ 'type' => 3,
+ ),
+ 186 =>
+ array (
+ 'time' => 1268537460,
+ 'type' => 4,
+ ),
+ 187 =>
+ array (
+ 'time' => 1289097060,
+ 'type' => 3,
+ ),
+ 188 =>
+ array (
+ 'time' => 1299987060,
+ 'type' => 4,
+ ),
),
'finalRule' =>
array (
@@ -991,7 +1026,7 @@
'month' => 2,
'date' => '8',
'day_of_week' => -1,
- 'time' => 60000,
+ 'time' => 7200000,
'type' => 0,
),
'end' =>
@@ -999,13 +1034,13 @@
'month' => 10,
'date' => '1',
'day_of_week' => -1,
- 'time' => 60000,
+ 'time' => 7200000,
'type' => 0,
),
- 'startYear' => 2007,
+ 'startYear' => 2012,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/St_Johns',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_St_Kitts.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_St_Kitts.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_St_Kitts.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/St_Kitts".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/St_Kitts',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_St_Lucia.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_St_Lucia.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_St_Lucia.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/St_Lucia".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1913,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/St_Lucia',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_St_Thomas.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_St_Thomas.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_St_Thomas.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/St_Thomas".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/St_Thomas',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_St_Vincent.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_St_Vincent.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_St_Vincent.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/St_Vincent".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1913,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/St_Vincent',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Swift_Current.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Swift_Current.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Swift_Current.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Swift_Current".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -191,7 +191,7 @@
'startYear' => 1973,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Swift_Current',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Tegucigalpa.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Tegucigalpa.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Tegucigalpa.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Tegucigalpa".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -82,7 +82,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Tegucigalpa',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Thule.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Thule.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Thule.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Thule".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -240,7 +240,7 @@
'startYear' => 2007,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'America/Thule',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Thunder_Bay.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Thunder_Bay.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Thunder_Bay.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Thunder_Bay".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -492,7 +492,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Thunder_Bay',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Tijuana.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Tijuana.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Tijuana.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Tijuana".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -502,7 +502,7 @@
'startYear' => 2003,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Tijuana',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Toronto.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Toronto.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Toronto.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Toronto".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -957,7 +957,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Toronto',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Tortola.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Tortola.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Tortola.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Tortola".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Tortola',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Vancouver.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Vancouver.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Vancouver.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Vancouver".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -732,7 +732,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Vancouver',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Whitehorse.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Whitehorse.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Whitehorse.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Whitehorse".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -538,7 +538,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Whitehorse',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Winnipeg.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Winnipeg.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Winnipeg.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Winnipeg".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -712,7 +712,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Winnipeg',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Yakutat.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Yakutat.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Yakutat.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Yakutat".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -524,7 +524,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Yakutat',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/America_47_Yellowknife.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/America_47_Yellowknife.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/America_47_Yellowknife.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "America/Yellowknife".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -392,7 +392,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'America/Yellowknife',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aden.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aden.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aden.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Aden".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1950,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Aden',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Almaty.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Almaty.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Almaty.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Almaty".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -223,7 +223,7 @@
'startYear' => 2006,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Almaty',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Amman.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Amman.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Amman.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Amman".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -339,7 +339,7 @@
'startYear' => 2006,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Amman',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Anadyr.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Anadyr.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Anadyr.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Anadyr".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -242,16 +242,166 @@
'time' => 846338400,
'type' => 0,
),
+ 37 =>
+ array (
+ 'time' => 859644000,
+ 'type' => 3,
+ ),
+ 38 =>
+ array (
+ 'time' => 877788000,
+ 'type' => 0,
+ ),
+ 39 =>
+ array (
+ 'time' => 891093600,
+ 'type' => 3,
+ ),
+ 40 =>
+ array (
+ 'time' => 909237600,
+ 'type' => 0,
+ ),
+ 41 =>
+ array (
+ 'time' => 922543200,
+ 'type' => 3,
+ ),
+ 42 =>
+ array (
+ 'time' => 941292000,
+ 'type' => 0,
+ ),
+ 43 =>
+ array (
+ 'time' => 953992800,
+ 'type' => 3,
+ ),
+ 44 =>
+ array (
+ 'time' => 972741600,
+ 'type' => 0,
+ ),
+ 45 =>
+ array (
+ 'time' => 985442400,
+ 'type' => 3,
+ ),
+ 46 =>
+ array (
+ 'time' => 1004191200,
+ 'type' => 0,
+ ),
+ 47 =>
+ array (
+ 'time' => 1017496800,
+ 'type' => 3,
+ ),
+ 48 =>
+ array (
+ 'time' => 1035640800,
+ 'type' => 0,
+ ),
+ 49 =>
+ array (
+ 'time' => 1048946400,
+ 'type' => 3,
+ ),
+ 50 =>
+ array (
+ 'time' => 1067090400,
+ 'type' => 0,
+ ),
+ 51 =>
+ array (
+ 'time' => 1080396000,
+ 'type' => 3,
+ ),
+ 52 =>
+ array (
+ 'time' => 1099144800,
+ 'type' => 0,
+ ),
+ 53 =>
+ array (
+ 'time' => 1111845600,
+ 'type' => 3,
+ ),
+ 54 =>
+ array (
+ 'time' => 1130594400,
+ 'type' => 0,
+ ),
+ 55 =>
+ array (
+ 'time' => 1143295200,
+ 'type' => 3,
+ ),
+ 56 =>
+ array (
+ 'time' => 1162044000,
+ 'type' => 0,
+ ),
+ 57 =>
+ array (
+ 'time' => 1174744800,
+ 'type' => 3,
+ ),
+ 58 =>
+ array (
+ 'time' => 1193493600,
+ 'type' => 0,
+ ),
+ 59 =>
+ array (
+ 'time' => 1206799200,
+ 'type' => 3,
+ ),
+ 60 =>
+ array (
+ 'time' => 1224943200,
+ 'type' => 0,
+ ),
+ 61 =>
+ array (
+ 'time' => 1238248800,
+ 'type' => 3,
+ ),
+ 62 =>
+ array (
+ 'time' => 1256392800,
+ 'type' => 0,
+ ),
+ 63 =>
+ array (
+ 'time' => 1269698400,
+ 'type' => 4,
+ ),
+ 64 =>
+ array (
+ 'time' => 1269702000,
+ 'type' => 5,
+ ),
+ 65 =>
+ array (
+ 'time' => 1288450800,
+ 'type' => 4,
+ ),
+ 66 =>
+ array (
+ 'time' => 1301151600,
+ 'type' => 0,
+ ),
),
'finalRule' =>
array (
'type' => 'static',
'name' => 'ANAT',
'offset' => 43200,
- 'startYear' => 1996,
+ 'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Anadyr',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aqtau.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aqtau.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aqtau.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Aqtau".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -269,7 +269,7 @@
'startYear' => 2006,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Aqtau',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aqtobe.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aqtobe.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Aqtobe.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Aqtobe".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -246,7 +246,7 @@
'startYear' => 2006,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Aqtobe',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ashgabat.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ashgabat.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ashgabat.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Ashgabat".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -190,7 +190,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Ashgabat',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Baghdad.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Baghdad.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Baghdad.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Baghdad".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -317,7 +317,7 @@
'startYear' => 2008,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Baghdad',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bahrain.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bahrain.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bahrain.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Bahrain".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1973,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Bahrain',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Baku.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Baku.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Baku.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Baku".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -266,7 +266,7 @@
'startYear' => 1997,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Baku',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bangkok.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bangkok.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bangkok.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Bangkok".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1921,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Bangkok',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Beirut.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Beirut.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Beirut.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Beirut".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -384,7 +384,7 @@
'startYear' => 1999,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Beirut',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bishkek.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bishkek.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Bishkek.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Bishkek".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -332,7 +332,7 @@
'startYear' => 2006,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Bishkek',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Brunei.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Brunei.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Brunei.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Brunei".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1933,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Brunei',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Choibalsan.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Choibalsan.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Choibalsan.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Choibalsan".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -294,7 +294,7 @@
'startYear' => 2007,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Choibalsan',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Chongqing.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Chongqing.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Chongqing.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Chongqing".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -123,7 +123,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Chongqing',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Colombo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Colombo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Colombo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Colombo".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -106,7 +106,7 @@
'startYear' => 2007,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Colombo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Damascus.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Damascus.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Damascus.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Damascus".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -539,7 +539,7 @@
'startYear' => 2010,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Damascus',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dhaka.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dhaka.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dhaka.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Dhaka".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -110,7 +110,7 @@
'startYear' => 2010,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Dhaka',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dili.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dili.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dili.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Dili".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -79,7 +79,7 @@
'startYear' => 2001,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Dili',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dubai.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dubai.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dubai.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Dubai".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1920,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Dubai',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dushanbe.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dushanbe.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Dushanbe.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Dushanbe".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -180,7 +180,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Dushanbe',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Gaza.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Gaza.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Gaza.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Gaza".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -483,12 +483,12 @@
),
86 =>
array (
- 'time' => 1207008000,
+ 'time' => 1207000800,
'type' => 2,
),
87 =>
array (
- 'time' => 1219964400,
+ 'time' => 1219957200,
'type' => 0,
),
88 =>
@@ -498,51 +498,39 @@
),
89 =>
array (
- 'time' => 1238194800,
- 'type' => 2,
- ),
- 90 =>
- array (
'time' => 1252018800,
'type' => 0,
),
- 91 =>
+ 90 =>
array (
'time' => 1269640860,
'type' => 2,
),
- 92 =>
+ 91 =>
array (
'time' => 1281474000,
'type' => 0,
),
- ),
- 'finalRule' =>
- array (
- 'type' => 'dynamic',
- 'offset' => 7200,
- 'name' => 'EE%sT',
- 'save' => 3600,
- 'start' =>
+ 92 =>
array (
- 'month' => 2,
- 'date' => -1,
- 'day_of_week' => 7,
- 'time' => 60000,
- 'type' => 0,
+ 'time' => 1301738460,
+ 'type' => 2,
),
- 'end' =>
+ 93 =>
array (
- 'month' => 8,
- 'date' => '1',
- 'day_of_week' => -6,
- 'time' => 7200000,
+ 'time' => 1312146000,
'type' => 0,
),
- 'startYear' => 2011,
),
+ 'finalRule' =>
+ array (
+ 'type' => 'static',
+ 'name' => 'EET',
+ 'offset' => 7200,
+ 'startYear' => 2012,
+ ),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Gaza',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Harbin.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Harbin.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Harbin.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Harbin".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -144,7 +144,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Harbin',
);

Copied: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hebron.php (from rev 4909, trunk/src/translation/data/timezones/Asia_47_Hebron.php)
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hebron.php (rev 0)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hebron.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -0,0 +1,552 @@
+<?php
+
+/**
+ * Data file for timezone "Asia/Hebron".
+ * Compiled from olson file "asia", version 8.69.
+ *
+ * @package agavi
+ * @subpackage translation
+ *
+ * @copyright Authors
+ * @copyright The Agavi Project
+ *
+ * @since 0.11.0
+ *
+ * @version $Id$
+ */
+
+return array (
+ 'types' =>
+ array (
+ 0 =>
+ array (
+ 'rawOffset' => 7200,
+ 'dstOffset' => 0,
+ 'name' => 'EET',
+ ),
+ 1 =>
+ array (
+ 'rawOffset' => 7200,
+ 'dstOffset' => 3600,
+ 'name' => 'EET',
+ ),
+ 2 =>
+ array (
+ 'rawOffset' => 7200,
+ 'dstOffset' => 3600,
+ 'name' => 'EEST',
+ ),
+ 3 =>
+ array (
+ 'rawOffset' => 7200,
+ 'dstOffset' => 0,
+ 'name' => 'IST',
+ ),
+ 4 =>
+ array (
+ 'rawOffset' => 7200,
+ 'dstOffset' => 3600,
+ 'name' => 'IDT',
+ ),
+ ),
+ 'rules' =>
+ array (
+ 0 =>
+ array (
+ 'time' => -2185410023,
+ 'type' => 0,
+ ),
+ 1 =>
+ array (
+ 'time' => -933645600,
+ 'type' => 1,
+ ),
+ 2 =>
+ array (
+ 'time' => -857358000,
+ 'type' => 0,
+ ),
+ 3 =>
+ array (
+ 'time' => -844300800,
+ 'type' => 1,
+ ),
+ 4 =>
+ array (
+ 'time' => -825814800,
+ 'type' => 0,
+ ),
+ 5 =>
+ array (
+ 'time' => -812685600,
+ 'type' => 1,
+ ),
+ 6 =>
+ array (
+ 'time' => -794199600,
+ 'type' => 0,
+ ),
+ 7 =>
+ array (
+ 'time' => -779853600,
+ 'type' => 1,
+ ),
+ 8 =>
+ array (
+ 'time' => -762656400,
+ 'type' => 0,
+ ),
+ 9 =>
+ array (
+ 'time' => -748310400,
+ 'type' => 1,
+ ),
+ 10 =>
+ array (
+ 'time' => -731127600,
+ 'type' => 0,
+ ),
+ 11 =>
+ array (
+ 'time' => -682653600,
+ 'type' => 0,
+ ),
+ 12 =>
+ array (
+ 'time' => -399088800,
+ 'type' => 2,
+ ),
+ 13 =>
+ array (
+ 'time' => -386650800,
+ 'type' => 0,
+ ),
+ 14 =>
+ array (
+ 'time' => -368330400,
+ 'type' => 2,
+ ),
+ 15 =>
+ array (
+ 'time' => -355114800,
+ 'type' => 0,
+ ),
+ 16 =>
+ array (
+ 'time' => -336790800,
+ 'type' => 2,
+ ),
+ 17 =>
+ array (
+ 'time' => -323654400,
+ 'type' => 0,
+ ),
+ 18 =>
+ array (
+ 'time' => -305161200,
+ 'type' => 2,
+ ),
+ 19 =>
+ array (
+ 'time' => -292032000,
+ 'type' => 0,
+ ),
+ 20 =>
+ array (
+ 'time' => -273625200,
+ 'type' => 2,
+ ),
+ 21 =>
+ array (
+ 'time' => -260496000,
+ 'type' => 0,
+ ),
+ 22 =>
+ array (
+ 'time' => -242089200,
+ 'type' => 2,
+ ),
+ 23 =>
+ array (
+ 'time' => -228960000,
+ 'type' => 0,
+ ),
+ 24 =>
+ array (
+ 'time' => -210553200,
+ 'type' => 2,
+ ),
+ 25 =>
+ array (
+ 'time' => -197424000,
+ 'type' => 0,
+ ),
+ 26 =>
+ array (
+ 'time' => -178930800,
+ 'type' => 2,
+ ),
+ 27 =>
+ array (
+ 'time' => -165801600,
+ 'type' => 0,
+ ),
+ 28 =>
+ array (
+ 'time' => -147394800,
+ 'type' => 2,
+ ),
+ 29 =>
+ array (
+ 'time' => -134265600,
+ 'type' => 0,
+ ),
+ 30 =>
+ array (
+ 'time' => -115858800,
+ 'type' => 2,
+ ),
+ 31 =>
+ array (
+ 'time' => -102643200,
+ 'type' => 0,
+ ),
+ 32 =>
+ array (
+ 'time' => -84322800,
+ 'type' => 2,
+ ),
+ 33 =>
+ array (
+ 'time' => -81313200,
+ 'type' => 3,
+ ),
+ 34 =>
+ array (
+ 'time' => 142380000,
+ 'type' => 4,
+ ),
+ 35 =>
+ array (
+ 'time' => 150843600,
+ 'type' => 3,
+ ),
+ 36 =>
+ array (
+ 'time' => 167176800,
+ 'type' => 4,
+ ),
+ 37 =>
+ array (
+ 'time' => 178664400,
+ 'type' => 3,
+ ),
+ 38 =>
+ array (
+ 'time' => 482277600,
+ 'type' => 4,
+ ),
+ 39 =>
+ array (
+ 'time' => 495579600,
+ 'type' => 3,
+ ),
+ 40 =>
+ array (
+ 'time' => 516751200,
+ 'type' => 4,
+ ),
+ 41 =>
+ array (
+ 'time' => 526424400,
+ 'type' => 3,
+ ),
+ 42 =>
+ array (
+ 'time' => 545436000,
+ 'type' => 4,
+ ),
+ 43 =>
+ array (
+ 'time' => 558478800,
+ 'type' => 3,
+ ),
+ 44 =>
+ array (
+ 'time' => 576540000,
+ 'type' => 4,
+ ),
+ 45 =>
+ array (
+ 'time' => 589237200,
+ 'type' => 3,
+ ),
+ 46 =>
+ array (
+ 'time' => 609890400,
+ 'type' => 4,
+ ),
+ 47 =>
+ array (
+ 'time' => 620773200,
+ 'type' => 3,
+ ),
+ 48 =>
+ array (
+ 'time' => 638316000,
+ 'type' => 4,
+ ),
+ 49 =>
+ array (
+ 'time' => 651618000,
+ 'type' => 3,
+ ),
+ 50 =>
+ array (
+ 'time' => 669765600,
+ 'type' => 4,
+ ),
+ 51 =>
+ array (
+ 'time' => 683672400,
+ 'type' => 3,
+ ),
+ 52 =>
+ array (
+ 'time' => 701820000,
+ 'type' => 4,
+ ),
+ 53 =>
+ array (
+ 'time' => 715726800,
+ 'type' => 3,
+ ),
+ 54 =>
+ array (
+ 'time' => 733701600,
+ 'type' => 4,
+ ),
+ 55 =>
+ array (
+ 'time' => 747176400,
+ 'type' => 3,
+ ),
+ 56 =>
+ array (
+ 'time' => 765151200,
+ 'type' => 4,
+ ),
+ 57 =>
+ array (
+ 'time' => 778021200,
+ 'type' => 3,
+ ),
+ 58 =>
+ array (
+ 'time' => 796600800,
+ 'type' => 4,
+ ),
+ 59 =>
+ array (
+ 'time' => 810075600,
+ 'type' => 3,
+ ),
+ 60 =>
+ array (
+ 'time' => 820447200,
+ 'type' => 0,
+ ),
+ 61 =>
+ array (
+ 'time' => 828655200,
+ 'type' => 2,
+ ),
+ 62 =>
+ array (
+ 'time' => 843170400,
+ 'type' => 0,
+ ),
+ 63 =>
+ array (
+ 'time' => 860104800,
+ 'type' => 2,
+ ),
+ 64 =>
+ array (
+ 'time' => 874620000,
+ 'type' => 0,
+ ),
+ 65 =>
+ array (
+ 'time' => 891554400,
+ 'type' => 2,
+ ),
+ 66 =>
+ array (
+ 'time' => 906069600,
+ 'type' => 0,
+ ),
+ 67 =>
+ array (
+ 'time' => 915141600,
+ 'type' => 0,
+ ),
+ 68 =>
+ array (
+ 'time' => 924213600,
+ 'type' => 2,
+ ),
+ 69 =>
+ array (
+ 'time' => 939934800,
+ 'type' => 0,
+ ),
+ 70 =>
+ array (
+ 'time' => 956268000,
+ 'type' => 2,
+ ),
+ 71 =>
+ array (
+ 'time' => 971989200,
+ 'type' => 0,
+ ),
+ 72 =>
+ array (
+ 'time' => 987717600,
+ 'type' => 2,
+ ),
+ 73 =>
+ array (
+ 'time' => 1003438800,
+ 'type' => 0,
+ ),
+ 74 =>
+ array (
+ 'time' => 1019167200,
+ 'type' => 2,
+ ),
+ 75 =>
+ array (
+ 'time' => 1034888400,
+ 'type' => 0,
+ ),
+ 76 =>
+ array (
+ 'time' => 1050616800,
+ 'type' => 2,
+ ),
+ 77 =>
+ array (
+ 'time' => 1066338000,
+ 'type' => 0,
+ ),
+ 78 =>
+ array (
+ 'time' => 1082070000,
+ 'type' => 2,
+ ),
+ 79 =>
+ array (
+ 'time' => 1096581600,
+ 'type' => 0,
+ ),
+ 80 =>
+ array (
+ 'time' => 1113523200,
+ 'type' => 2,
+ ),
+ 81 =>
+ array (
+ 'time' => 1128380400,
+ 'type' => 0,
+ ),
+ 82 =>
+ array (
+ 'time' => 1143842400,
+ 'type' => 2,
+ ),
+ 83 =>
+ array (
+ 'time' => 1158872400,
+ 'type' => 0,
+ ),
+ 84 =>
+ array (
+ 'time' => 1175385600,
+ 'type' => 2,
+ ),
+ 85 =>
+ array (
+ 'time' => 1189638000,
+ 'type' => 0,
+ ),
+ 86 =>
+ array (
+ 'time' => 1207000800,
+ 'type' => 2,
+ ),
+ 87 =>
+ array (
+ 'time' => 1217538000,
+ 'type' => 2,
+ ),
+ 88 =>
+ array (
+ 'time' => 1220216400,
+ 'type' => 0,
+ ),
+ 89 =>
+ array (
+ 'time' => 1238104800,
+ 'type' => 2,
+ ),
+ 90 =>
+ array (
+ 'time' => 1252018800,
+ 'type' => 0,
+ ),
+ 91 =>
+ array (
+ 'time' => 1269640860,
+ 'type' => 2,
+ ),
+ 92 =>
+ array (
+ 'time' => 1281474000,
+ 'type' => 0,
+ ),
+ 93 =>
+ array (
+ 'time' => 1301652060,
+ 'type' => 2,
+ ),
+ 94 =>
+ array (
+ 'time' => 1312146000,
+ 'type' => 0,
+ ),
+ 95 =>
+ array (
+ 'time' => 1314655200,
+ 'type' => 2,
+ ),
+ 96 =>
+ array (
+ 'time' => 1317340800,
+ 'type' => 0,
+ ),
+ ),
+ 'finalRule' =>
+ array (
+ 'type' => 'static',
+ 'name' => 'EET',
+ 'offset' => 7200,
+ 'startYear' => 2012,
+ ),
+ 'source' => 'asia',
+ 'version' => '8.69',
+ 'name' => 'Asia/Hebron',
+);
+
+?>
\ No newline at end of file

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ho_Chi_Minh.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ho_Chi_Minh.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ho_Chi_Minh.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Ho_Chi_Minh".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -68,7 +68,7 @@
'startYear' => 1932,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Ho_Chi_Minh',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hong_Kong.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hong_Kong.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hong_Kong.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Hong_Kong".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -397,7 +397,7 @@
'startYear' => 1980,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Hong_Kong',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hovd.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hovd.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Hovd.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Hovd".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -282,7 +282,7 @@
'startYear' => 2007,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Hovd',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Irkutsk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Irkutsk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Irkutsk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Irkutsk".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -244,6 +244,146 @@
),
37 =>
array (
+ 'time' => 859658400,
+ 'type' => 3,
+ ),
+ 38 =>
+ array (
+ 'time' => 877802400,
+ 'type' => 2,
+ ),
+ 39 =>
+ array (
+ 'time' => 891108000,
+ 'type' => 3,
+ ),
+ 40 =>
+ array (
+ 'time' => 909252000,
+ 'type' => 2,
+ ),
+ 41 =>
+ array (
+ 'time' => 922557600,
+ 'type' => 3,
+ ),
+ 42 =>
+ array (
+ 'time' => 941306400,
+ 'type' => 2,
+ ),
+ 43 =>
+ array (
+ 'time' => 954007200,
+ 'type' => 3,
+ ),
+ 44 =>
+ array (
+ 'time' => 972756000,
+ 'type' => 2,
+ ),
+ 45 =>
+ array (
+ 'time' => 985456800,
+ 'type' => 3,
+ ),
+ 46 =>
+ array (
+ 'time' => 1004205600,
+ 'type' => 2,
+ ),
+ 47 =>
+ array (
+ 'time' => 1017511200,
+ 'type' => 3,
+ ),
+ 48 =>
+ array (
+ 'time' => 1035655200,
+ 'type' => 2,
+ ),
+ 49 =>
+ array (
+ 'time' => 1048960800,
+ 'type' => 3,
+ ),
+ 50 =>
+ array (
+ 'time' => 1067104800,
+ 'type' => 2,
+ ),
+ 51 =>
+ array (
+ 'time' => 1080410400,
+ 'type' => 3,
+ ),
+ 52 =>
+ array (
+ 'time' => 1099159200,
+ 'type' => 2,
+ ),
+ 53 =>
+ array (
+ 'time' => 1111860000,
+ 'type' => 3,
+ ),
+ 54 =>
+ array (
+ 'time' => 1130608800,
+ 'type' => 2,
+ ),
+ 55 =>
+ array (
+ 'time' => 1143309600,
+ 'type' => 3,
+ ),
+ 56 =>
+ array (
+ 'time' => 1162058400,
+ 'type' => 2,
+ ),
+ 57 =>
+ array (
+ 'time' => 1174759200,
+ 'type' => 3,
+ ),
+ 58 =>
+ array (
+ 'time' => 1193508000,
+ 'type' => 2,
+ ),
+ 59 =>
+ array (
+ 'time' => 1206813600,
+ 'type' => 3,
+ ),
+ 60 =>
+ array (
+ 'time' => 1224957600,
+ 'type' => 2,
+ ),
+ 61 =>
+ array (
+ 'time' => 1238263200,
+ 'type' => 3,
+ ),
+ 62 =>
+ array (
+ 'time' => 1256407200,
+ 'type' => 2,
+ ),
+ 63 =>
+ array (
+ 'time' => 1269712800,
+ 'type' => 3,
+ ),
+ 64 =>
+ array (
+ 'time' => 1288461600,
+ 'type' => 2,
+ ),
+ 65 =>
+ array (
'time' => 1301162400,
'type' => 5,
),
@@ -256,7 +396,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Irkutsk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jakarta.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jakarta.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jakarta.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Jakarta".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -106,7 +106,7 @@
'startYear' => 1964,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Jakarta',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jayapura.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jayapura.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jayapura.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Jayapura".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1964,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Jayapura',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jerusalem.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jerusalem.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Jerusalem.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Jerusalem".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -774,7 +774,7 @@
'startYear' => 2038,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Jerusalem',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kabul.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kabul.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kabul.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Kabul".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1945,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Kabul',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kamchatka.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kamchatka.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kamchatka.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Kamchatka".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -225,16 +225,166 @@
'time' => 846338400,
'type' => 1,
),
+ 36 =>
+ array (
+ 'time' => 859644000,
+ 'type' => 2,
+ ),
+ 37 =>
+ array (
+ 'time' => 877788000,
+ 'type' => 1,
+ ),
+ 38 =>
+ array (
+ 'time' => 891093600,
+ 'type' => 2,
+ ),
+ 39 =>
+ array (
+ 'time' => 909237600,
+ 'type' => 1,
+ ),
+ 40 =>
+ array (
+ 'time' => 922543200,
+ 'type' => 2,
+ ),
+ 41 =>
+ array (
+ 'time' => 941292000,
+ 'type' => 1,
+ ),
+ 42 =>
+ array (
+ 'time' => 953992800,
+ 'type' => 2,
+ ),
+ 43 =>
+ array (
+ 'time' => 972741600,
+ 'type' => 1,
+ ),
+ 44 =>
+ array (
+ 'time' => 985442400,
+ 'type' => 2,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004191200,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017496800,
+ 'type' => 2,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035640800,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048946400,
+ 'type' => 2,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067090400,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080396000,
+ 'type' => 2,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099144800,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111845600,
+ 'type' => 2,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130594400,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143295200,
+ 'type' => 2,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162044000,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174744800,
+ 'type' => 2,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193493600,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206799200,
+ 'type' => 2,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224943200,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238248800,
+ 'type' => 2,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256392800,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269698400,
+ 'type' => 0,
+ ),
+ 63 =>
+ array (
+ 'time' => 1269702000,
+ 'type' => 3,
+ ),
+ 64 =>
+ array (
+ 'time' => 1288450800,
+ 'type' => 0,
+ ),
+ 65 =>
+ array (
+ 'time' => 1301151600,
+ 'type' => 1,
+ ),
),
'finalRule' =>
array (
'type' => 'static',
'name' => 'PETT',
'offset' => 43200,
- 'startYear' => 1996,
+ 'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Kamchatka',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Karachi.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Karachi.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Karachi.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Karachi".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -114,7 +114,7 @@
'startYear' => 2010,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Karachi',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kashgar.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kashgar.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kashgar.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Kashgar".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -134,7 +134,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Kashgar',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kathmandu.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kathmandu.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kathmandu.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Kathmandu".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1986,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Kathmandu',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kolkata.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kolkata.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kolkata.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Kolkata".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -79,7 +79,7 @@
'startYear' => 1946,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Kolkata',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Krasnoyarsk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Krasnoyarsk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Krasnoyarsk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Krasnoyarsk".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -233,6 +233,146 @@
),
36 =>
array (
+ 'time' => 859662000,
+ 'type' => 2,
+ ),
+ 37 =>
+ array (
+ 'time' => 877806000,
+ 'type' => 1,
+ ),
+ 38 =>
+ array (
+ 'time' => 891111600,
+ 'type' => 2,
+ ),
+ 39 =>
+ array (
+ 'time' => 909255600,
+ 'type' => 1,
+ ),
+ 40 =>
+ array (
+ 'time' => 922561200,
+ 'type' => 2,
+ ),
+ 41 =>
+ array (
+ 'time' => 941310000,
+ 'type' => 1,
+ ),
+ 42 =>
+ array (
+ 'time' => 954010800,
+ 'type' => 2,
+ ),
+ 43 =>
+ array (
+ 'time' => 972759600,
+ 'type' => 1,
+ ),
+ 44 =>
+ array (
+ 'time' => 985460400,
+ 'type' => 2,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004209200,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017514800,
+ 'type' => 2,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035658800,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048964400,
+ 'type' => 2,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067108400,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080414000,
+ 'type' => 2,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099162800,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111863600,
+ 'type' => 2,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130612400,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143313200,
+ 'type' => 2,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162062000,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174762800,
+ 'type' => 2,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193511600,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206817200,
+ 'type' => 2,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224961200,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238266800,
+ 'type' => 2,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256410800,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269716400,
+ 'type' => 2,
+ ),
+ 63 =>
+ array (
+ 'time' => 1288465200,
+ 'type' => 1,
+ ),
+ 64 =>
+ array (
'time' => 1301166000,
'type' => 4,
),
@@ -245,7 +385,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Krasnoyarsk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuala_Lumpur.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuala_Lumpur.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuala_Lumpur.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Kuala_Lumpur".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -112,7 +112,7 @@
'startYear' => 1982,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Kuala_Lumpur',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuching.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuching.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuching.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Kuching".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -155,7 +155,7 @@
'startYear' => 1982,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Kuching',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuwait.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuwait.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Kuwait.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Kuwait".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1950,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Kuwait',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Macau.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Macau.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Macau.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Macau".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -246,7 +246,7 @@
'startYear' => 1981,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Macau',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Magadan.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Magadan.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Magadan.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Magadan".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -233,6 +233,146 @@
),
36 =>
array (
+ 'time' => 859647600,
+ 'type' => 2,
+ ),
+ 37 =>
+ array (
+ 'time' => 877791600,
+ 'type' => 1,
+ ),
+ 38 =>
+ array (
+ 'time' => 891097200,
+ 'type' => 2,
+ ),
+ 39 =>
+ array (
+ 'time' => 909241200,
+ 'type' => 1,
+ ),
+ 40 =>
+ array (
+ 'time' => 922546800,
+ 'type' => 2,
+ ),
+ 41 =>
+ array (
+ 'time' => 941295600,
+ 'type' => 1,
+ ),
+ 42 =>
+ array (
+ 'time' => 953996400,
+ 'type' => 2,
+ ),
+ 43 =>
+ array (
+ 'time' => 972745200,
+ 'type' => 1,
+ ),
+ 44 =>
+ array (
+ 'time' => 985446000,
+ 'type' => 2,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004194800,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017500400,
+ 'type' => 2,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035644400,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048950000,
+ 'type' => 2,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067094000,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080399600,
+ 'type' => 2,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099148400,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111849200,
+ 'type' => 2,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130598000,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143298800,
+ 'type' => 2,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162047600,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174748400,
+ 'type' => 2,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193497200,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206802800,
+ 'type' => 2,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224946800,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238252400,
+ 'type' => 2,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256396400,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269702000,
+ 'type' => 2,
+ ),
+ 63 =>
+ array (
+ 'time' => 1288450800,
+ 'type' => 1,
+ ),
+ 64 =>
+ array (
'time' => 1301151600,
'type' => 4,
),
@@ -245,7 +385,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Magadan',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Makassar.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Makassar.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Makassar.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Makassar".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -68,7 +68,7 @@
'startYear' => 1946,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Makassar',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Manila.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Manila.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Manila.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Manila".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -103,7 +103,7 @@
'startYear' => 1979,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Manila',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Muscat.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Muscat.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Muscat.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Muscat".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1920,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Muscat',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Nicosia.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Nicosia.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Nicosia.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Nicosia".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -299,7 +299,7 @@
'startYear' => 1999,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Nicosia',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Novokuznetsk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Novokuznetsk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Novokuznetsk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Novokuznetsk".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -42,6 +42,24 @@
'dstOffset' => 3600,
'name' => 'KRAST',
),
+ 4 =>
+ array (
+ 'rawOffset' => 21600,
+ 'dstOffset' => 0,
+ 'name' => 'NOVT',
+ ),
+ 5 =>
+ array (
+ 'rawOffset' => 21600,
+ 'dstOffset' => 3600,
+ 'name' => 'NOVST',
+ ),
+ 6 =>
+ array (
+ 'rawOffset' => 25200,
+ 'dstOffset' => 0,
+ 'name' => 'NOVT',
+ ),
),
'rules' =>
array (
@@ -225,16 +243,166 @@
'time' => 846356400,
'type' => 1,
),
+ 36 =>
+ array (
+ 'time' => 859662000,
+ 'type' => 2,
+ ),
+ 37 =>
+ array (
+ 'time' => 877806000,
+ 'type' => 1,
+ ),
+ 38 =>
+ array (
+ 'time' => 891111600,
+ 'type' => 2,
+ ),
+ 39 =>
+ array (
+ 'time' => 909255600,
+ 'type' => 1,
+ ),
+ 40 =>
+ array (
+ 'time' => 922561200,
+ 'type' => 2,
+ ),
+ 41 =>
+ array (
+ 'time' => 941310000,
+ 'type' => 1,
+ ),
+ 42 =>
+ array (
+ 'time' => 954010800,
+ 'type' => 2,
+ ),
+ 43 =>
+ array (
+ 'time' => 972759600,
+ 'type' => 1,
+ ),
+ 44 =>
+ array (
+ 'time' => 985460400,
+ 'type' => 2,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004209200,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017514800,
+ 'type' => 2,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035658800,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048964400,
+ 'type' => 2,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067108400,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080414000,
+ 'type' => 2,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099162800,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111863600,
+ 'type' => 2,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130612400,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143313200,
+ 'type' => 2,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162062000,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174762800,
+ 'type' => 2,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193511600,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206817200,
+ 'type' => 2,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224961200,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238266800,
+ 'type' => 2,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256410800,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269716400,
+ 'type' => 4,
+ ),
+ 63 =>
+ array (
+ 'time' => 1269720000,
+ 'type' => 5,
+ ),
+ 64 =>
+ array (
+ 'time' => 1288468800,
+ 'type' => 4,
+ ),
+ 65 =>
+ array (
+ 'time' => 1301169600,
+ 'type' => 6,
+ ),
),
'finalRule' =>
array (
'type' => 'static',
'name' => 'NOVT',
'offset' => 25200,
- 'startYear' => 1996,
+ 'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Novokuznetsk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Novosibirsk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Novosibirsk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Novosibirsk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Novosibirsk".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -238,6 +238,146 @@
),
37 =>
array (
+ 'time' => 859665600,
+ 'type' => 3,
+ ),
+ 38 =>
+ array (
+ 'time' => 877809600,
+ 'type' => 0,
+ ),
+ 39 =>
+ array (
+ 'time' => 891115200,
+ 'type' => 3,
+ ),
+ 40 =>
+ array (
+ 'time' => 909259200,
+ 'type' => 0,
+ ),
+ 41 =>
+ array (
+ 'time' => 922564800,
+ 'type' => 3,
+ ),
+ 42 =>
+ array (
+ 'time' => 941313600,
+ 'type' => 0,
+ ),
+ 43 =>
+ array (
+ 'time' => 954014400,
+ 'type' => 3,
+ ),
+ 44 =>
+ array (
+ 'time' => 972763200,
+ 'type' => 0,
+ ),
+ 45 =>
+ array (
+ 'time' => 985464000,
+ 'type' => 3,
+ ),
+ 46 =>
+ array (
+ 'time' => 1004212800,
+ 'type' => 0,
+ ),
+ 47 =>
+ array (
+ 'time' => 1017518400,
+ 'type' => 3,
+ ),
+ 48 =>
+ array (
+ 'time' => 1035662400,
+ 'type' => 0,
+ ),
+ 49 =>
+ array (
+ 'time' => 1048968000,
+ 'type' => 3,
+ ),
+ 50 =>
+ array (
+ 'time' => 1067112000,
+ 'type' => 0,
+ ),
+ 51 =>
+ array (
+ 'time' => 1080417600,
+ 'type' => 3,
+ ),
+ 52 =>
+ array (
+ 'time' => 1099166400,
+ 'type' => 0,
+ ),
+ 53 =>
+ array (
+ 'time' => 1111867200,
+ 'type' => 3,
+ ),
+ 54 =>
+ array (
+ 'time' => 1130616000,
+ 'type' => 0,
+ ),
+ 55 =>
+ array (
+ 'time' => 1143316800,
+ 'type' => 3,
+ ),
+ 56 =>
+ array (
+ 'time' => 1162065600,
+ 'type' => 0,
+ ),
+ 57 =>
+ array (
+ 'time' => 1174766400,
+ 'type' => 3,
+ ),
+ 58 =>
+ array (
+ 'time' => 1193515200,
+ 'type' => 0,
+ ),
+ 59 =>
+ array (
+ 'time' => 1206820800,
+ 'type' => 3,
+ ),
+ 60 =>
+ array (
+ 'time' => 1224964800,
+ 'type' => 0,
+ ),
+ 61 =>
+ array (
+ 'time' => 1238270400,
+ 'type' => 3,
+ ),
+ 62 =>
+ array (
+ 'time' => 1256414400,
+ 'type' => 0,
+ ),
+ 63 =>
+ array (
+ 'time' => 1269720000,
+ 'type' => 3,
+ ),
+ 64 =>
+ array (
+ 'time' => 1288468800,
+ 'type' => 0,
+ ),
+ 65 =>
+ array (
'time' => 1301169600,
'type' => 1,
),
@@ -250,7 +390,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Novosibirsk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Omsk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Omsk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Omsk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Omsk".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -233,6 +233,146 @@
),
36 =>
array (
+ 'time' => 859665600,
+ 'type' => 2,
+ ),
+ 37 =>
+ array (
+ 'time' => 877809600,
+ 'type' => 1,
+ ),
+ 38 =>
+ array (
+ 'time' => 891115200,
+ 'type' => 2,
+ ),
+ 39 =>
+ array (
+ 'time' => 909259200,
+ 'type' => 1,
+ ),
+ 40 =>
+ array (
+ 'time' => 922564800,
+ 'type' => 2,
+ ),
+ 41 =>
+ array (
+ 'time' => 941313600,
+ 'type' => 1,
+ ),
+ 42 =>
+ array (
+ 'time' => 954014400,
+ 'type' => 2,
+ ),
+ 43 =>
+ array (
+ 'time' => 972763200,
+ 'type' => 1,
+ ),
+ 44 =>
+ array (
+ 'time' => 985464000,
+ 'type' => 2,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004212800,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017518400,
+ 'type' => 2,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035662400,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048968000,
+ 'type' => 2,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067112000,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080417600,
+ 'type' => 2,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099166400,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111867200,
+ 'type' => 2,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130616000,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143316800,
+ 'type' => 2,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162065600,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174766400,
+ 'type' => 2,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193515200,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206820800,
+ 'type' => 2,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224964800,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238270400,
+ 'type' => 2,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256414400,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269720000,
+ 'type' => 2,
+ ),
+ 63 =>
+ array (
+ 'time' => 1288468800,
+ 'type' => 1,
+ ),
+ 64 =>
+ array (
'time' => 1301169600,
'type' => 4,
),
@@ -245,7 +385,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Omsk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Oral.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Oral.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Oral.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Oral".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -263,7 +263,7 @@
'startYear' => 2006,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Oral',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Phnom_Penh.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Phnom_Penh.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Phnom_Penh.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Phnom_Penh".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -68,7 +68,7 @@
'startYear' => 1932,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Phnom_Penh',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Pontianak.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Pontianak.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Pontianak.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Pontianak".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -106,7 +106,7 @@
'startYear' => 1988,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Pontianak',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Pyongyang.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Pyongyang.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Pyongyang.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Pyongyang".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -78,7 +78,7 @@
'startYear' => 1962,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Pyongyang',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Qatar.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Qatar.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Qatar.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Qatar".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1973,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Qatar',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Qyzylorda.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Qyzylorda.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Qyzylorda.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Qyzylorda".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -257,7 +257,7 @@
'startYear' => 2006,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Qyzylorda',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Rangoon.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Rangoon.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Rangoon.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Rangoon".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -74,7 +74,7 @@
'startYear' => 1946,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Rangoon',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Riyadh.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Riyadh.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Riyadh.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Riyadh".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1950,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Riyadh',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Sakhalin.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Sakhalin.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Sakhalin.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Sakhalin".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -242,16 +242,166 @@
'time' => 846342000,
'type' => 2,
),
+ 37 =>
+ array (
+ 'time' => 857134800,
+ 'type' => 4,
+ ),
+ 38 =>
+ array (
+ 'time' => 859651200,
+ 'type' => 5,
+ ),
+ 39 =>
+ array (
+ 'time' => 877795200,
+ 'type' => 4,
+ ),
+ 40 =>
+ array (
+ 'time' => 891100800,
+ 'type' => 5,
+ ),
+ 41 =>
+ array (
+ 'time' => 909244800,
+ 'type' => 4,
+ ),
+ 42 =>
+ array (
+ 'time' => 922550400,
+ 'type' => 5,
+ ),
+ 43 =>
+ array (
+ 'time' => 941299200,
+ 'type' => 4,
+ ),
+ 44 =>
+ array (
+ 'time' => 954000000,
+ 'type' => 5,
+ ),
+ 45 =>
+ array (
+ 'time' => 972748800,
+ 'type' => 4,
+ ),
+ 46 =>
+ array (
+ 'time' => 985449600,
+ 'type' => 5,
+ ),
+ 47 =>
+ array (
+ 'time' => 1004198400,
+ 'type' => 4,
+ ),
+ 48 =>
+ array (
+ 'time' => 1017504000,
+ 'type' => 5,
+ ),
+ 49 =>
+ array (
+ 'time' => 1035648000,
+ 'type' => 4,
+ ),
+ 50 =>
+ array (
+ 'time' => 1048953600,
+ 'type' => 5,
+ ),
+ 51 =>
+ array (
+ 'time' => 1067097600,
+ 'type' => 4,
+ ),
+ 52 =>
+ array (
+ 'time' => 1080403200,
+ 'type' => 5,
+ ),
+ 53 =>
+ array (
+ 'time' => 1099152000,
+ 'type' => 4,
+ ),
+ 54 =>
+ array (
+ 'time' => 1111852800,
+ 'type' => 5,
+ ),
+ 55 =>
+ array (
+ 'time' => 1130601600,
+ 'type' => 4,
+ ),
+ 56 =>
+ array (
+ 'time' => 1143302400,
+ 'type' => 5,
+ ),
+ 57 =>
+ array (
+ 'time' => 1162051200,
+ 'type' => 4,
+ ),
+ 58 =>
+ array (
+ 'time' => 1174752000,
+ 'type' => 5,
+ ),
+ 59 =>
+ array (
+ 'time' => 1193500800,
+ 'type' => 4,
+ ),
+ 60 =>
+ array (
+ 'time' => 1206806400,
+ 'type' => 5,
+ ),
+ 61 =>
+ array (
+ 'time' => 1224950400,
+ 'type' => 4,
+ ),
+ 62 =>
+ array (
+ 'time' => 1238256000,
+ 'type' => 5,
+ ),
+ 63 =>
+ array (
+ 'time' => 1256400000,
+ 'type' => 4,
+ ),
+ 64 =>
+ array (
+ 'time' => 1269705600,
+ 'type' => 5,
+ ),
+ 65 =>
+ array (
+ 'time' => 1288454400,
+ 'type' => 4,
+ ),
+ 66 =>
+ array (
+ 'time' => 1301155200,
+ 'type' => 2,
+ ),
),
'finalRule' =>
array (
'type' => 'static',
'name' => 'SAKT',
'offset' => 39600,
- 'startYear' => 1996,
+ 'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Sakhalin',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Samarkand.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Samarkand.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Samarkand.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Samarkand".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -201,7 +201,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Samarkand',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Seoul.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Seoul.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Seoul.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Seoul".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -130,7 +130,7 @@
'startYear' => 1989,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Seoul',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Shanghai.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Shanghai.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Shanghai.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Shanghai".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -137,7 +137,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Shanghai',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Singapore.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Singapore.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Singapore.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Singapore".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -123,7 +123,7 @@
'startYear' => 1982,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Singapore',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Taipei.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Taipei.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Taipei.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Taipei".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -252,7 +252,7 @@
'startYear' => 1980,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Taipei',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tashkent.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tashkent.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tashkent.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Tashkent".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -201,7 +201,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Tashkent',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tbilisi.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tbilisi.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tbilisi.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Tbilisi".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -456,7 +456,7 @@
'startYear' => 2006,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Tbilisi',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tehran.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tehran.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tehran.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Tehran".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -570,7 +570,7 @@
'startYear' => 2038,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Tehran',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Thimphu.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Thimphu.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Thimphu.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Thimphu".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1988,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Thimphu',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tokyo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tokyo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Tokyo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Tokyo".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -108,7 +108,7 @@
'startYear' => 1952,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Tokyo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ulaanbaatar.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ulaanbaatar.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Ulaanbaatar.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Ulaanbaatar".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -282,7 +282,7 @@
'startYear' => 2007,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Ulaanbaatar',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Urumqi.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Urumqi.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Urumqi.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Urumqi".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -123,7 +123,7 @@
'startYear' => 1992,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Urumqi',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Vientiane.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Vientiane.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Vientiane.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Vientiane".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -68,7 +68,7 @@
'startYear' => 1932,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Vientiane',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Vladivostok.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Vladivostok.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Vladivostok.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Vladivostok".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -239,6 +239,146 @@
),
36 =>
array (
+ 'time' => 859651200,
+ 'type' => 2,
+ ),
+ 37 =>
+ array (
+ 'time' => 877795200,
+ 'type' => 1,
+ ),
+ 38 =>
+ array (
+ 'time' => 891100800,
+ 'type' => 2,
+ ),
+ 39 =>
+ array (
+ 'time' => 909244800,
+ 'type' => 1,
+ ),
+ 40 =>
+ array (
+ 'time' => 922550400,
+ 'type' => 2,
+ ),
+ 41 =>
+ array (
+ 'time' => 941299200,
+ 'type' => 1,
+ ),
+ 42 =>
+ array (
+ 'time' => 954000000,
+ 'type' => 2,
+ ),
+ 43 =>
+ array (
+ 'time' => 972748800,
+ 'type' => 1,
+ ),
+ 44 =>
+ array (
+ 'time' => 985449600,
+ 'type' => 2,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004198400,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017504000,
+ 'type' => 2,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035648000,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048953600,
+ 'type' => 2,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067097600,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080403200,
+ 'type' => 2,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099152000,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111852800,
+ 'type' => 2,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130601600,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143302400,
+ 'type' => 2,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162051200,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174752000,
+ 'type' => 2,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193500800,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206806400,
+ 'type' => 2,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224950400,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238256000,
+ 'type' => 2,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256400000,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269705600,
+ 'type' => 2,
+ ),
+ 63 =>
+ array (
+ 'time' => 1288454400,
+ 'type' => 1,
+ ),
+ 64 =>
+ array (
'time' => 1301155200,
'type' => 5,
),
@@ -251,7 +391,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Vladivostok',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yakutsk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yakutsk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yakutsk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Yakutsk".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -233,6 +233,146 @@
),
36 =>
array (
+ 'time' => 859654800,
+ 'type' => 2,
+ ),
+ 37 =>
+ array (
+ 'time' => 877798800,
+ 'type' => 1,
+ ),
+ 38 =>
+ array (
+ 'time' => 891104400,
+ 'type' => 2,
+ ),
+ 39 =>
+ array (
+ 'time' => 909248400,
+ 'type' => 1,
+ ),
+ 40 =>
+ array (
+ 'time' => 922554000,
+ 'type' => 2,
+ ),
+ 41 =>
+ array (
+ 'time' => 941302800,
+ 'type' => 1,
+ ),
+ 42 =>
+ array (
+ 'time' => 954003600,
+ 'type' => 2,
+ ),
+ 43 =>
+ array (
+ 'time' => 972752400,
+ 'type' => 1,
+ ),
+ 44 =>
+ array (
+ 'time' => 985453200,
+ 'type' => 2,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004202000,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017507600,
+ 'type' => 2,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035651600,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048957200,
+ 'type' => 2,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067101200,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080406800,
+ 'type' => 2,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099155600,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111856400,
+ 'type' => 2,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130605200,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143306000,
+ 'type' => 2,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162054800,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174755600,
+ 'type' => 2,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193504400,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206810000,
+ 'type' => 2,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224954000,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238259600,
+ 'type' => 2,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256403600,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269709200,
+ 'type' => 2,
+ ),
+ 63 =>
+ array (
+ 'time' => 1288458000,
+ 'type' => 1,
+ ),
+ 64 =>
+ array (
'time' => 1301158800,
'type' => 4,
),
@@ -245,7 +385,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Yakutsk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yekaterinburg.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yekaterinburg.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yekaterinburg.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Yekaterinburg".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -245,6 +245,146 @@
),
36 =>
array (
+ 'time' => 859669200,
+ 'type' => 5,
+ ),
+ 37 =>
+ array (
+ 'time' => 877813200,
+ 'type' => 4,
+ ),
+ 38 =>
+ array (
+ 'time' => 891118800,
+ 'type' => 5,
+ ),
+ 39 =>
+ array (
+ 'time' => 909262800,
+ 'type' => 4,
+ ),
+ 40 =>
+ array (
+ 'time' => 922568400,
+ 'type' => 5,
+ ),
+ 41 =>
+ array (
+ 'time' => 941317200,
+ 'type' => 4,
+ ),
+ 42 =>
+ array (
+ 'time' => 954018000,
+ 'type' => 5,
+ ),
+ 43 =>
+ array (
+ 'time' => 972766800,
+ 'type' => 4,
+ ),
+ 44 =>
+ array (
+ 'time' => 985467600,
+ 'type' => 5,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004216400,
+ 'type' => 4,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017522000,
+ 'type' => 5,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035666000,
+ 'type' => 4,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048971600,
+ 'type' => 5,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067115600,
+ 'type' => 4,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080421200,
+ 'type' => 5,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099170000,
+ 'type' => 4,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111870800,
+ 'type' => 5,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130619600,
+ 'type' => 4,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143320400,
+ 'type' => 5,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162069200,
+ 'type' => 4,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174770000,
+ 'type' => 5,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193518800,
+ 'type' => 4,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206824400,
+ 'type' => 5,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224968400,
+ 'type' => 4,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238274000,
+ 'type' => 5,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256418000,
+ 'type' => 4,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269723600,
+ 'type' => 5,
+ ),
+ 63 =>
+ array (
+ 'time' => 1288472400,
+ 'type' => 4,
+ ),
+ 64 =>
+ array (
'time' => 1301173200,
'type' => 6,
),
@@ -257,7 +397,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Asia/Yekaterinburg',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yerevan.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yerevan.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Asia_47_Yerevan.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Asia/Yerevan".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -260,7 +260,7 @@
'startYear' => 1996,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Asia/Yerevan',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Azores.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Azores.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Azores.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/Azores".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -959,7 +959,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Atlantic/Azores',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Bermuda.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Bermuda.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Bermuda.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/Bermuda".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -409,7 +409,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'Atlantic/Bermuda',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Canary.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Canary.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Canary.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/Canary".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -256,7 +256,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Atlantic/Canary',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Cape_Verde.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Cape_Verde.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Cape_Verde.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/Cape_Verde".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -68,7 +68,7 @@
'startYear' => 1976,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Atlantic/Cape_Verde',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Faroe.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Faroe.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Faroe.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/Faroe".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -229,7 +229,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Atlantic/Faroe',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Madeira.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Madeira.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Madeira.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/Madeira".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -788,7 +788,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Atlantic/Madeira',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Reykjavik.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Reykjavik.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Reykjavik.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/Reykjavik".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -379,7 +379,7 @@
'startYear' => 1969,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Atlantic/Reykjavik',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_South_Georgia.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_South_Georgia.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_South_Georgia.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/South_Georgia".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1891,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'Atlantic/South_Georgia',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_St_Helena.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_St_Helena.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_St_Helena.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/St_Helena".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1952,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Atlantic/St_Helena',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Stanley.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Stanley.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Atlantic_47_Stanley.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Atlantic/Stanley".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -392,7 +392,7 @@
'startYear' => 2011,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'Atlantic/Stanley',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Adelaide.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Adelaide.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Adelaide.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Adelaide".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -570,7 +570,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Adelaide',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Brisbane.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Brisbane.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Brisbane.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Brisbane".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -131,7 +131,7 @@
'startYear' => 1993,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Brisbane',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Broken_Hill.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Broken_Hill.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Broken_Hill.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Broken_Hill".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -511,7 +511,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Broken_Hill',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Currie.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Currie.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Currie.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Currie".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -484,7 +484,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Currie',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Darwin.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Darwin.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Darwin.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Darwin".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -97,7 +97,7 @@
'startYear' => 1945,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Darwin',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Eucla.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Eucla.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Eucla.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Eucla".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -141,7 +141,7 @@
'startYear' => 2010,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Eucla',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Hobart.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Hobart.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Hobart.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Hobart".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -524,7 +524,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Hobart',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Lindeman.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Lindeman.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Lindeman.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Lindeman".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -156,7 +156,7 @@
'startYear' => 1995,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Lindeman',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Lord_Howe.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Lord_Howe.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Lord_Howe.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Lord_Howe".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -356,7 +356,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Lord_Howe',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Melbourne.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Melbourne.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Melbourne.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Melbourne".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -484,7 +484,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Melbourne',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Perth.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Perth.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Perth.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Perth".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -141,7 +141,7 @@
'startYear' => 2010,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Perth',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Australia_47_Sydney.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Australia_47_Sydney.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Australia_47_Sydney.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Australia/Sydney".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -484,7 +484,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Australia/Sydney',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/CET.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/CET.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/CET.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "CET".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -334,7 +334,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'CET',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/CST6CDT.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/CST6CDT.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/CST6CDT.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "CST6CDT".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -527,7 +527,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'CST6CDT',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/EET.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/EET.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/EET.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "EET".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -264,7 +264,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'EET',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/EST.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/EST.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/EST.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "EST".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -30,7 +30,7 @@
'startYear' => -2147483647,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'EST',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/EST5EDT.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/EST5EDT.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/EST5EDT.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "EST5EDT".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -527,7 +527,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'EST5EDT',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Amsterdam.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Amsterdam.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Amsterdam.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Amsterdam".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -596,7 +596,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Amsterdam',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Andorra.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Andorra.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Andorra.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Andorra".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -195,7 +195,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Andorra',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Athens.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Athens.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Athens.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Athens".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -368,7 +368,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Athens',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Belgrade.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Belgrade.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Belgrade.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Belgrade".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -260,7 +260,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Belgrade',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Berlin.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Berlin.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Berlin.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Berlin".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -385,7 +385,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Berlin',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Brussels.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Brussels.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Brussels.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Brussels".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -608,7 +608,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Brussels',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Bucharest.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Bucharest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Bucharest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Bucharest".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -345,7 +345,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Bucharest',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Budapest.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Budapest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Budapest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Budapest".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -430,7 +430,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Budapest',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Chisinau.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Chisinau.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Chisinau.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Chisinau".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -401,7 +401,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Chisinau',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Copenhagen.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Copenhagen.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Copenhagen.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Copenhagen".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -330,7 +330,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Copenhagen',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Dublin.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Dublin.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Dublin.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Dublin".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -827,7 +827,7 @@
'startYear' => 1997,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Dublin',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Gibraltar.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Gibraltar.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Gibraltar.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Gibraltar".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -668,7 +668,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Gibraltar',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Helsinki.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Helsinki.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Helsinki.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Helsinki".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -250,7 +250,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Helsinki',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Istanbul.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Istanbul.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Istanbul.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Istanbul".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -638,7 +638,7 @@
'startYear' => 2007,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Istanbul',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Kaliningrad.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Kaliningrad.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Kaliningrad.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Kaliningrad".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -70,7 +70,7 @@
array (
'rawOffset' => 10800,
'dstOffset' => 0,
- 'name' => 'EET',
+ 'name' => 'FET',
),
),
'rules' =>
@@ -327,6 +327,146 @@
),
50 =>
array (
+ 'time' => 859680000,
+ 'type' => 7,
+ ),
+ 51 =>
+ array (
+ 'time' => 877824000,
+ 'type' => 6,
+ ),
+ 52 =>
+ array (
+ 'time' => 891129600,
+ 'type' => 7,
+ ),
+ 53 =>
+ array (
+ 'time' => 909273600,
+ 'type' => 6,
+ ),
+ 54 =>
+ array (
+ 'time' => 922579200,
+ 'type' => 7,
+ ),
+ 55 =>
+ array (
+ 'time' => 941328000,
+ 'type' => 6,
+ ),
+ 56 =>
+ array (
+ 'time' => 954028800,
+ 'type' => 7,
+ ),
+ 57 =>
+ array (
+ 'time' => 972777600,
+ 'type' => 6,
+ ),
+ 58 =>
+ array (
+ 'time' => 985478400,
+ 'type' => 7,
+ ),
+ 59 =>
+ array (
+ 'time' => 1004227200,
+ 'type' => 6,
+ ),
+ 60 =>
+ array (
+ 'time' => 1017532800,
+ 'type' => 7,
+ ),
+ 61 =>
+ array (
+ 'time' => 1035676800,
+ 'type' => 6,
+ ),
+ 62 =>
+ array (
+ 'time' => 1048982400,
+ 'type' => 7,
+ ),
+ 63 =>
+ array (
+ 'time' => 1067126400,
+ 'type' => 6,
+ ),
+ 64 =>
+ array (
+ 'time' => 1080432000,
+ 'type' => 7,
+ ),
+ 65 =>
+ array (
+ 'time' => 1099180800,
+ 'type' => 6,
+ ),
+ 66 =>
+ array (
+ 'time' => 1111881600,
+ 'type' => 7,
+ ),
+ 67 =>
+ array (
+ 'time' => 1130630400,
+ 'type' => 6,
+ ),
+ 68 =>
+ array (
+ 'time' => 1143331200,
+ 'type' => 7,
+ ),
+ 69 =>
+ array (
+ 'time' => 1162080000,
+ 'type' => 6,
+ ),
+ 70 =>
+ array (
+ 'time' => 1174780800,
+ 'type' => 7,
+ ),
+ 71 =>
+ array (
+ 'time' => 1193529600,
+ 'type' => 6,
+ ),
+ 72 =>
+ array (
+ 'time' => 1206835200,
+ 'type' => 7,
+ ),
+ 73 =>
+ array (
+ 'time' => 1224979200,
+ 'type' => 6,
+ ),
+ 74 =>
+ array (
+ 'time' => 1238284800,
+ 'type' => 7,
+ ),
+ 75 =>
+ array (
+ 'time' => 1256428800,
+ 'type' => 6,
+ ),
+ 76 =>
+ array (
+ 'time' => 1269734400,
+ 'type' => 7,
+ ),
+ 77 =>
+ array (
+ 'time' => 1288483200,
+ 'type' => 6,
+ ),
+ 78 =>
+ array (
'time' => 1301184000,
'type' => 8,
),
@@ -334,12 +474,12 @@
'finalRule' =>
array (
'type' => 'static',
- 'name' => 'EET',
+ 'name' => 'FET',
'offset' => 10800,
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Kaliningrad',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Kiev.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Kiev.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Kiev.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Kiev".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -295,7 +295,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Kiev',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Lisbon.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Lisbon.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Lisbon.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Lisbon".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -793,7 +793,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Lisbon',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_London.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_London.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_London.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/London".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -886,7 +886,7 @@
'startYear' => 1997,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/London',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Luxembourg.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Luxembourg.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Luxembourg.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Luxembourg".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -599,7 +599,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Luxembourg',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Madrid.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Madrid.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Madrid.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Madrid".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -497,7 +497,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Madrid',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Malta.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Malta.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Malta.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Malta".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -499,7 +499,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Malta',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Minsk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Minsk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Minsk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Minsk".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -66,6 +66,12 @@
'dstOffset' => 3600,
'name' => 'EEST',
),
+ 8 =>
+ array (
+ 'rawOffset' => 10800,
+ 'dstOffset' => 0,
+ 'name' => 'FET',
+ ),
),
'rules' =>
array (
@@ -269,33 +275,161 @@
'time' => 846374400,
'type' => 1,
),
- ),
- 'finalRule' =>
- array (
- 'type' => 'dynamic',
- 'offset' => 7200,
- 'name' => 'EE%sT',
- 'save' => 3600,
- 'start' =>
+ 40 =>
array (
- 'month' => 2,
- 'date' => -1,
- 'day_of_week' => 1,
- 'time' => 7200000,
+ 'time' => 859680000,
+ 'type' => 7,
+ ),
+ 41 =>
+ array (
+ 'time' => 877824000,
'type' => 1,
),
- 'end' =>
+ 42 =>
array (
- 'month' => 9,
- 'date' => -1,
- 'day_of_week' => 1,
- 'time' => 7200000,
+ 'time' => 891129600,
+ 'type' => 7,
+ ),
+ 43 =>
+ array (
+ 'time' => 909273600,
'type' => 1,
),
- 'startYear' => 1996,
+ 44 =>
+ array (
+ 'time' => 922579200,
+ 'type' => 7,
+ ),
+ 45 =>
+ array (
+ 'time' => 941328000,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 954028800,
+ 'type' => 7,
+ ),
+ 47 =>
+ array (
+ 'time' => 972777600,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 985478400,
+ 'type' => 7,
+ ),
+ 49 =>
+ array (
+ 'time' => 1004227200,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1017532800,
+ 'type' => 7,
+ ),
+ 51 =>
+ array (
+ 'time' => 1035676800,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1048982400,
+ 'type' => 7,
+ ),
+ 53 =>
+ array (
+ 'time' => 1067126400,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1080432000,
+ 'type' => 7,
+ ),
+ 55 =>
+ array (
+ 'time' => 1099180800,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1111881600,
+ 'type' => 7,
+ ),
+ 57 =>
+ array (
+ 'time' => 1130630400,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1143331200,
+ 'type' => 7,
+ ),
+ 59 =>
+ array (
+ 'time' => 1162080000,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1174780800,
+ 'type' => 7,
+ ),
+ 61 =>
+ array (
+ 'time' => 1193529600,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1206835200,
+ 'type' => 7,
+ ),
+ 63 =>
+ array (
+ 'time' => 1224979200,
+ 'type' => 1,
+ ),
+ 64 =>
+ array (
+ 'time' => 1238284800,
+ 'type' => 7,
+ ),
+ 65 =>
+ array (
+ 'time' => 1256428800,
+ 'type' => 1,
+ ),
+ 66 =>
+ array (
+ 'time' => 1269734400,
+ 'type' => 7,
+ ),
+ 67 =>
+ array (
+ 'time' => 1288483200,
+ 'type' => 1,
+ ),
+ 68 =>
+ array (
+ 'time' => 1301184000,
+ 'type' => 8,
+ ),
),
+ 'finalRule' =>
+ array (
+ 'type' => 'static',
+ 'name' => 'FET',
+ 'offset' => 10800,
+ 'startYear' => 2012,
+ ),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Minsk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Monaco.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Monaco.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Monaco.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Monaco".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -608,7 +608,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Monaco',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Moscow.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Moscow.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Moscow.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Moscow".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -345,6 +345,146 @@
),
50 =>
array (
+ 'time' => 859676400,
+ 'type' => 7,
+ ),
+ 51 =>
+ array (
+ 'time' => 877820400,
+ 'type' => 6,
+ ),
+ 52 =>
+ array (
+ 'time' => 891126000,
+ 'type' => 7,
+ ),
+ 53 =>
+ array (
+ 'time' => 909270000,
+ 'type' => 6,
+ ),
+ 54 =>
+ array (
+ 'time' => 922575600,
+ 'type' => 7,
+ ),
+ 55 =>
+ array (
+ 'time' => 941324400,
+ 'type' => 6,
+ ),
+ 56 =>
+ array (
+ 'time' => 954025200,
+ 'type' => 7,
+ ),
+ 57 =>
+ array (
+ 'time' => 972774000,
+ 'type' => 6,
+ ),
+ 58 =>
+ array (
+ 'time' => 985474800,
+ 'type' => 7,
+ ),
+ 59 =>
+ array (
+ 'time' => 1004223600,
+ 'type' => 6,
+ ),
+ 60 =>
+ array (
+ 'time' => 1017529200,
+ 'type' => 7,
+ ),
+ 61 =>
+ array (
+ 'time' => 1035673200,
+ 'type' => 6,
+ ),
+ 62 =>
+ array (
+ 'time' => 1048978800,
+ 'type' => 7,
+ ),
+ 63 =>
+ array (
+ 'time' => 1067122800,
+ 'type' => 6,
+ ),
+ 64 =>
+ array (
+ 'time' => 1080428400,
+ 'type' => 7,
+ ),
+ 65 =>
+ array (
+ 'time' => 1099177200,
+ 'type' => 6,
+ ),
+ 66 =>
+ array (
+ 'time' => 1111878000,
+ 'type' => 7,
+ ),
+ 67 =>
+ array (
+ 'time' => 1130626800,
+ 'type' => 6,
+ ),
+ 68 =>
+ array (
+ 'time' => 1143327600,
+ 'type' => 7,
+ ),
+ 69 =>
+ array (
+ 'time' => 1162076400,
+ 'type' => 6,
+ ),
+ 70 =>
+ array (
+ 'time' => 1174777200,
+ 'type' => 7,
+ ),
+ 71 =>
+ array (
+ 'time' => 1193526000,
+ 'type' => 6,
+ ),
+ 72 =>
+ array (
+ 'time' => 1206831600,
+ 'type' => 7,
+ ),
+ 73 =>
+ array (
+ 'time' => 1224975600,
+ 'type' => 6,
+ ),
+ 74 =>
+ array (
+ 'time' => 1238281200,
+ 'type' => 7,
+ ),
+ 75 =>
+ array (
+ 'time' => 1256425200,
+ 'type' => 6,
+ ),
+ 76 =>
+ array (
+ 'time' => 1269730800,
+ 'type' => 7,
+ ),
+ 77 =>
+ array (
+ 'time' => 1288479600,
+ 'type' => 6,
+ ),
+ 78 =>
+ array (
'time' => 1301180400,
'type' => 11,
),
@@ -357,7 +497,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Moscow',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Oslo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Oslo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Oslo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Oslo".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -365,7 +365,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Oslo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Paris.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Paris.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Paris.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Paris".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -615,7 +615,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Paris',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Prague.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Prague.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Prague.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Prague".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -370,7 +370,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Prague',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Riga.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Riga.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Riga.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Riga".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -342,7 +342,7 @@
'startYear' => 1997,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Riga',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Rome.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Rome.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Rome.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Rome".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -521,7 +521,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Rome',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Samara.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Samara.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Samara.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Samara".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -72,6 +72,12 @@
'dstOffset' => 3600,
'name' => 'SAMST',
),
+ 9 =>
+ array (
+ 'rawOffset' => 10800,
+ 'dstOffset' => 3600,
+ 'name' => 'SAMST',
+ ),
),
'rules' =>
array (
@@ -265,16 +271,166 @@
'time' => 846367200,
'type' => 1,
),
+ 38 =>
+ array (
+ 'time' => 859672800,
+ 'type' => 8,
+ ),
+ 39 =>
+ array (
+ 'time' => 877816800,
+ 'type' => 1,
+ ),
+ 40 =>
+ array (
+ 'time' => 891122400,
+ 'type' => 8,
+ ),
+ 41 =>
+ array (
+ 'time' => 909266400,
+ 'type' => 1,
+ ),
+ 42 =>
+ array (
+ 'time' => 922572000,
+ 'type' => 8,
+ ),
+ 43 =>
+ array (
+ 'time' => 941320800,
+ 'type' => 1,
+ ),
+ 44 =>
+ array (
+ 'time' => 954021600,
+ 'type' => 8,
+ ),
+ 45 =>
+ array (
+ 'time' => 972770400,
+ 'type' => 1,
+ ),
+ 46 =>
+ array (
+ 'time' => 985471200,
+ 'type' => 8,
+ ),
+ 47 =>
+ array (
+ 'time' => 1004220000,
+ 'type' => 1,
+ ),
+ 48 =>
+ array (
+ 'time' => 1017525600,
+ 'type' => 8,
+ ),
+ 49 =>
+ array (
+ 'time' => 1035669600,
+ 'type' => 1,
+ ),
+ 50 =>
+ array (
+ 'time' => 1048975200,
+ 'type' => 8,
+ ),
+ 51 =>
+ array (
+ 'time' => 1067119200,
+ 'type' => 1,
+ ),
+ 52 =>
+ array (
+ 'time' => 1080424800,
+ 'type' => 8,
+ ),
+ 53 =>
+ array (
+ 'time' => 1099173600,
+ 'type' => 1,
+ ),
+ 54 =>
+ array (
+ 'time' => 1111874400,
+ 'type' => 8,
+ ),
+ 55 =>
+ array (
+ 'time' => 1130623200,
+ 'type' => 1,
+ ),
+ 56 =>
+ array (
+ 'time' => 1143324000,
+ 'type' => 8,
+ ),
+ 57 =>
+ array (
+ 'time' => 1162072800,
+ 'type' => 1,
+ ),
+ 58 =>
+ array (
+ 'time' => 1174773600,
+ 'type' => 8,
+ ),
+ 59 =>
+ array (
+ 'time' => 1193522400,
+ 'type' => 1,
+ ),
+ 60 =>
+ array (
+ 'time' => 1206828000,
+ 'type' => 8,
+ ),
+ 61 =>
+ array (
+ 'time' => 1224972000,
+ 'type' => 1,
+ ),
+ 62 =>
+ array (
+ 'time' => 1238277600,
+ 'type' => 8,
+ ),
+ 63 =>
+ array (
+ 'time' => 1256421600,
+ 'type' => 1,
+ ),
+ 64 =>
+ array (
+ 'time' => 1269727200,
+ 'type' => 0,
+ ),
+ 65 =>
+ array (
+ 'time' => 1269730800,
+ 'type' => 9,
+ ),
+ 66 =>
+ array (
+ 'time' => 1288479600,
+ 'type' => 0,
+ ),
+ 67 =>
+ array (
+ 'time' => 1301180400,
+ 'type' => 1,
+ ),
),
'finalRule' =>
array (
'type' => 'static',
'name' => 'SAMT',
'offset' => 14400,
- 'startYear' => 1996,
+ 'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Samara',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Simferopol.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Simferopol.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Simferopol.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Simferopol".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -274,6 +274,11 @@
'time' => 828230400,
'type' => 6,
),
+ 41 =>
+ array (
+ 'time' => 846374400,
+ 'type' => 2,
+ ),
),
'finalRule' =>
array (
@@ -300,7 +305,7 @@
'startYear' => 1997,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Simferopol',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Sofia.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Sofia.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Sofia.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Sofia".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -318,7 +318,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Sofia',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Stockholm.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Stockholm.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Stockholm.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Stockholm".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -260,7 +260,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Stockholm',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Tallinn.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Tallinn.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Tallinn.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Tallinn".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -320,7 +320,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Tallinn',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Tirane.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Tirane.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Tirane.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Tirane".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -325,7 +325,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Tirane',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Uzhgorod.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Uzhgorod.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Uzhgorod.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Uzhgorod".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -298,7 +298,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Uzhgorod',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vaduz.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vaduz.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vaduz.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Vaduz".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -229,7 +229,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Vaduz',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vienna.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vienna.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vienna.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Vienna".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -359,7 +359,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Vienna',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vilnius.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vilnius.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Vilnius.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Vilnius".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -326,7 +326,7 @@
'startYear' => 1998,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Vilnius',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Volgograd.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Volgograd.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Volgograd.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Volgograd".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -251,6 +251,146 @@
),
36 =>
array (
+ 'time' => 859676400,
+ 'type' => 6,
+ ),
+ 37 =>
+ array (
+ 'time' => 877820400,
+ 'type' => 5,
+ ),
+ 38 =>
+ array (
+ 'time' => 891126000,
+ 'type' => 6,
+ ),
+ 39 =>
+ array (
+ 'time' => 909270000,
+ 'type' => 5,
+ ),
+ 40 =>
+ array (
+ 'time' => 922575600,
+ 'type' => 6,
+ ),
+ 41 =>
+ array (
+ 'time' => 941324400,
+ 'type' => 5,
+ ),
+ 42 =>
+ array (
+ 'time' => 954025200,
+ 'type' => 6,
+ ),
+ 43 =>
+ array (
+ 'time' => 972774000,
+ 'type' => 5,
+ ),
+ 44 =>
+ array (
+ 'time' => 985474800,
+ 'type' => 6,
+ ),
+ 45 =>
+ array (
+ 'time' => 1004223600,
+ 'type' => 5,
+ ),
+ 46 =>
+ array (
+ 'time' => 1017529200,
+ 'type' => 6,
+ ),
+ 47 =>
+ array (
+ 'time' => 1035673200,
+ 'type' => 5,
+ ),
+ 48 =>
+ array (
+ 'time' => 1048978800,
+ 'type' => 6,
+ ),
+ 49 =>
+ array (
+ 'time' => 1067122800,
+ 'type' => 5,
+ ),
+ 50 =>
+ array (
+ 'time' => 1080428400,
+ 'type' => 6,
+ ),
+ 51 =>
+ array (
+ 'time' => 1099177200,
+ 'type' => 5,
+ ),
+ 52 =>
+ array (
+ 'time' => 1111878000,
+ 'type' => 6,
+ ),
+ 53 =>
+ array (
+ 'time' => 1130626800,
+ 'type' => 5,
+ ),
+ 54 =>
+ array (
+ 'time' => 1143327600,
+ 'type' => 6,
+ ),
+ 55 =>
+ array (
+ 'time' => 1162076400,
+ 'type' => 5,
+ ),
+ 56 =>
+ array (
+ 'time' => 1174777200,
+ 'type' => 6,
+ ),
+ 57 =>
+ array (
+ 'time' => 1193526000,
+ 'type' => 5,
+ ),
+ 58 =>
+ array (
+ 'time' => 1206831600,
+ 'type' => 6,
+ ),
+ 59 =>
+ array (
+ 'time' => 1224975600,
+ 'type' => 5,
+ ),
+ 60 =>
+ array (
+ 'time' => 1238281200,
+ 'type' => 6,
+ ),
+ 61 =>
+ array (
+ 'time' => 1256425200,
+ 'type' => 5,
+ ),
+ 62 =>
+ array (
+ 'time' => 1269730800,
+ 'type' => 6,
+ ),
+ 63 =>
+ array (
+ 'time' => 1288479600,
+ 'type' => 5,
+ ),
+ 64 =>
+ array (
'time' => 1301180400,
'type' => 3,
),
@@ -263,7 +403,7 @@
'startYear' => 2012,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Volgograd',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Warsaw.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Warsaw.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Warsaw.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Warsaw".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -553,7 +553,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Warsaw',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Zaporozhye.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Zaporozhye.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Zaporozhye.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Zaporozhye".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -306,7 +306,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Zaporozhye',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Europe_47_Zurich.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Europe_47_Zurich.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Europe_47_Zurich.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Europe/Zurich".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -260,7 +260,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'Europe/Zurich',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/HST.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/HST.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/HST.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "HST".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -30,7 +30,7 @@
'startYear' => -2147483647,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'HST',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Antananarivo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Antananarivo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Antananarivo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Antananarivo".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1955,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Indian/Antananarivo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Chagos.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Chagos.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Chagos.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Chagos".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1996,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Indian/Chagos',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Christmas.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Christmas.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Christmas.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Christmas".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1896,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Indian/Christmas',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Cocos.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Cocos.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Cocos.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Cocos".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1900,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Indian/Cocos',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Comoro.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Comoro.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Comoro.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Comoro".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Indian/Comoro',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mahe.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mahe.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mahe.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Mahe".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1907,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Indian/Mahe',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Maldives.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Maldives.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Maldives.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Maldives".
- * Compiled from olson file "asia", version 8.65.
+ * Compiled from olson file "asia", version 8.69.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1960,
),
'source' => 'asia',
- 'version' => '8.65',
+ 'version' => '8.69',
'name' => 'Indian/Maldives',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mauritius.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mauritius.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mauritius.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Mauritius".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -66,7 +66,7 @@
'startYear' => 2010,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Indian/Mauritius',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mayotte.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mayotte.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Mayotte.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Mayotte".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Indian/Mayotte',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Indian_47_Reunion.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Indian_47_Reunion.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Indian_47_Reunion.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Indian/Reunion".
- * Compiled from olson file "africa", version 8.31.
+ * Compiled from olson file "africa", version 8.33.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1912,
),
'source' => 'africa',
- 'version' => '8.31',
+ 'version' => '8.33',
'name' => 'Indian/Reunion',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/MET.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/MET.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/MET.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "MET".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -334,7 +334,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'MET',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/MST.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/MST.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/MST.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "MST".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -30,7 +30,7 @@
'startYear' => -2147483647,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'MST',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/MST7MDT.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/MST7MDT.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/MST7MDT.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "MST7MDT".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -527,7 +527,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'MST7MDT',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/PST8PDT.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/PST8PDT.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/PST8PDT.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "PST8PDT".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -527,7 +527,7 @@
'startYear' => 2007,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'PST8PDT',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Apia.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Apia.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Apia.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Apia".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -42,6 +42,18 @@
'dstOffset' => 3600,
'name' => 'WSDT',
),
+ 4 =>
+ array (
+ 'rawOffset' => 46800,
+ 'dstOffset' => 3600,
+ 'name' => 'WSDT',
+ ),
+ 5 =>
+ array (
+ 'rawOffset' => 46800,
+ 'dstOffset' => 0,
+ 'name' => 'WST',
+ ),
),
'rules' =>
array (
@@ -70,16 +82,31 @@
'time' => 1301752800,
'type' => 2,
),
+ 5 =>
+ array (
+ 'time' => 1316872800,
+ 'type' => 3,
+ ),
+ 6 =>
+ array (
+ 'time' => 1325239200,
+ 'type' => 4,
+ ),
+ 7 =>
+ array (
+ 'time' => 1333202400,
+ 'type' => 5,
+ ),
),
'finalRule' =>
array (
'type' => 'static',
'name' => 'WST',
- 'offset' => -39600,
- 'startYear' => 2012,
+ 'offset' => 46800,
+ 'startYear' => 2013,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Apia',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Auckland.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Auckland.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Auckland.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Auckland".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -584,7 +584,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Auckland',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Chatham.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Chatham.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Chatham.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Chatham".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -415,7 +415,7 @@
'startYear' => 2008,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Chatham',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Chuuk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Chuuk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Chuuk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Chuuk".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1901,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Chuuk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Easter.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Easter.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Easter.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Easter".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -634,7 +634,7 @@
'startYear' => 2012,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'Pacific/Easter',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Efate.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Efate.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Efate.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Efate".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -146,7 +146,7 @@
'startYear' => 1994,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Efate',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Enderbury.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Enderbury.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Enderbury.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Enderbury".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1996,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Enderbury',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Fakaofo.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Fakaofo.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Fakaofo.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Fakaofo".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1902,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Fakaofo',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Fiji.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Fiji.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Fiji.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Fiji".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -78,15 +78,25 @@
'time' => 1299333600,
'type' => 0,
),
+ 9 =>
+ array (
+ 'time' => 1319292000,
+ 'type' => 1,
+ ),
+ 10 =>
+ array (
+ 'time' => 1327154400,
+ 'type' => 0,
+ ),
),
'finalRule' =>
array (
'type' => 'none',
'offset' => 43200,
- 'startYear' => 2012,
+ 'startYear' => 2013,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Fiji',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Funafuti.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Funafuti.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Funafuti.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Funafuti".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1901,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Funafuti',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Galapagos.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Galapagos.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Galapagos.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Galapagos".
- * Compiled from olson file "southamerica", version 8.50.
+ * Compiled from olson file "southamerica", version 8.52.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1987,
),
'source' => 'southamerica',
- 'version' => '8.50',
+ 'version' => '8.52',
'name' => 'Pacific/Galapagos',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Gambier.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Gambier.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Gambier.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Gambier".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Gambier',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Guadalcanal.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Guadalcanal.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Guadalcanal.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Guadalcanal".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Guadalcanal',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Guam.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Guam.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Guam.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Guam".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 2001,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Guam',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Honolulu.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Honolulu.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Honolulu.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Honolulu".
- * Compiled from olson file "northamerica", version 8.42.
+ * Compiled from olson file "northamerica", version 8.51.
*
* @package agavi
* @subpackage translation
@@ -78,7 +78,7 @@
'startYear' => 1948,
),
'source' => 'northamerica',
- 'version' => '8.42',
+ 'version' => '8.51',
'name' => 'Pacific/Honolulu',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Johnston.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Johnston.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Johnston.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Johnston".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -30,7 +30,7 @@
'startYear' => -2147483647,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Johnston',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kiritimati.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kiritimati.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kiritimati.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Kiritimati".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1996,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Kiritimati',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kosrae.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kosrae.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kosrae.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Kosrae".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -57,7 +57,7 @@
'startYear' => 1999,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Kosrae',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kwajalein.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kwajalein.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Kwajalein.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Kwajalein".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1994,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Kwajalein',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Majuro.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Majuro.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Majuro.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Majuro".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1970,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Majuro',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Marquesas.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Marquesas.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Marquesas.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Marquesas".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Marquesas',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Midway.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Midway.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Midway.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Midway".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -79,7 +79,7 @@
'startYear' => 1984,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Midway',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Nauru.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Nauru.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Nauru.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Nauru".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -68,7 +68,7 @@
'startYear' => 1980,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Nauru',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Niue.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Niue.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Niue.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Niue".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -63,7 +63,7 @@
'startYear' => 1979,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Niue',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Norfolk.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Norfolk.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Norfolk.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Norfolk".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1951,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Norfolk',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Noumea.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Noumea.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Noumea.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Noumea".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -76,7 +76,7 @@
'startYear' => 1998,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Noumea',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pago_Pago.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pago_Pago.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pago_Pago.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Pago_Pago".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -85,7 +85,7 @@
'startYear' => 1984,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Pago_Pago',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Palau.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Palau.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Palau.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Palau".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1901,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Palau',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pitcairn.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pitcairn.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pitcairn.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Pitcairn".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1999,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Pitcairn',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pohnpei.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pohnpei.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Pohnpei.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Pohnpei".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1901,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Pohnpei',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Port_Moresby.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Port_Moresby.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Port_Moresby.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Port_Moresby".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -52,7 +52,7 @@
'startYear' => 1895,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Port_Moresby',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Rarotonga.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Rarotonga.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Rarotonga.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Rarotonga".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -188,7 +188,7 @@
'startYear' => 1992,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Rarotonga',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Saipan.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Saipan.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Saipan.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Saipan".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -74,7 +74,7 @@
'startYear' => 2001,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Saipan',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tahiti.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tahiti.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tahiti.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Tahiti".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1913,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Tahiti',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tarawa.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tarawa.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tarawa.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Tarawa".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1901,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Tarawa',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tongatapu.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tongatapu.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Tongatapu.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Tongatapu".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -92,7 +92,7 @@
'startYear' => 2003,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Tongatapu',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Wake.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Wake.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Wake.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Wake".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1901,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Wake',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Wallis.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Wallis.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/Pacific_47_Wallis.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "Pacific/Wallis".
- * Compiled from olson file "australasia", version 8.23.
+ * Compiled from olson file "australasia", version 8.29.
*
* @package agavi
* @subpackage translation
@@ -41,7 +41,7 @@
'startYear' => 1901,
),
'source' => 'australasia',
- 'version' => '8.23',
+ 'version' => '8.29',
'name' => 'Pacific/Wallis',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/WET.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/WET.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/WET.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Data file for timezone "WET".
- * Compiled from olson file "europe", version 8.33.
+ * Compiled from olson file "europe", version 8.40.
*
* @package agavi
* @subpackage translation
@@ -264,7 +264,7 @@
'startYear' => 1996,
),
'source' => 'europe',
- 'version' => '8.33',
+ 'version' => '8.40',
'name' => 'WET',
);

Modified: branches/david-httpcaching/src/translation/data/timezones/zonelist.php
===================================================================
--- branches/david-httpcaching/src/translation/data/timezones/zonelist.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/translation/data/timezones/zonelist.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,7 +2,7 @@

/**
* Zone list file.
- * Generated on 2011-06-28T15:48:47+00:00.
+ * Generated on 2011-11-01T11:38:05+00:00.
*
* @package agavi
* @subpackage translation
@@ -1781,6 +1781,11 @@
'type' => 'zone',
'filename' => 'Asia_47_Gaza.php',
),
+ 'Asia/Hebron' =>
+ array (
+ 'type' => 'zone',
+ 'filename' => 'Asia_47_Hebron.php',
+ ),
'Asia/Manila' =>
array (
'type' => 'zone',
@@ -2161,6 +2166,11 @@
'type' => 'zone',
'filename' => 'Africa_47_Khartoum.php',
),
+ 'Africa/Juba' =>
+ array (
+ 'type' => 'zone',
+ 'filename' => 'Africa_47_Juba.php',
+ ),
'Africa/Mbabane' =>
array (
'type' => 'zone',

Copied: branches/david-httpcaching/src/util/AgaviAutoloader.class.php (from rev 4909, trunk/src/util/AgaviAutoloader.class.php)
===================================================================
--- branches/david-httpcaching/src/util/AgaviAutoloader.class.php (rev 0)
+++ branches/david-httpcaching/src/util/AgaviAutoloader.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -0,0 +1,118 @@
+<?php
+
+// +---------------------------------------------------------------------------+
+// | This file is part of the Agavi package. |
+// | Copyright (c) 2005-2011 the Agavi Project. |
+// | |
+// | For the full copyright and license information, please view the LICENSE |
+// | file that was distributed with this source code. You can also view the |
+// | LICENSE file online at http://www.agavi.org/LICENSE.txt |
+// | vi: set noexpandtab: |
+// | Local Variables: |
+// | indent-tabs-mode: t |
+// | End: |
+// +---------------------------------------------------------------------------+
+
+/**
+ * AgaviAutoloader is an autoloader implementation with support for namespaces,
+ * conforming to the PSR-0 standard. It also allows a plain mapping of class
+ * names to file paths.
+ *
+ * @package agavi
+ * @subpackage util
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @copyright Authors
+ * @copyright The Agavi Project
+ *
+ * @since 1.1.0
+ *
+ * @version $Id$
+ */
+class AgaviAutoloader
+{
+ /**
+ * @var array An assoc array of classes and file paths for autoloading.
+ */
+ public static $classes = array();
+
+ /**
+ * @var array An assoc array of namespaces and paths for autoloading.
+ */
+ public static $namespaces = array();
+
+ /**
+ * Add classes to the autoloader.
+ *
+ * @param array An array containing class names as keys and paths to the
+ * corresponding PHP files as values.
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @since 1.1.0
+ */
+ public static function addClasses(array $map)
+ {
+ self::$classes = array_merge(self::$classes, $map);
+ }
+
+ /**
+ * Add namespaces to the autoloader.
+ *
+ * @param array An array containing namespace prefixes as keys and paths
+ * to the corresponding directories containing files as
+ * values. Namespace prefixes must not contain a trailing
+ * backslash.
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @since 1.1.0
+ */
+ public static function addNamespaces(array $map)
+ {
+ self::$namespaces = array_merge(self::$namespaces, $map);
+ }
+
+ /**
+ * Handles autoloading of classes
+ *
+ * @param string A class name.
+ *
+ * @author David Zülke <d...@bitxtender.com>
+ * @since 0.11.0
+ */
+ public static function loadClass($class)
+ {
+ if(isset(self::$classes[$class])) {
+ // class exists, let's include it
+ require(self::$classes[$class]);
+ return true;
+ }
+
+ // nothing yet; let's see if it's in one of our namespace map paths
+ $lastBackslash = strrpos($class, '\\');
+ if($lastBackslash === false) {
+ return false;
+ }
+
+ // split input into namespace and class name
+ $namespace = substr($class, 0, $lastBackslash);
+ $class = substr($class, $lastBackslash+1);
+
+ foreach(self::$namespaces as $prefix => $path) {
+ if(strpos($namespace . '\\', $prefix . '\\') === 0) { // make sure we terminate the prefix, or else a prefix like "Doc" would load "Doctrine"
+ $file = str_replace('\\', DIRECTORY_SEPARATOR, substr($namespace, strlen($prefix))) // strip the prefix from the namespace and replace backslashes
+ . DIRECTORY_SEPARATOR
+ . str_replace('_', DIRECTORY_SEPARATOR, $class) // replace underscores in the class name in conformance with PSR-0
+ . '.php';
+ // unconditionally load the file, but only use an include() just in case the file isn't there
+ include($path . $file);
+ return true;
+ }
+ }
+
+ // If the class doesn't exist in autoload.xml there's not a lot we can do.
+ // Hopefully, another registered autoloader will be able to help :)
+ return false;
+ }
+}
+
+?>
\ No newline at end of file

Modified: branches/david-httpcaching/src/util/AgaviInflector.class.php
===================================================================
--- branches/david-httpcaching/src/util/AgaviInflector.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/util/AgaviInflector.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -31,28 +31,61 @@
final class AgaviInflector
{
/**
+ * @const string
+ */
+ const UNCOUNTABLE_REGEX = '/(
+ advice|
+ equipment|
+ information|
+ (?<![a-z0-9])rice| # after a boundary, or else "price" is treated the same; cannot use \b because that includes the underscore
+ sugar|
+ water|
+ electricity|
+ gas|
+ power|
+ money|
+ music|
+ love|
+ furniture|
+ (lug|bag)gage|
+ species|
+ series|
+ bison|
+ deer|
+ fish|
+ moose|
+ sheep|
+ jeans
+ )$/ix';
+
+ /**
* @var array singular => plural mapping
*/
protected static $singularMatches = array(
- '/move$/i' => 'moves',
- '/sex$/i' => 'sexes',
+ self::UNCOUNTABLE_REGEX => '$1',
'/child$/i' => 'children',
'/man$/i' => 'men',
'/person$/i' => 'people',
'/(quiz)$/i' => '$1zes',
- '/^(ox)$/i' => '$1en',
+ '/(?<![a-z0-9])(ox)(en)?$/i' => '$1en',
+ '/(?<![a-z0-9])tooth$/i' => 'teeth', // cannot use \b because that includes the underscore
+ '/(?<![a-z0-9])foot$/i' => 'feet', // cannot use \b because that includes the underscore
+ '/(?<![a-z0-9])goose$/i' => 'geese', // cannot use \b because that includes the underscore
+ '/(m|l)ice$/i' => '$1ice',
'/(m|l)ouse$/i' => '$1ice',
- '/(matr|vert|ind)ix|ex$/i' => '$1ices',
+ '/(matr|vert|ind)(?:ix|ex)$/i' => '$1ices',
'/(x|ch|ss|sh)$/i' => '$1es',
- '/([^aeiouy]|qu)ies$/i' => '$1y',
'/([^aeiouy]|qu)y$/i' => '$1ies',
'/(hive)$/i' => '$1s',
'/(?:([^f])fe|([lr])f)$/i' => '$1$2ves',
'/sis$/i' => 'ses',
+ '/criterion$/i' => 'criteria',
+ '/([ti])a$/i' => '$1a',
'/([ti])um$/i' => '$1a',
'/(buffal|tomat)o$/i' => '$1oes',
'/(bu)s$/i' => '$1ses',
'/(alias|status)$/i' => '$1es',
+ '/(octop|vir)i$/i' => '$1i',
'/(octop|vir)us$/i' => '$1i',
'/(ax|test)is$/i' => '$1es',
'/s$/i' => 's',
@@ -63,27 +96,27 @@
* @var array plural => singular mapping
*/
protected static $pluralMatches = array(
- '/cookies$/i' => 'cookie',
- '/moves$/i' => 'move',
- '/sexes$/i' => 'sex',
+ self::UNCOUNTABLE_REGEX => '\1',
'/children$/i' => 'child',
'/men$/i' => 'man',
'/people$/i' => 'person',
- '/databases$/i'=> 'database',
- '/caches$/i'=> 'cache',
+ '/(database)s$/i' => '\1',
'/(quiz)zes$/i' => '\1',
'/(matr)ices$/i' => '\1ix',
'/(vert|ind)ices$/i' => '\1ex',
- '/^(ox)en/i' => '\1',
+ '/(?<![a-z0-9])(ox)en/i' => '\1',
'/(alias|status)es$/i' => '\1',
- '/([octop|vir])i$/i' => '\1us',
+ '/(octop|vir)i$/i' => '\1us',
'/(cris|ax|test)es$/i' => '\1is',
- '/(shoe)s$/i' => '\1',
+ '/(cook|zomb|mov)ies$/i' => '\1ie',
+ '/(sho|cach|mov)es$/i' => '\1e',
'/(o)es$/i' => '\1',
'/(bus)es$/i' => '\1',
- '/([m|l])ice$/i' => '\1ouse',
+ '/teeth$/i' => 'tooth',
+ '/feet$/i' => 'foot',
+ '/geese$/i' => 'goose',
+ '/(m|l)ice$/i' => '\1ouse',
'/(x|ch|ss|sh)es$/i' => '\1',
- '/(m)ovies$/i' => '\1ovie',
'/(s)eries$/i' => '\1eries',
'/([^aeiouy]|qu)ies$/i' => '\1y',
'/([lr])ves$/i' => '\1f',
@@ -92,26 +125,13 @@
'/([^f])ves$/i' => '\1fe',
'/(^analy)ses$/i' => '\1sis',
'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+ '/criteria$/i' => 'criterion',
'/([ti])a$/i' => '\1um',
'/(n)ews$/i' => '\1ews',
'/s$/i' => '',
);

/**
- * @var array An array of uncountable nouns as keys
- */
- protected static $uncountables = array(
- 'equipment' => true,
- 'information' => true,
- 'rice' => true,
- 'money' => true,
- 'species' => true,
- 'series' => true,
- 'fish' => true,
- 'sheep' => true,
- );
-
- /**
* @var array An array remembering the results of singularize()
*/
protected static $singularizeCache = array();
@@ -138,10 +158,6 @@
return self::$singularizeCache[$word];
}

- if(isset(self::$uncountables[$word])) {
- return $word;
- }
-
$count = 0;
$singularizedWord = $word;
foreach(self::$pluralMatches as $regexp => $replacement) {
@@ -173,10 +189,6 @@
return self::$pluralizeCache[$word];
}

- if(isset(self::$uncountables[$word])) {
- return $word;
- }
-
$count = 0;
$pluralizedWord = $word;
foreach(self::$singularMatches as $regexp => $replacement) {

Modified: branches/david-httpcaching/src/validator/AgaviBooleanValidator.class.php
===================================================================
--- branches/david-httpcaching/src/validator/AgaviBooleanValidator.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/validator/AgaviBooleanValidator.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -48,35 +48,28 @@
protected function validate()
{
$value = & $this->getData($this->getArgument());
- $origValue = $value;
+ $castValue = $value;

- if(is_bool($value)) {
+ if(is_bool($castValue)) {
// noop
- } elseif(1 === $value || '1' === $value) {
- $value = true;
- } elseif(0 === $value || '0' === $value) {
- $value = false;
- } elseif(is_string($value)) {
- $value = AgaviToolkit::literalize($value);
+ } elseif(1 === $castValue || '1' === $castValue) {
+ $castValue = true;
+ } elseif(0 === $castValue || '0' === $castValue) {
+ $castValue = false;
+ } elseif(is_string($castValue)) {
+ $castValue = AgaviToolkit::literalize($castValue);
}

- if(is_bool($value)) {
-
- // we don't cast if the value is exported.
- // caution, AgaviValidator::export does the test for empty
- // strings, null and false values, so we can't use
- // hasParameter here
- if($this->getParameter('export')) {
- $value = $origValue;
+ if(is_bool($castValue)) {
+ if($this->hasParameter('export')) {
+ $this->export($castValue);
} else {
- $this->export($value);
+ $value = $castValue;
}

return true;
}

- $value = $origValue;
-
$this->throwError('type');

return false;

Modified: branches/david-httpcaching/src/validator/AgaviDependencyManager.class.php
===================================================================
--- branches/david-httpcaching/src/validator/AgaviDependencyManager.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/validator/AgaviDependencyManager.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -59,15 +59,15 @@
*/
public function checkDependencies(array $tokens, AgaviVirtualArrayPath $base)
{
- $root = new AgaviVirtualArrayPath('');
+ $currentParts = $base->getParts();
foreach($tokens as $token) {
- $path = $root;
- if(substr($token, 0, 1) == '[') {
- // the dependency we need to check is relative
- $path = $base;
+ if($currentParts && strpos($token, '%') !== false) {
+ // the depends attribute contains sprintf syntax
+ $token = vsprintf($token, $currentParts);
}
-
- if(!$path->getValueByChildPath($token, $this->depData)) {
+
+ $path = new AgaviVirtualArrayPath($token);
+ if(!$path->getValue($this->depData)) {
return false;
}
}
@@ -87,9 +87,43 @@
*/
public function addDependTokens(array $tokens, AgaviVirtualArrayPath $base)
{
+ $currentParts = $base->getParts();
foreach($tokens as $token) {
- $base->setValueByChildPath($token, $this->depData, true);
+ if($currentParts && strpos($token, '%') !== false) {
+ // the depends attribute contains sprintf syntax
+ $token = vsprintf($token, $currentParts);
+ }
+
+ $path = new AgaviVirtualArrayPath($token);
+ $path->setValue($this->depData, true);
}
}
+
+ /**
+ * Populate key references in an argument base string if necessary.
+ * Fills only empty bracket positions with an sprintf() offset placeholder.
+ * Example: foo[][bar][] as input will return foo[%2$s][bar][%4$s] as output.
+ * This is used in validate.xsl to convert pre-1.1 provides/depends behavior.
+ *
+ * @param string The argument base string.
+ *
+ * @return string The argument base string with empty brackets filled with
+ * correct sprintf() position specifiers.
+ *
+ * @author David Zülke <david....@bitextender.com>
+ * @since 1.1.0
+ */
+ public static function populateArgumentBaseKeyRefs($string)
+ {
+ $index = 1;
+ return preg_replace_callback(
+ '#\[([^\]]*)\]#',
+ function($matches) use(&$index) {
+ $index++; // always increment so static key parts are "skipped" properly
+ return $matches[1] !== '' ? $matches[0] : '[%'.$index.'$s]'; // leave parts other than "[]" intact, else inject numeric accessor
+ },
+ $string
+ );
+ }
}
?>
\ No newline at end of file

Modified: branches/david-httpcaching/src/validator/AgaviValidator.class.php
===================================================================
--- branches/david-httpcaching/src/validator/AgaviValidator.class.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/src/validator/AgaviValidator.class.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -521,25 +521,36 @@
* overwrite stuff you don't want to.
*
* @param mixed The value to be exported.
- * @param string An optional name which should be used for exporting
- * instead of the export parameter.
+ * @param mixed An optional parameter name which should be used for
+ * exporting instead of the "export" attribute value, or an
+ * AgaviValidationArgument object if the value should be
+ * exported to a different source.
+ * @param int The result status code to use for the exported value.
+ * Defaults to AgaviValidator::SUCCESS.
*
* @author Dominik del Bondio <d...@bitxtender.com>
+ * @author David Zülke <david....@bitextender.com>
* @since 0.11.0
*/
- protected function export($value, $name = null)
+ protected function export($value, $argument = null, $result = AgaviValidator::SUCCESS)
{
- if($name === null) {
- $name = $this->getParameter('export');
+ if($argument === null) {
+ $argument = $this->getParameter('export');
}

- if(!is_string($name) || $name === '') {
+ if(!($argument instanceof AgaviValidationArgument) && (!is_string($argument) || $argument === '')) {
return;
}

- $paramType = $this->getParameter('source');
+ if($argument instanceof AgaviValidationArgument) {
+ $source = $argument->getSource();
+ $name = $argument->getName();
+ } else {
+ $source = $this->getParameter('export_to_source', $this->getParameter('source'));
+ $name = $argument;
+ }

- $array =& $this->validationParameters->getAll($paramType);
+ $array =& $this->validationParameters->getAll($source);
$currentParts = $this->curBase->getParts();

if(count($currentParts) > 0 && strpos($name, '%') !== false) {
@@ -559,10 +570,10 @@
if(is_array($value)) {
// for arrays all child elements need to be marked as not processed
foreach(AgaviArrayPathDefinition::getFlatKeyNames($value) as $keyName) {
- $this->parentContainer->addArgumentResult(new AgaviValidationArgument($cp->pushRetNew($keyName)->__toString(), $this->getParameter('source')), AgaviValidator::SUCCESS, $this);
+ $this->parentContainer->addArgumentResult(new AgaviValidationArgument($cp->pushRetNew($keyName)->__toString(), $source), $result, $this);
}
}
- $this->parentContainer->addArgumentResult(new AgaviValidationArgument($cp->__toString(), $this->getParameter('source')), AgaviValidator::SUCCESS, $this);
+ $this->parentContainer->addArgumentResult(new AgaviValidationArgument($cp->__toString(), $source), $result, $this);
}
}

Modified: branches/david-httpcaching/test/config/suites.xml
===================================================================
--- branches/david-httpcaching/test/config/suites.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/test/config/suites.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -79,6 +79,7 @@
<testfile>unit/util/AgaviParameterHolderTest.php</testfile>
<testfile>unit/util/AgaviAttributeHolderTest.php</testfile>
<testfile>unit/util/AgaviArrayPathDefinitionTest.php</testfile>
+ <testfile>unit/util/AgaviInflectorTest.php</testfile>
</testfiles>
</suite>
<suite name="Validator">

Modified: branches/david-httpcaching/test/run-tests.php
===================================================================
--- branches/david-httpcaching/test/run-tests.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/test/run-tests.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -17,7 +17,7 @@

AgaviTesting::bootstrap($env);

-PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist(AgaviConfig::get('core.cache_dir'));
+AgaviTesting::getCodeCoverageFilter()->addDirectoryToBlacklist(AgaviConfig::get('core.cache_dir'));

AgaviTesting::dispatch($arguments);

Modified: branches/david-httpcaching/test/sandbox/app/config/autoload.xml
===================================================================
--- branches/david-httpcaching/test/sandbox/app/config/autoload.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/test/sandbox/app/config/autoload.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,38 +2,38 @@
<ae:configurations xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.1" xmlns="http://agavi.org/agavi/config/parts/autoload/1.1" parent="%core.system_config_dir%/autoload.xml">
<ae:configuration>

- <autoload name="SandboxBaseAction">%core.lib_dir%/action/SandboxBaseAction.class.php</autoload>
- <autoload name="SandboxBaseModel">%core.lib_dir%/model/SandboxBaseModel.class.php</autoload>
- <autoload name="SandboxBaseView">%core.lib_dir%/view/SandboxBaseView.class.php</autoload>
+ <autoload class="SandboxBaseAction">%core.lib_dir%/action/SandboxBaseAction.class.php</autoload>
+ <autoload class="SandboxBaseModel">%core.lib_dir%/model/SandboxBaseModel.class.php</autoload>
+ <autoload class="SandboxBaseView">%core.lib_dir%/view/SandboxBaseView.class.php</autoload>

- <autoload name="AgaviTestingRouting">%core.app_dir%/../../lib/routing/AgaviTestingRouting.class.php</autoload>
- <autoload name="AgaviTestingWebRouting">%core.app_dir%/../../lib/routing/AgaviTestingWebRouting.class.php</autoload>
+ <autoload class="AgaviTestingRouting">%core.app_dir%/../../lib/routing/AgaviTestingRouting.class.php</autoload>
+ <autoload class="AgaviTestingWebRouting">%core.app_dir%/../../lib/routing/AgaviTestingWebRouting.class.php</autoload>

- <autoload name="MatchingRoutingCallback">%core.app_dir%/../../lib/routing/MatchingRoutingCallback.class.php</autoload>
- <autoload name="NonMatchingRoutingCallback">%core.app_dir%/../../lib/routing/NonMatchingRoutingCallback.class.php</autoload>
- <autoload name="OnNotMatchedRoutingCallback">%core.app_dir%/../../lib/routing/OnNotMatchedRoutingCallback.class.php</autoload>
- <autoload name="GenWithParamRoutingCallback">%core.app_dir%/../../lib/routing/GenWithParamRoutingCallback.class.php</autoload>
- <autoload name="GenWithUnescapedParamRoutingCallback">%core.app_dir%/../../lib/routing/GenWithUnescapedParamRoutingCallback.class.php</autoload>
- <autoload name="GenUnsetRouteParamRoutingCallback">%core.app_dir%/../../lib/routing/GenUnsetRouteParamRoutingCallback.class.php</autoload>
- <autoload name="GenUnsetExtraParamRoutingCallback">%core.app_dir%/../../lib/routing/GenUnsetExtraParamRoutingCallback.class.php</autoload>
- <autoload name="GenNullifyRouteParamRoutingCallback">%core.app_dir%/../../lib/routing/GenNullifyRouteParamRoutingCallback.class.php</autoload>
- <autoload name="GenNullifyExtraParamRoutingCallback">%core.app_dir%/../../lib/routing/GenNullifyExtraParamRoutingCallback.class.php</autoload>
- <autoload name="GenSetPrefixAndPostfixRoutingCallback">%core.app_dir%/../../lib/routing/GenSetPrefixAndPostfixRoutingCallback.class.php</autoload>
- <autoload name="GenSetPrefixAndPostfixIntoRouteRoutingCallback">%core.app_dir%/../../lib/routing/GenSetPrefixAndPostfixIntoRouteRoutingCallback.class.php</autoload>
- <autoload name="GenDecodeParameterCallback">%core.app_dir%/../../lib/routing/GenDecodeParameterCallback.class.php</autoload>
- <autoload name="TestTicket713RoutingCallback">%core.app_dir%/../../lib/routing/TestTicket713RoutingCallback.class.php</autoload>
- <autoload name="TestTicket695RoutingCallback">%core.app_dir%/../../lib/routing/TestTicket695RoutingCallback.class.php</autoload>
- <autoload name="TestTicket698RoutingCallback">%core.app_dir%/../../lib/routing/TestTicket698RoutingCallback.class.php</autoload>
- <autoload name="Ticket1051RoutingCallback">%core.app_dir%/../../lib/routing/Ticket1051RoutingCallback.class.php</autoload>
- <autoload name="GenObjectRoutingCallback">%core.app_dir%/../../lib/routing/GenObjectRoutingCallback.class.php</autoload>
- <autoload name="GenObjectRoutingCallback">%core.app_dir%/../../lib/routing/GenObjectRoutingCallback.class.php</autoload>
- <autoload name="GenSetExtraParamRoutingCallback">%core.app_dir%/../../lib/routing/GenSetExtraParamRoutingCallback.class.php</autoload>
- <autoload name="GenSetExtraParamRoutingValueRoutingCallback">%core.app_dir%/../../lib/routing/GenSetExtraParamRoutingValueRoutingCallback.class.php</autoload>
- <autoload name="GenChangeExtraParamRoutingCallback">%core.app_dir%/../../lib/routing/GenChangeExtraParamRoutingCallback.class.php</autoload>
- <autoload name="GenChangeExtraParamRoutingValueRoutingCallback">%core.app_dir%/../../lib/routing/GenChangeExtraParamRoutingValueRoutingCallback.class.php</autoload>
+ <autoload class="MatchingRoutingCallback">%core.app_dir%/../../lib/routing/MatchingRoutingCallback.class.php</autoload>
+ <autoload class="NonMatchingRoutingCallback">%core.app_dir%/../../lib/routing/NonMatchingRoutingCallback.class.php</autoload>
+ <autoload class="OnNotMatchedRoutingCallback">%core.app_dir%/../../lib/routing/OnNotMatchedRoutingCallback.class.php</autoload>
+ <autoload class="GenWithParamRoutingCallback">%core.app_dir%/../../lib/routing/GenWithParamRoutingCallback.class.php</autoload>
+ <autoload class="GenWithUnescapedParamRoutingCallback">%core.app_dir%/../../lib/routing/GenWithUnescapedParamRoutingCallback.class.php</autoload>
+ <autoload class="GenUnsetRouteParamRoutingCallback">%core.app_dir%/../../lib/routing/GenUnsetRouteParamRoutingCallback.class.php</autoload>
+ <autoload class="GenUnsetExtraParamRoutingCallback">%core.app_dir%/../../lib/routing/GenUnsetExtraParamRoutingCallback.class.php</autoload>
+ <autoload class="GenNullifyRouteParamRoutingCallback">%core.app_dir%/../../lib/routing/GenNullifyRouteParamRoutingCallback.class.php</autoload>
+ <autoload class="GenNullifyExtraParamRoutingCallback">%core.app_dir%/../../lib/routing/GenNullifyExtraParamRoutingCallback.class.php</autoload>
+ <autoload class="GenSetPrefixAndPostfixRoutingCallback">%core.app_dir%/../../lib/routing/GenSetPrefixAndPostfixRoutingCallback.class.php</autoload>
+ <autoload class="GenSetPrefixAndPostfixIntoRouteRoutingCallback">%core.app_dir%/../../lib/routing/GenSetPrefixAndPostfixIntoRouteRoutingCallback.class.php</autoload>
+ <autoload class="GenDecodeParameterCallback">%core.app_dir%/../../lib/routing/GenDecodeParameterCallback.class.php</autoload>
+ <autoload class="TestTicket713RoutingCallback">%core.app_dir%/../../lib/routing/TestTicket713RoutingCallback.class.php</autoload>
+ <autoload class="TestTicket695RoutingCallback">%core.app_dir%/../../lib/routing/TestTicket695RoutingCallback.class.php</autoload>
+ <autoload class="TestTicket698RoutingCallback">%core.app_dir%/../../lib/routing/TestTicket698RoutingCallback.class.php</autoload>
+ <autoload class="Ticket1051RoutingCallback">%core.app_dir%/../../lib/routing/Ticket1051RoutingCallback.class.php</autoload>
+ <autoload class="GenObjectRoutingCallback">%core.app_dir%/../../lib/routing/GenObjectRoutingCallback.class.php</autoload>
+ <autoload class="GenObjectRoutingCallback">%core.app_dir%/../../lib/routing/GenObjectRoutingCallback.class.php</autoload>
+ <autoload class="GenSetExtraParamRoutingCallback">%core.app_dir%/../../lib/routing/GenSetExtraParamRoutingCallback.class.php</autoload>
+ <autoload class="GenSetExtraParamRoutingValueRoutingCallback">%core.app_dir%/../../lib/routing/GenSetExtraParamRoutingValueRoutingCallback.class.php</autoload>
+ <autoload class="GenChangeExtraParamRoutingCallback">%core.app_dir%/../../lib/routing/GenChangeExtraParamRoutingCallback.class.php</autoload>
+ <autoload class="GenChangeExtraParamRoutingValueRoutingCallback">%core.app_dir%/../../lib/routing/GenChangeExtraParamRoutingValueRoutingCallback.class.php</autoload>

- <autoload name="AgaviTestingConfigCache">%core.app_dir%/../../lib/config/AgaviTestingConfigCache.class.php</autoload>
+ <autoload class="AgaviTestingConfigCache">%core.app_dir%/../../lib/config/AgaviTestingConfigCache.class.php</autoload>

- <autoload name="AgaviWebRequestDataHolderTest">%core.app_dir%/../../tests/unit/request/AgaviWebRequestDataHolderTest.php</autoload>
+ <autoload class="AgaviWebRequestDataHolderTest">%core.app_dir%/../../tests/unit/request/AgaviWebRequestDataHolderTest.php</autoload>
</ae:configuration>
</ae:configurations>
\ No newline at end of file

Modified: branches/david-httpcaching/test/sandbox/app/modules/ControllerTests/config/autoload.xml
===================================================================
--- branches/david-httpcaching/test/sandbox/app/modules/ControllerTests/config/autoload.xml 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/test/sandbox/app/modules/ControllerTests/config/autoload.xml 2011-12-26 16:19:15 UTC (rev 4910)
@@ -2,9 +2,9 @@
<ae:configurations xmlns="http://agavi.org/agavi/config/parts/autoload/1.1" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.1">
<ae:configuration>

- <autoload name="SandboxControllerTestsBaseAction">%core.module_dir%/ControllerTests/lib/action/SandboxControllerTestsBaseAction.class.php</autoload>
- <autoload name="SandboxControllerTestsBaseModel">%core.module_dir%/ControllerTests/lib/model/SandboxControllerTestsBaseModel.class.php</autoload>
- <autoload name="SandboxControllerTestsBaseView">%core.module_dir%/ControllerTests/lib/view/SandboxControllerTestsBaseView.class.php</autoload>
+ <autoload class="SandboxControllerTestsBaseAction">%core.module_dir%/ControllerTests/lib/action/SandboxControllerTestsBaseAction.class.php</autoload>
+ <autoload class="SandboxControllerTestsBaseModel">%core.module_dir%/ControllerTests/lib/model/SandboxControllerTestsBaseModel.class.php</autoload>
+ <autoload class="SandboxControllerTestsBaseView">%core.module_dir%/ControllerTests/lib/view/SandboxControllerTestsBaseView.class.php</autoload>

</ae:configuration>
</ae:configurations>
\ No newline at end of file

Modified: branches/david-httpcaching/test/tests/unit/config/AgaviConfigTest.php
===================================================================
--- branches/david-httpcaching/test/tests/unit/config/AgaviConfigTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/test/tests/unit/config/AgaviConfigTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -1,27 +1,14 @@
<?php

-if(!class_exists('AgaviConfig')) {
- include(__DIR__ . '/../../../../src/config/AgaviConfig.class.php');
-}
+require_once(__DIR__ . '/../../../../src/config/AgaviConfig.class.php');

/**
* @agaviBootstrap off
+ * @preserveGlobalState disabled
+ * @runTestsInSeparateProcesses
*/
class AgaviConfigTest extends PHPUnit_Framework_TestCase
{
- /**
- * Constructs a test case with the given name.
- *
- * @param string $name
- * @param array $data
- * @param string $dataName
- */
- public function __construct($name = NULL, array $data = array(), $dataName = '')
- {
- parent::__construct($name, $data, $dataName);
- //$this->setRunTestInSeparateProcess(true);
- }
-
public function testInitiallyEmpty()
{
$this->assertEquals(array(), AgaviConfig::toArray());
@@ -44,7 +31,7 @@
return array(
'string key' => array('foobar', 'baz'),
'string key with period' => array('some.thing', 'ohai'),
- 'string key with null byte' => array("\0foo", 'nullbyte'),
+ // 'string key with null byte' => array("f\0oo", 'nullbyte'), // can't do this because PHPUnit doesn't do var_export(serialize(...)), so the null byte fucks everything up
'integer key' => array(123, 'qwe'),
'octal number key' => array(0123, 'yay'),
);

Modified: branches/david-httpcaching/test/tests/unit/date/AgaviTimezoneTest.php
===================================================================
--- branches/david-httpcaching/test/tests/unit/date/AgaviTimezoneTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/test/tests/unit/date/AgaviTimezoneTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -3,7 +3,7 @@
class AgaviTimeZoneTest extends AgaviUnitTestCase
{
/**
- * @expectedException Exception
+ * @expectedException InvalidArgumentException
*/
public function testTicket958()
{

Copied: branches/david-httpcaching/test/tests/unit/util/AgaviInflectorTest.php (from rev 4909, trunk/test/tests/unit/util/AgaviInflectorTest.php)
===================================================================
--- branches/david-httpcaching/test/tests/unit/util/AgaviInflectorTest.php (rev 0)
+++ branches/david-httpcaching/test/tests/unit/util/AgaviInflectorTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -0,0 +1,135 @@
+<?php
+
+class AgaviInflectorTest extends AgaviPhpUnitTestCase
+{
+ /**
+ * @dataProvider singularPluralTestData
+ */
+ public function testSingularize($singular, $plural)
+ {
+ $this->assertEquals($singular, AgaviInflector::singularize($plural));
+ }
+
+ /**
+ * @dataProvider singularPluralTestData
+ */
+ public function testPluralize($singular, $plural)
+ {
+ $this->assertEquals($plural, AgaviInflector::pluralize($singular));
+ }
+
+ public function singularPluralTestData()
+ {
+ return array(
+ array("person" , "people"),
+ array("man" , "men"),
+ array("woman" , "women"),
+ array("child" , "children"),
+ array("search" , "searches"),
+ array("switch" , "switches"),
+ array("fix" , "fixes"),
+ array("box" , "boxes"),
+ array("sex" , "sexes"),
+ array("process" , "processes"),
+ array("address" , "addresses"),
+ array("case" , "cases"),
+ array("stack" , "stacks"),
+ array("wish" , "wishes"),
+ array("fish" , "fish"),
+ array("jeans" , "jeans"),
+ array("money" , "money"),
+ array("my money" , "my money"),
+ array("price" , "prices"),
+ array("rice" , "rice"),
+ array("category" , "categories"),
+ array("query" , "queries"),
+ array("ability" , "abilities"),
+ array("agency" , "agencies"),
+ array("movie" , "movies"),
+ array("archive" , "archives"),
+ array("move" , "moves"),
+ array("index" , "indices"),
+ array("wife" , "wives"),
+ array("safe" , "saves"),
+ array("half" , "halves"),
+ array("move" , "moves"),
+ array("salesperson" , "salespeople"),
+ array("person" , "people"),
+ array("spokesman" , "spokesmen"),
+ array("man" , "men"),
+ array("woman" , "women"),
+ array("basis" , "bases"),
+ array("diagnosis" , "diagnoses"),
+ array("diagnosis_a" , "diagnosis_as"),
+ array("datum" , "data"),
+ array("medium" , "media"),
+ array("stadium" , "stadia"),
+ array("analysis" , "analyses"),
+ array("node_child" , "node_children"),
+ array("child" , "children"),
+ array("experience" , "experiences"),
+ array("day" , "days"),
+ array("comment" , "comments"),
+ array("foobar" , "foobars"),
+ array("newsletter" , "newsletters"),
+ array("old_news" , "old_news"),
+ array("news" , "news"),
+ array("series" , "series"),
+ array("species" , "species"),
+ array("quiz" , "quizzes"),
+ array("perspective" , "perspectives"),
+ array("ox" , "oxen"),
+ array("zebu ox" , "zebu oxen"),
+ array("photo" , "photos"),
+ array("buffalo" , "buffaloes"),
+ array("tomato" , "tomatoes"),
+ array("dwarf" , "dwarves"),
+ array("elf" , "elves"),
+ array("information" , "information"),
+ array("equipment" , "equipment"),
+ array("bus" , "buses"),
+ array("status" , "statuses"),
+ array("status_code" , "status_codes"),
+ array("mouse" , "mice"),
+ array("louse" , "lice"),
+ array("house" , "houses"),
+ array("octopus" , "octopi"),
+ array("virus" , "viri"),
+ array("alias" , "aliases"),
+ array("portfolio" , "portfolios"),
+ array("vertex" , "vertices"),
+ array("matrix" , "matrices"),
+ array("matrix_fu" , "matrix_fus"),
+ array("axis" , "axes"),
+ array("testis" , "testes"),
+ array("crisis" , "crises"),
+ array("white-rice" , "white-rice"),
+ array("white_rice" , "white_rice"),
+ array("rice" , "rice"),
+ array("shoe" , "shoes"),
+ array("horse" , "horses"),
+ array("prize" , "prizes"),
+ array("edge" , "edges"),
+ array("database" , "databases"),
+ array("cookie" , "cookies"),
+ array("cache" , "caches"),
+ array("|ice" , "|ices"),
+ array("|ouse" , "|ouses"),
+ array("foot" , "feet"),
+ array("cold foot" , "cold feet"),
+ array("cold_foot" , "cold_feet"),
+ array("bigfoot" , "bigfoots"),
+ array("tooth" , "teeth"),
+ array("dog_tooth" , "dog_teeth"),
+ array("sabertooth" , "sabertooths"),
+ array("goose" , "geese"),
+ array("mongoose" , "mongooses"),
+ array("criterion" , "criteria"),
+ array("cherry" , "cherries"),
+ array("lady" , "ladies"),
+ array("penny" , "pennies"),
+ );
+ }
+}
+
+?>
\ No newline at end of file

Modified: branches/david-httpcaching/test/tests/unit/util/AgaviToolkitTest.php
===================================================================
--- branches/david-httpcaching/test/tests/unit/util/AgaviToolkitTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/test/tests/unit/util/AgaviToolkitTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -30,15 +30,8 @@

public function testMkdir()
{
- $this->assertTrue(AgaviToolkit::mkdir('path'));
- rmdir('path');
- $this->assertTrue(AgaviToolkit::mkdir('/newpath'));
- rmdir('/newpath');
- $this->assertTrue(AgaviToolkit::mkdir('anotherpath'));
- rmdir('anotherpath');
- $this->assertFalse(AgaviToolkit::mkdir('contextpath', 0777, false, "path"));
- $this->assertFalse(AgaviToolkit::mkdir('ehh', 0777, false, "lala"));
- $this->assertFalse(AgaviToolkit::mkdir('az', 0666, true, "ti"));
+ $this->assertTrue(AgaviToolkit::mkdir('_testing_path'));
+ rmdir('_testing_path');
}

public function testStringBase()

Modified: branches/david-httpcaching/test/tests/unit/validator/AgaviBooleanValidatorTest.php
===================================================================
--- branches/david-httpcaching/test/tests/unit/validator/AgaviBooleanValidatorTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/test/tests/unit/validator/AgaviBooleanValidatorTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -69,16 +69,35 @@
}

public function testDontCastOnExport() {
- $expectedResult = false;
- $value = "false";
+ $testValues = array(
+ array('original' => 'false', 'casted' => false),
+ array('original' => 'true', 'casted' => true),
+ );

- $validator = $this->vm->createValidator('AgaviBooleanValidator', array('bool'), array('invalid argument'), array('export' => 'exported'));
- $rd = new AgaviRequestDataHolder(array(AgaviRequestDataHolder::SOURCE_PARAMETERS => array('bool' => $value)));
- $result = $validator->execute($rd);
- $this->assertEquals(AgaviValidator::SUCCESS, $result, 'Failed asserting that the validation succeeded.');
- $this->assertEquals($expectedResult, $rd->getParameter('exported'), 'Failed asserting that the exported value is the expected value');
- $this->assertEquals($value, $rd->getParameter('bool'), 'Failed asserting that the validated value is the original value');
+ foreach($testValues as $value) {
+ $validator = $this->vm->createValidator('AgaviBooleanValidator', array('bool'), array('invalid argument'), array('export' => 'exported'));
+ $rd = new AgaviRequestDataHolder(array(AgaviRequestDataHolder::SOURCE_PARAMETERS => array('bool' => $value['original'])));
+ $result = $validator->execute($rd);
+ $this->assertEquals(AgaviValidator::SUCCESS, $result, 'Failed asserting that the validation succeeded.');
+ $this->assertSame($value['casted'], $rd->getParameter('exported'), 'Failed asserting that the exported value is casted');
+ $this->assertSame($value['original'], $rd->getParameter('bool'), 'Failed asserting that the validated value is untouched');
+ }
}
+
+ public function testCastOnMissingExport() {
+ $testValues = array(
+ array('original' => 'false', 'casted' => false),
+ array('original' => 'true', 'casted' => true),
+ );
+
+ foreach($testValues as $value) {
+ $validator = $this->vm->createValidator('AgaviBooleanValidator', array('bool'), array('invalid argument'));
+ $rd = new AgaviRequestDataHolder(array(AgaviRequestDataHolder::SOURCE_PARAMETERS => array('bool' => $value['original'])));
+ $result = $validator->execute($rd);
+ $this->assertEquals(AgaviValidator::SUCCESS, $result, 'Failed asserting that the validation succeeded.');
+ $this->assertSame($value['casted'], $rd->getParameter('bool'), 'Failed asserting that the validated value is casted');
+ }
+ }
}

?>
\ No newline at end of file

Modified: branches/david-httpcaching/tests2/AllTests/RoutingTests.php
===================================================================
--- branches/david-httpcaching/tests2/AllTests/RoutingTests.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/AllTests/RoutingTests.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -10,25 +10,8 @@
$suite = new PHPUnit_Framework_TestSuite('routing');

$suite->addTestSuite('RoutingTest');
+ $suite->addTestSuite('WebRoutingTest');

- $webSuite = new PHPUnit_Framework_TestSuite('WebRouting');
- $d = dir(__DIR__ . '/../routing/cases/');
- while(false !== ($entry = $d->read())) {
- if(preg_match('#.*\\.case\\.php#i', $entry))
- {
- $cases = include($d->path . $entry);
- foreach($cases as $case) {
- $tc = new WebRoutingTest();
- $tc->setName(str_replace('.', '_', $entry));
- $tc->setExport($case);
- //$suite->addTestSuite(new ReflectionClass($tc));
- $suite->addTest($tc);
- }
- }
- }
- $d->close();
-
- //$suite->addTest($webSuite);
return $suite;
}
}

Modified: branches/david-httpcaching/tests2/AllTests.php
===================================================================
--- branches/david-httpcaching/tests2/AllTests.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/AllTests.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -52,10 +52,10 @@

require_once($testDir . '/ControllerTests.php');
$suite->addTest(ControllerTests::suite());
-
+
require_once($testDir . '/CoreTests.php');
$suite->addTest(CoreTests::suite());
-
+
require_once($testDir . '/DatabaseTests.php');
$suite->addTest(DatabaseTests::suite());

@@ -98,6 +98,6 @@


if(PHPUnit_MAIN_METHOD == 'AllTests::main') {
- AllTests::main();
+ // AllTests::main();
}
?>

Modified: branches/david-httpcaching/tests2/action/ActionStackTest.php
===================================================================
--- branches/david-httpcaching/tests2/action/ActionStackTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/action/ActionStackTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -32,7 +32,7 @@
$a = new ASSampleAction();
$this->_as->addEntry('Sample1', 'Index4', $a, $this->_pars);
$ase = $this->_as->getEntry(3);
- $this->assertType('AgaviActionStackEntry', $ase);
+ $this->assertInstanceOf('AgaviActionStackEntry', $ase);
$this->assertEquals('Sample1', $ase->getModuleName());
$this->assertEquals('Index4', $ase->getActionName());
$this->assertEquals($this->_pars, $ase->getParameters());
@@ -43,7 +43,7 @@
public function testgetEntry()
{
$ase = $this->_as->getEntry(0);
- $this->assertType('AgaviActionStackEntry', $ase);
+ $this->assertInstanceOf('AgaviActionStackEntry', $ase);
$a1 = $ase->getActionInstance();
$a2 = $this->_as->getEntry(1)->getActionInstance();
$a3 = $this->_as->getEntry(2)->getActionInstance();
@@ -59,7 +59,7 @@
public function testgetFirstEntry()
{
$ase = $this->_as->getFirstEntry();
- $this->assertType('AgaviActionStackEntry', $ase);
+ $this->assertInstanceOf('AgaviActionStackEntry', $ase);
$a = $ase->getActionInstance();
$this->assertReference($this->_a1, $a);

@@ -71,7 +71,7 @@
public function testgetLastEntry()
{
$ase = $this->_as->getLastEntry();
- $this->assertType('AgaviActionStackEntry', $ase);
+ $this->assertInstanceOf('AgaviActionStackEntry', $ase);
$a = $ase->getActionInstance();
$this->assertReference($this->_a3, $a);

Modified: branches/david-httpcaching/tests2/config/DatabaseConfigHandlerTest.php
===================================================================
--- branches/david-httpcaching/tests2/config/DatabaseConfigHandlerTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/config/DatabaseConfigHandlerTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -55,7 +55,7 @@

$this->includeCode($c = $DBCH->execute($document));

- $this->assertType('DCHTestDatabase', $this->databases['test1']);
+ $this->assertInstanceOf('DCHTestDatabase', $this->databases['test1']);
$params_ex = array(
'host' => 'localhost1',
'user' => 'username1',

Modified: branches/david-httpcaching/tests2/config/FactoryConfigHandlerTest.php
===================================================================
--- branches/david-httpcaching/tests2/config/FactoryConfigHandlerTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/config/FactoryConfigHandlerTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -171,36 +171,36 @@
$this->factories['response']
);

- $this->assertType('FCHTestDBManager', $this->databaseManager);
+ $this->assertInstanceOf('FCHTestDBManager', $this->databaseManager);
$this->assertReference($this, $this->databaseManager->context);
$this->assertSame($params_ex, $this->databaseManager->params);

- $this->assertType('FCHTestRequest', $this->request);
+ $this->assertInstanceOf('FCHTestRequest', $this->request);
$this->assertReference($this, $this->request->context);
$this->assertSame($params_ex, $this->request->params);

- $this->assertType('FCHTestStorage', $this->storage);
+ $this->assertInstanceOf('FCHTestStorage', $this->storage);
$this->assertReference($this, $this->storage->context);
$this->assertSame($params_ex, $this->storage->params);
$this->assertTrue($this->storage->suCalled);

- $this->assertType('FCHTestValidationManager', $this->validationManager);
+ $this->assertInstanceOf('FCHTestValidationManager', $this->validationManager);
$this->assertReference($this, $this->validationManager->context);
$this->assertSame($params_ex, $this->validationManager->params);

- $this->assertType('FCHTestUser', $this->user);
+ $this->assertInstanceOf('FCHTestUser', $this->user);
$this->assertReference($this, $this->user->context);
$this->assertSame($params_ex, $this->user->params);

- $this->assertType('FCHTestLoggerManager', $this->loggerManager);
+ $this->assertInstanceOf('FCHTestLoggerManager', $this->loggerManager);
$this->assertReference($this, $this->loggerManager->context);
$this->assertSame($params_ex, $this->loggerManager->params);

- $this->assertType('FCHTestController', $this->controller);
+ $this->assertInstanceOf('FCHTestController', $this->controller);
$this->assertReference($this, $this->controller->context);
$this->assertSame($params_ex, $this->controller->params);

- $this->assertType('FCHTestRouting', $this->routing);
+ $this->assertInstanceOf('FCHTestRouting', $this->routing);
$this->assertReference($this, $this->routing->context);
$this->assertSame($params_ex, $this->routing->params);
}

Modified: branches/david-httpcaching/tests2/config/FilterConfigHandlerTest.php
===================================================================
--- branches/david-httpcaching/tests2/config/FilterConfigHandlerTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/config/FilterConfigHandlerTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -72,11 +72,11 @@

$this->assertSame(2, count($filters));

- $this->assertType('FCHTestFilter1', $filters[0]);
+ $this->assertInstanceOf('FCHTestFilter1', $filters[0]);
$this->assertSame(array('comment' => true), $filters[0]->params);
$this->assertReference($ctx, $filters[0]->context);

- $this->assertType('FCHTestFilter2', $filters[1]);
+ $this->assertInstanceOf('FCHTestFilter2', $filters[1]);
$this->assertSame(array(), $filters[1]->params);
$this->assertReference($ctx, $filters[1]->context);
}

Modified: branches/david-httpcaching/tests2/config/LoggingConfigHandlerTest.php
===================================================================
--- branches/david-httpcaching/tests2/config/LoggingConfigHandlerTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/config/LoggingConfigHandlerTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -179,28 +179,28 @@
$test2 = $this->context->getLoggerManager()->getLogger('test2');
$test3 = $this->context->getLoggerManager()->getLogger('test3');

- $this->assertType('TestLogger1', $test1);
+ $this->assertInstanceOf('TestLogger1', $test1);
$this->assertSame(TestLogger::INFO, $test1->level);
- $this->assertType('TestAppender1', $test1->appenders['appender1']);
- $this->assertType('TestAppender2', $test1->appenders['appender2']);
+ $this->assertInstanceOf('TestAppender1', $test1->appenders['appender1']);
+ $this->assertInstanceOf('TestAppender2', $test1->appenders['appender2']);
$this->assertReference($test1->appenders['appender1'], $test2->appenders['appender1']);
$this->assertReference($test1->appenders['appender2'], $test2->appenders['appender2']);


- $this->assertType('TestLogger2', $test2);
+ $this->assertInstanceOf('TestLogger2', $test2);
$this->assertSame(TestLogger::ERROR, $test2->level);
- $this->assertType('TestAppender1', $test2->appenders['appender1']);
- $this->assertType('TestAppender2', $test2->appenders['appender2']);
- $this->assertType('TestAppender3', $test2->appenders['appender3']);
+ $this->assertInstanceOf('TestAppender1', $test2->appenders['appender1']);
+ $this->assertInstanceOf('TestAppender2', $test2->appenders['appender2']);
+ $this->assertInstanceOf('TestAppender3', $test2->appenders['appender3']);

- $this->assertType('TestLogger3', $test3);
+ $this->assertInstanceOf('TestLogger3', $test3);
$this->assertSame(TestLogger::INFO | TestLogger::ERROR, $test3->level);

$a1 = $test2->appenders['appender1'];
$a2 = $test2->appenders['appender2'];
$a3 = $test2->appenders['appender3'];

- $this->assertType('TestLayout1', $a1->layout);
+ $this->assertInstanceOf('TestLayout1', $a1->layout);
$this->assertSame(array(
'param1' => 'value1',
'param2' => 'value2',
@@ -209,11 +209,11 @@
);


- $this->assertType('TestLayout1', $a2->layout);
+ $this->assertInstanceOf('TestLayout1', $a2->layout);
$this->assertEquals(array(), $a2->params);


- $this->assertType('TestLayout2', $a3->layout);
+ $this->assertInstanceOf('TestLayout2', $a3->layout);
$this->assertSame(array(
'file' => AgaviConfig::get('core.app_dir') . '/log/myapp.log',
),

Modified: branches/david-httpcaching/tests2/controller/ControllerTest.php
===================================================================
--- branches/david-httpcaching/tests2/controller/ControllerTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/controller/ControllerTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -53,8 +53,8 @@
// TODO: check all other existing naming schemes for actions

$action = $this->_controller->createActionInstance('Test', 'Test');
- $this->assertType('Test_TestAction', $action);
- $this->assertType('AgaviAction', $action);
+ $this->assertInstanceOf('Test_TestAction', $action);
+ $this->assertInstanceOf('AgaviAction', $action);

// TODO: this needs checking for errors
// $this->_controller->createActionInstance('Test', 'NonExistant');
@@ -64,22 +64,22 @@
{
$ctx1 = AgaviContext::getInstance('test');
$ctx2 = AgaviContext::getInstance('test')->getController()->getContext();
- $this->assertType('AgaviContext', $ctx1);
- $this->assertType('AgaviContext', $ctx2);
+ $this->assertInstanceOf('AgaviContext', $ctx1);
+ $this->assertInstanceOf('AgaviContext', $ctx2);
$this->assertReference($ctx1, $ctx2);
}

public function testgetInstance()
{
$controller = AgaviContext::getInstance('test')->getController();
- $this->assertType('AgaviController', $controller);
+ $this->assertInstanceOf('AgaviController', $controller);
}

public function testCreateViewInstance()
{
$controller = $this->_controller;
- $this->assertType('Test_TestSuccessView', $controller->createViewInstance('Test', 'TestSuccess'));
- $this->assertType('Test_TestErrorView', $controller->createViewInstance('Test', 'TestError'));
+ $this->assertInstanceOf('Test_TestSuccessView', $controller->createViewInstance('Test', 'TestSuccess'));
+ $this->assertInstanceOf('Test_TestErrorView', $controller->createViewInstance('Test', 'TestError'));
}

public function testModelExists()

Modified: branches/david-httpcaching/tests2/core/ContextTest.php
===================================================================
--- branches/david-httpcaching/tests2/core/ContextTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/core/ContextTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -31,7 +31,7 @@
$default = AgaviConfig::get('core.default_context');

$this->assertNotNull(AgaviContext::getInstance());
- $this->assertType('AgaviContext', AgaviContext::getInstance());
+ $this->assertInstanceOf('AgaviContext', AgaviContext::getInstance());
$a = AgaviContext::getInstance();
$b = AgaviContext::getInstance(AgaviConfig::get('core.default_context'));
$c = AgaviContext::getInstance(AgaviConfig::get('core.default_context'));
@@ -47,16 +47,16 @@
$this->assertReference($a, $f);
$this->assertNotSame($e, $f);

- $this->assertType('AgaviWebRequest', AgaviContext::getInstance('test')->getRequest());
- $this->assertType('TestRouting', AgaviContext::getInstance('test')->getRouting());
+ $this->assertInstanceOf('AgaviWebRequest', AgaviContext::getInstance('test')->getRequest());
+ $this->assertInstanceOf('TestRouting', AgaviContext::getInstance('test')->getRouting());
}

public function testGetAlternateContextInstance()
{
$this->assertNotNull(AgaviContext::getInstance('test'));
- $this->assertType('AgaviContext', AgaviContext::getInstance('test'));
+ $this->assertInstanceOf('AgaviContext', AgaviContext::getInstance('test'));
$this->assertNotNull(AgaviContext::getInstance('test1'));
- $this->assertType('AgaviContext', AgaviContext::getInstance('test1'));
+ $this->assertInstanceOf('AgaviContext', AgaviContext::getInstance('test1'));
$a = AgaviContext::getInstance('test1');
$b = AgaviContext::getInstance('test');
$this->assertNotSame($a, $b);
@@ -67,15 +67,15 @@
// {
// $context = AgaviContext::getInstance('test');
// $context->initialize('test1');
- // $this->assertType('TestSessionStorage', $context->getStorage());
+ // $this->assertInstanceOf('TestSessionStorage', $context->getStorage());
// }


public function testGetGlobalModel()
{
$ctx = AgaviContext::getInstance('test');
- $this->assertType('SampleModel', $ctx->getModel('Sample'));
- $this->assertType('SingletonSampleModel', $ctx->getModel('SingletonSample'));
+ $this->assertInstanceOf('SampleModel', $ctx->getModel('Sample'));
+ $this->assertInstanceOf('SingletonSampleModel', $ctx->getModel('SingletonSample'));
$firstSingleton = $ctx->getModel('SingletonSample');
$firstSingleton->setFoo('bar');
$secondSingleton = $ctx->getModel('SingletonSample');
@@ -86,8 +86,8 @@
public function testGetModel()
{
$ctx = AgaviContext::getInstance('test');
- $this->assertType('Test_TestModel', $ctx->getModel('Test', 'Test'));
- $this->assertType('Test_SingletonTestModel', $ctx->getModel('SingletonTest', 'Test'));
+ $this->assertInstanceOf('Test_TestModel', $ctx->getModel('Test', 'Test'));
+ $this->assertInstanceOf('Test_SingletonTestModel', $ctx->getModel('SingletonTest', 'Test'));
$firstSingleton = $ctx->getModel('SingletonTest', 'Test');
$firstSingleton->setFoo('bar');
$secondSingleton = $ctx->getModel('SingletonTest', 'Test');
@@ -98,8 +98,8 @@
public function testGetDotStyleModel()
{
$ctx = AgaviContext::getInstance('test');
- $this->assertType('Foo_Bar_BazModel', $ctx->getModel('Foo.Bar.Baz'));
- $this->assertType('Test_Foo_Bar_BazModel', $ctx->getModel('Foo.Bar.Baz', 'Test'));
+ $this->assertInstanceOf('Foo_Bar_BazModel', $ctx->getModel('Foo.Bar.Baz'));
+ $this->assertInstanceOf('Test_Foo_Bar_BazModel', $ctx->getModel('Foo.Bar.Baz', 'Test'));
}

public function testGetFactoryInfo()
@@ -124,13 +124,13 @@
unlink(AgaviConfigCache::getCacheName(AgaviConfig::get('core.config_dir') . '/factories.xml', AgaviConfig::get('core.default_context')));
AgaviConfig::set('core.use_database', true);
AgaviContext::getInstance('test')->initialize();
- $this->assertType('AgaviDatabaseManager', AgaviContext::getInstance('test')->getDatabaseManager());
+ $this->assertInstanceOf('AgaviDatabaseManager', AgaviContext::getInstance('test')->getDatabaseManager());
AgaviConfig::set('core.use_database', false);
}

public function testGetLoggerManager()
{
- $this->assertType('AgaviLoggerManager', AgaviContext::getInstance('test')->getLoggerManager());
+ $this->assertInstanceOf('AgaviLoggerManager', AgaviContext::getInstance('test')->getLoggerManager());

// this BS just won't work... zomg tests suck suck suck suck suck

@@ -153,30 +153,30 @@
public function testGetRequest()
{
$ctx = AgaviContext::getInstance('test');
- $this->assertType('AgaviRequest', $ctx->getRequest());
+ $this->assertInstanceOf('AgaviRequest', $ctx->getRequest());
}

public function testGetRouting()
{
$ctx = AgaviContext::getInstance('test');
- $this->assertType('AgaviRouting', $ctx->getRouting());
+ $this->assertInstanceOf('AgaviRouting', $ctx->getRouting());
}

public function testGetStorage()
{
$ctx = AgaviContext::getInstance('test');
- $this->assertType('AgaviStorage', $ctx->getStorage());
+ $this->assertInstanceOf('AgaviStorage', $ctx->getStorage());
}

public function testGetUser()
{
- $this->assertType('AgaviUser', AgaviContext::getInstance('test')->getUser());
+ $this->assertInstanceOf('AgaviUser', AgaviContext::getInstance('test')->getUser());

// clear the factories cache (needed since we are changing settings which are evaluated at compile time)
unlink(AgaviConfigCache::getCacheName(AgaviConfig::get('core.config_dir') . '/factories.xml', AgaviConfig::get('core.default_context')));
AgaviConfig::set('core.use_security', true);
AgaviContext::getInstance('test')->initialize();
- $this->assertType('AgaviSecurityUser', AgaviContext::getInstance('test')->getUser());
+ $this->assertInstanceOf('AgaviSecurityUser', AgaviContext::getInstance('test')->getUser());
}
}

Modified: branches/david-httpcaching/tests2/database/DatabaseManagerTest.php
===================================================================
--- branches/david-httpcaching/tests2/database/DatabaseManagerTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/database/DatabaseManagerTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -24,8 +24,8 @@

public function testInitialization()
{
- $this->assertType('AgaviDatabaseManager', $this->_dbm);
- $this->assertType('AgaviContext', $this->_dbm->getContext());
+ $this->assertInstanceOf('AgaviDatabaseManager', $this->_dbm);
+ $this->assertInstanceOf('AgaviContext', $this->_dbm->getContext());
$ctx_test = $this->_dbm->getContext();
$this->assertReference($this->_context, $ctx_test);
}

Modified: branches/david-httpcaching/tests2/routing/WebRoutingTest.php
===================================================================
--- branches/david-httpcaching/tests2/routing/WebRoutingTest.php 2011-12-25 22:56:12 UTC (rev 4909)
+++ branches/david-httpcaching/tests2/routing/WebRoutingTest.php 2011-12-26 16:19:15 UTC (rev 4910)
@@ -23,9 +23,30 @@
AgaviConfig::set('core.use_routing', true);
}

- protected function runTest()
+ public function loadTestCases()
{
- $export = $this->export;
+ $retval = array();
+
+ $d = dir(dirname(__FILE__) . '/../routing/cases/');
+ while(false !== ($entry = $d->read())) {
+ if(preg_match('#.*\\.case\\.php#i', $entry))
+ {
+ $cases = include($d->path . $entry);
+ foreach($cases as $case) {
+ $retval[$entry . ': ' . $case['message']] = array($case);
+ }
+ }
+ }
+ $d->close();
+
+ return $retval;
+ }
+
+ /**
+ * @dataProvider loadTestCases
+ */
+ public function testCases($export)
+ {
$_SERVER = $export['_SERVER'];
$_ENV = $export['_ENV'];
$_GET = $export['_GET'];