From 8ecea45fdae98885d044074e2ae6677795ab7246 Mon Sep 17 00:00:00 2001 From: Alexey Kalinin Date: Thu, 7 May 2015 12:58:44 +0300 Subject: [PATCH] Use https transport in Yandex provider #431 Yandex deprecates http schema (http://clubs.ya.ru/mapsapi/replies.xml?item_no=56858) so https should be used instead. Fixed tests + new cached responses added. --- src/Geocoder/Provider/Yandex.php | 4 ++-- .../1ece1b149ef392c5f0da11797f637e7ae221bd17 | 1 + .../5ded45ea75499ea33bc71c8cbca1ab897dae8164 | 1 + .../6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f | 1 + .../806a1ce8d9d47a3d77256ce030cd99a1270265fa | 1 + .../80749871012997dfec54797b934863b875718034 | 1 + .../b21e6fa348985653ed3827c87beccbe62378ae6b | 1 + .../b561a90296204f3883bf43c99f9458b058641a69 | 1 + .../e4a5a17ff82fb94a41b081c6495045090de216eb | 1 + .../fe183030953fd61ac7624981101f2ddee3a74fce | 1 + tests/Geocoder/Tests/Provider/YandexTest.php | 18 +++++++++--------- 11 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 tests/.cached_responses/1ece1b149ef392c5f0da11797f637e7ae221bd17 create mode 100644 tests/.cached_responses/5ded45ea75499ea33bc71c8cbca1ab897dae8164 create mode 100644 tests/.cached_responses/6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f create mode 100644 tests/.cached_responses/806a1ce8d9d47a3d77256ce030cd99a1270265fa create mode 100644 tests/.cached_responses/80749871012997dfec54797b934863b875718034 create mode 100644 tests/.cached_responses/b21e6fa348985653ed3827c87beccbe62378ae6b create mode 100644 tests/.cached_responses/b561a90296204f3883bf43c99f9458b058641a69 create mode 100644 tests/.cached_responses/e4a5a17ff82fb94a41b081c6495045090de216eb create mode 100644 tests/.cached_responses/fe183030953fd61ac7624981101f2ddee3a74fce diff --git a/src/Geocoder/Provider/Yandex.php b/src/Geocoder/Provider/Yandex.php index db50f0871..a2ff5b25c 100644 --- a/src/Geocoder/Provider/Yandex.php +++ b/src/Geocoder/Provider/Yandex.php @@ -24,12 +24,12 @@ class Yandex extends AbstractHttpProvider implements LocaleAwareProvider /** * @var string */ - const GEOCODE_ENDPOINT_URL = 'http://geocode-maps.yandex.ru/1.x/?format=json&geocode=%s'; + const GEOCODE_ENDPOINT_URL = 'https://geocode-maps.yandex.ru/1.x/?format=json&geocode=%s'; /** * @var string */ - const REVERSE_ENDPOINT_URL = 'http://geocode-maps.yandex.ru/1.x/?format=json&geocode=%F,%F'; + const REVERSE_ENDPOINT_URL = 'https://geocode-maps.yandex.ru/1.x/?format=json&geocode=%F,%F'; /** * @var string diff --git a/tests/.cached_responses/1ece1b149ef392c5f0da11797f637e7ae221bd17 b/tests/.cached_responses/1ece1b149ef392c5f0da11797f637e7ae221bd17 new file mode 100644 index 000000000..bdda06df6 --- /dev/null +++ b/tests/.cached_responses/1ece1b149ef392c5f0da11797f637e7ae221bd17 @@ -0,0 +1 @@ +s:4485:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"Copenhagen, Denmark","found":"13","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Данія, Столичная область, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген"}}}}}}},"description":"Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.45295 55.614999","upperCorner":"12.65075 55.732585"}},"Point":{"pos":"12.567593 55.675676"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Данія, область Южная Дания, Миддельфарт, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"область Южная Дания, Миддельфарт, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"область Южная Дания","SubAdministrativeArea":{"SubAdministrativeAreaName":"Миддельфарт","Locality":{"LocalityName":"Копенгаген"}}}}}}},"description":"Миддельфарт, область Южная Дания, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"9.971219 55.454366","upperCorner":"9.974965 55.457398"}},"Point":{"pos":"9.972854 55.455739"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.518464 55.703961","upperCorner":"12.551396 55.722553"}},"Point":{"pos":"12.534930 55.713258"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.561736 55.689578","upperCorner":"12.594668 55.708176"}},"Point":{"pos":"12.578202 55.698878"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Данія, Столичная область, Копенгаген, Копенгаген","precision":"other","AddressDetails":{"Country":{"AddressLine":"Столичная область, Копенгаген, Копенгаген","CountryNameCode":"DK","CountryName":"Данія","AdministrativeArea":{"AdministrativeAreaName":"Столичная область","SubAdministrativeArea":{"SubAdministrativeAreaName":"Копенгаген","Locality":{"LocalityName":"Копенгаген","DependentLocality":{"DependentLocalityName":"Копенгаген"}}}}}}}},"description":"Копенгаген, Столичная область, Данія","name":"Копенгаген","boundedBy":{"Envelope":{"lowerCorner":"12.538361 55.681077","upperCorner":"12.571294 55.69968"}},"Point":{"pos":"12.554827 55.690380"}}}]}}}"; \ No newline at end of file diff --git a/tests/.cached_responses/5ded45ea75499ea33bc71c8cbca1ab897dae8164 b/tests/.cached_responses/5ded45ea75499ea33bc71c8cbca1ab897dae8164 new file mode 100644 index 000000000..21954716c --- /dev/null +++ b/tests/.cached_responses/5ded45ea75499ea33bc71c8cbca1ab897dae8164 @@ -0,0 +1 @@ +s:4108:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"1600 Pennsylvania Ave, Washington","found":"33","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"United States, District of Columbia, Washington, Pennsylvania Ave NW, 1600","precision":"exact","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Ave NW, 1600","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave NW","Premise":{"PremiseNumber":"1600"}}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Ave NW, 1600","boundedBy":{"Envelope":{"lowerCorner":"-77.046921 38.891265","upperCorner":"-77.030464 38.904125"}},"Point":{"pos":"-77.038692 38.897695"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, District of Columbia, Washington, Pennsylvania Ave SE","precision":"street","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Ave SE","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave SE"}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Ave SE","boundedBy":{"Envelope":{"lowerCorner":"-77.003532 38.863739","upperCorner":"-76.946777 38.887825"}},"Point":{"pos":"-76.975235 38.875565"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, Maryland, Washington, Pennsylvania Ave","precision":"street","AddressDetails":{"Country":{"AddressLine":"Maryland, Washington, Pennsylvania Ave","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"Maryland","SubAdministrativeArea":{"SubAdministrativeAreaName":"Washington","Locality":{"Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave"}}}}}}}},"description":"Washington, Maryland, United States","name":"Pennsylvania Ave","boundedBy":{"Envelope":{"lowerCorner":"-77.724152 39.649717","upperCorner":"-77.717513 39.721407"}},"Point":{"pos":"-77.720774 39.685568"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, Pennsylvania, Washington, Pennsylvania Ave","precision":"street","AddressDetails":{"Country":{"AddressLine":"Pennsylvania, Washington, Pennsylvania Ave","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"Pennsylvania","Locality":{"DependentLocality":{"DependentLocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Ave"}}}}}}}},"description":"Washington, Pennsylvania, United States","name":"Pennsylvania Ave","boundedBy":{"Envelope":{"lowerCorner":"-79.890044 40.118144","upperCorner":"-79.867263 40.131418"}},"Point":{"pos":"-79.878914 40.124233"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"United States, District of Columbia, Washington, Pennsylvania Avenue Rear SE","precision":"street","AddressDetails":{"Country":{"AddressLine":"District of Columbia, Washington, Pennsylvania Avenue Rear SE","CountryNameCode":"US","CountryName":"United States","AdministrativeArea":{"AdministrativeAreaName":"District of Columbia","SubAdministrativeArea":{"SubAdministrativeAreaName":"District of Columbia","Locality":{"LocalityName":"Washington","Thoroughfare":{"ThoroughfareName":"Pennsylvania Avenue Rear SE"}}}}}}}},"description":"Washington, District of Columbia, United States","name":"Pennsylvania Avenue Rear SE","boundedBy":{"Envelope":{"lowerCorner":"-76.98341 38.879315","upperCorner":"-76.981649 38.881175"}},"Point":{"pos":"-76.982790 38.879891"}}}]}}}"; \ No newline at end of file diff --git a/tests/.cached_responses/6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f b/tests/.cached_responses/6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f new file mode 100644 index 000000000..f54f3da17 --- /dev/null +++ b/tests/.cached_responses/6e6f03453e3d167c8f98f8e81b4967b63c8c7a6f @@ -0,0 +1 @@ +s:3825:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"2.388772,48.863216","found":"8","results":"5","Point":{"pos":"2.388772 48.863216"}}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"Франция, Иль-Де-Франс, Париж, XX округ, Avenue Gambetta","precision":"street","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж, XX округ, Avenue Gambetta","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж","DependentLocality":{"DependentLocalityName":"XX округ","Thoroughfare":{"ThoroughfareName":"Avenue Gambetta"}}}}}}}}},"description":"XX округ, Париж, Иль-Де-Франс, Франция","name":"Avenue Gambetta","boundedBy":{"Envelope":{"lowerCorner":"2.387497 48.86294","upperCorner":"2.406587 48.877067"}},"Point":{"pos":"2.388773 48.863212"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"district","text":"Франция, Иль-Де-Франс, Париж, XX округ","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж, XX округ","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж","DependentLocality":{"DependentLocalityName":"XX округ"}}}}}}}},"description":"Париж, Иль-Де-Франс, Франция","name":"XX округ","boundedBy":{"Envelope":{"lowerCorner":"2.377939 48.846697","upperCorner":"2.416217 48.878252"}},"Point":{"pos":"2.399355 48.864848"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж"}}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.251232 48.815727","upperCorner":"2.416235 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"area","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж"}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.223824 48.815727","upperCorner":"2.469792 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"area","text":"Франция, Иль-Де-Франс, Париж","precision":"other","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Париж","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж"}}}}}},"description":"Иль-Де-Франс, Франция","name":"Париж","boundedBy":{"Envelope":{"lowerCorner":"2.223824 48.815727","upperCorner":"2.469792 48.902474"}},"Point":{"pos":"2.341198 48.856929"}}}]}}}"; \ No newline at end of file diff --git a/tests/.cached_responses/806a1ce8d9d47a3d77256ce030cd99a1270265fa b/tests/.cached_responses/806a1ce8d9d47a3d77256ce030cd99a1270265fa new file mode 100644 index 000000000..509f25a60 --- /dev/null +++ b/tests/.cached_responses/806a1ce8d9d47a3d77256ce030cd99a1270265fa @@ -0,0 +1 @@ +s:152:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"foobar","found":"0","results":"5"}},"featureMember":[]}}}"; \ No newline at end of file diff --git a/tests/.cached_responses/80749871012997dfec54797b934863b875718034 b/tests/.cached_responses/80749871012997dfec54797b934863b875718034 new file mode 100644 index 000000000..4c538f979 --- /dev/null +++ b/tests/.cached_responses/80749871012997dfec54797b934863b875718034 @@ -0,0 +1 @@ +s:6208:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"22.256784,60.453947","found":"70","results":"5","boundedBy":{"Envelope":{"lowerCorner":"22.254288 60.451449","upperCorner":"22.259283 60.456445"}},"Point":{"pos":"22.256784 60.453947"},"kind":"house"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Bangårdsgatan, 36","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Bangårdsgatan, 36","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Bangårdsgatan","Premise":{"PremiseNumber":"36"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Bangårdsgatan, 36","boundedBy":{"Envelope":{"lowerCorner":"22.248557 60.450242","upperCorner":"22.265014 60.458371"}},"Point":{"pos":"22.256785 60.454307"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Ratapihankatu, 36","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Ratapihankatu, 36","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Ratapihankatu","Premise":{"PremiseNumber":"36"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Ratapihankatu, 36","boundedBy":{"Envelope":{"lowerCorner":"22.248557 60.450242","upperCorner":"22.265014 60.458371"}},"Point":{"pos":"22.256785 60.454307"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15b","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15b","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humalistonkatu","Premise":{"PremiseNumber":"15b"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humalistonkatu, 15b","boundedBy":{"Envelope":{"lowerCorner":"22.248125 60.449332","upperCorner":"22.264583 60.457461"}},"Point":{"pos":"22.256354 60.453397"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humlegårdsgatan, 15b","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humlegårdsgatan, 15b","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humlegårdsgatan","Premise":{"PremiseNumber":"15b"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humlegårdsgatan, 15b","boundedBy":{"Envelope":{"lowerCorner":"22.248125 60.449332","upperCorner":"22.264583 60.457461"}},"Point":{"pos":"22.256354 60.453397"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Фінляндія, Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15a","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Юго-Западная Финляндия, Исконная Финляндия, Турку, Кескуста, Humalistonkatu, 15a","CountryNameCode":"FI","CountryName":"Фінляндія","AdministrativeArea":{"AdministrativeAreaName":"Юго-Западная Финляндия","SubAdministrativeArea":{"SubAdministrativeAreaName":"Исконная Финляндия","Locality":{"LocalityName":"Турку","DependentLocality":{"DependentLocalityName":"Кескуста","Thoroughfare":{"ThoroughfareName":"Humalistonkatu","Premise":{"PremiseNumber":"15a"}}}}}}}}}},"description":"Кескуста, Турку, Исконная Финляндия, Юго-Западная Финляндия, Фінляндія","name":"Humalistonkatu, 15a","boundedBy":{"Envelope":{"lowerCorner":"22.248889 60.449235","upperCorner":"22.265346 60.457364"}},"Point":{"pos":"22.257118 60.453299"}}}]}}}"; \ No newline at end of file diff --git a/tests/.cached_responses/b21e6fa348985653ed3827c87beccbe62378ae6b b/tests/.cached_responses/b21e6fa348985653ed3827c87beccbe62378ae6b new file mode 100644 index 000000000..22b844aa9 --- /dev/null +++ b/tests/.cached_responses/b21e6fa348985653ed3827c87beccbe62378ae6b @@ -0,0 +1 @@ +s:3314:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"29.198184,40.900640","found":"8","results":"5","boundedBy":{"Envelope":{"lowerCorner":"28.948183 40.650166","upperCorner":"29.448185 41.150162"}},"Point":{"pos":"29.198184 40.900640"},"kind":"locality"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, İstanbul, Adalar, Büyükada","precision":"other","AddressDetails":{"Country":{"AddressLine":"İstanbul, Adalar, Büyükada","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"İstanbul","SubAdministrativeArea":{"SubAdministrativeAreaName":"Adalar","Locality":{"LocalityName":"Büyükada"}}}}}}},"description":"Adalar, İstanbul, Türkiye","name":"Büyükada","boundedBy":{"Envelope":{"lowerCorner":"29.10723 40.853544","upperCorner":"29.139021 40.876111"}},"Point":{"pos":"29.129562 40.874652"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, İstanbul, Sultanbeyli","precision":"other","AddressDetails":{"Country":{"AddressLine":"İstanbul, Sultanbeyli","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"İstanbul","SubAdministrativeArea":{"SubAdministrativeAreaName":"Sultanbeyli","Locality":{"LocalityName":"Sultanbeyli"}}}}}}},"description":"İstanbul, Türkiye","name":"Sultanbeyli","boundedBy":{"Envelope":{"lowerCorner":"29.244699 40.931768","upperCorner":"29.31192 41.00489"}},"Point":{"pos":"29.262001 40.968417"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, Kocaeli, Çayırova, Tuzla","precision":"other","AddressDetails":{"Country":{"AddressLine":"Kocaeli, Çayırova, Tuzla","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"Kocaeli","SubAdministrativeArea":{"SubAdministrativeAreaName":"Çayırova","Locality":{"LocalityName":"Tuzla"}}}}}}},"description":"Çayırova, Kocaeli, Türkiye","name":"Tuzla","boundedBy":{"Envelope":{"lowerCorner":"29.350808 40.807747","upperCorner":"29.422673 40.849022"}},"Point":{"pos":"29.372233 40.824215"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, Kocaeli, Darıca, Gebze","precision":"other","AddressDetails":{"Country":{"AddressLine":"Kocaeli, Darıca, Gebze","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"Kocaeli","SubAdministrativeArea":{"SubAdministrativeAreaName":"Darıca","Locality":{"LocalityName":"Gebze"}}}}}}},"description":"Darıca, Kocaeli, Türkiye","name":"Gebze","boundedBy":{"Envelope":{"lowerCorner":"29.333462 40.753098","upperCorner":"29.425512 40.809364"}},"Point":{"pos":"29.384333 40.762176"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"locality","text":"Türkiye, İstanbul","precision":"other","AddressDetails":{"Country":{"AddressLine":"İstanbul","CountryNameCode":"TR","CountryName":"Türkiye","AdministrativeArea":{"AdministrativeAreaName":"İstanbul","Locality":{"LocalityName":"İstanbul"}}}}}},"description":"Türkiye","name":"İstanbul","boundedBy":{"Envelope":{"lowerCorner":"28.595549 40.811398","upperCorner":"29.4288 41.199235"}},"Point":{"pos":"28.967111 41.008925"}}}]}}}"; \ No newline at end of file diff --git a/tests/.cached_responses/b561a90296204f3883bf43c99f9458b058641a69 b/tests/.cached_responses/b561a90296204f3883bf43c99f9458b058641a69 new file mode 100644 index 000000000..7496fbb64 --- /dev/null +++ b/tests/.cached_responses/b561a90296204f3883bf43c99f9458b058641a69 @@ -0,0 +1 @@ +s:943:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"ул.Ленина, 19, Минск 220030, Республика Беларусь","found":"1","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Беларусь, Минск, улица Ленина, 19","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Минск, улица Ленина, 19","CountryNameCode":"BY","CountryName":"Беларусь","AdministrativeArea":{"AdministrativeAreaName":"Минск","Locality":{"LocalityName":"Минск","Thoroughfare":{"ThoroughfareName":"улица Ленина","Premise":{"PremiseNumber":"19"}}}}}}}},"description":"Минск, Беларусь","name":"улица Ленина, 19","boundedBy":{"Envelope":{"lowerCorner":"27.555237 53.893349","upperCorner":"27.571695 53.903069"}},"Point":{"pos":"27.563466 53.898209"}}}]}}}"; \ No newline at end of file diff --git a/tests/.cached_responses/e4a5a17ff82fb94a41b081c6495045090de216eb b/tests/.cached_responses/e4a5a17ff82fb94a41b081c6495045090de216eb new file mode 100644 index 000000000..e1c153734 --- /dev/null +++ b/tests/.cached_responses/e4a5a17ff82fb94a41b081c6495045090de216eb @@ -0,0 +1 @@ +s:4513:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"2.388772,48.863216","found":"46","results":"5","boundedBy":{"Envelope":{"lowerCorner":"2.386276 48.860723","upperCorner":"2.391270 48.865713"}},"Point":{"pos":"2.388772 48.863216"},"kind":"street"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Avenue Gambetta","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Avenue Gambetta","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Avenue Gambetta"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Avenue Gambetta","boundedBy":{"Envelope":{"lowerCorner":"2.387497 48.86294","upperCorner":"2.406587 48.877067"}},"Point":{"pos":"2.400370 48.867035"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Place Auguste Métivier","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Place Auguste Métivier","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Place Auguste Métivier"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Place Auguste Métivier","boundedBy":{"Envelope":{"lowerCorner":"2.387974 48.863029","upperCorner":"2.388468 48.863307"}},"Point":{"pos":"2.388207 48.863189"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Rue des Amandiers","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Rue des Amandiers","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Rue des Amandiers"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Rue des Amandiers","boundedBy":{"Envelope":{"lowerCorner":"2.387974 48.863029","upperCorner":"2.389815 48.868309"}},"Point":{"pos":"2.389689 48.865927"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Rue Houdart","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Rue Houdart","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Rue Houdart"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Rue Houdart","boundedBy":{"Envelope":{"lowerCorner":"2.387273 48.863224","upperCorner":"2.388252 48.864599"}},"Point":{"pos":"2.387767 48.863912"}}},{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"street","text":"France, Ile-de-France, Paris, 20e Arrondissement, Square Jacaques Grynberg","precision":"street","AddressDetails":{"Country":{"AddressLine":"Ile-de-France, Paris, 20e Arrondissement, Square Jacaques Grynberg","CountryNameCode":"FR","CountryName":"France","AdministrativeArea":{"AdministrativeAreaName":"Ile-de-France","SubAdministrativeArea":{"SubAdministrativeAreaName":"Paris","Locality":{"LocalityName":"Paris","DependentLocality":{"DependentLocalityName":"20e Arrondissement","Thoroughfare":{"ThoroughfareName":"Square Jacaques Grynberg"}}}}}}}}},"description":"20e Arrondissement, Paris, Ile-de-France, France","name":"Square Jacaques Grynberg","boundedBy":{"Envelope":{"lowerCorner":"2.388899 48.863704","upperCorner":"2.389959 48.863929"}},"Point":{"pos":"2.389438 48.863758"}}}]}}}"; \ No newline at end of file diff --git a/tests/.cached_responses/fe183030953fd61ac7624981101f2ddee3a74fce b/tests/.cached_responses/fe183030953fd61ac7624981101f2ddee3a74fce new file mode 100644 index 000000000..0e973c0b2 --- /dev/null +++ b/tests/.cached_responses/fe183030953fd61ac7624981101f2ddee3a74fce @@ -0,0 +1 @@ +s:1114:"{"response":{"GeoObjectCollection":{"metaDataProperty":{"GeocoderResponseMetaData":{"request":"10 avenue Gambetta, Paris, France","found":"1","results":"5"}},"featureMember":[{"GeoObject":{"metaDataProperty":{"GeocoderMetaData":{"kind":"house","text":"Франция, Иль-Де-Франс, Париж, XX округ, Avenue Gambetta, 10","precision":"exact","AddressDetails":{"Country":{"AddressLine":"Иль-Де-Франс, Париж, XX округ, Avenue Gambetta, 10","CountryNameCode":"FR","CountryName":"Франция","AdministrativeArea":{"AdministrativeAreaName":"Иль-Де-Франс","SubAdministrativeArea":{"SubAdministrativeAreaName":"Париж","Locality":{"LocalityName":"Париж","DependentLocality":{"DependentLocalityName":"XX округ","Thoroughfare":{"ThoroughfareName":"Avenue Gambetta","Premise":{"PremiseNumber":"10"}}}}}}}}}},"description":"XX округ, Париж, Иль-Де-Франс, Франция","name":"Avenue Gambetta, 10","boundedBy":{"Envelope":{"lowerCorner":"2.380841 48.857747","upperCorner":"2.397298 48.868605"}},"Point":{"pos":"2.389069 48.863177"}}}]}}}"; \ No newline at end of file diff --git a/tests/Geocoder/Tests/Provider/YandexTest.php b/tests/Geocoder/Tests/Provider/YandexTest.php index a547bd345..660860fbe 100644 --- a/tests/Geocoder/Tests/Provider/YandexTest.php +++ b/tests/Geocoder/Tests/Provider/YandexTest.php @@ -38,7 +38,7 @@ public function testGeocodeWithLocalhostIPv6() /** * @expectedException \Geocoder\Exception\NoResult - * @expectedExceptionMessage Could not execute query "http://geocode-maps.yandex.ru/1.x/?format=json&geocode=&results=5". + * @expectedExceptionMessage Could not execute query "https://geocode-maps.yandex.ru/1.x/?format=json&geocode=&results=5". */ public function testGeocodeWithNull() { @@ -48,7 +48,7 @@ public function testGeocodeWithNull() /** * @expectedException \Geocoder\Exception\NoResult - * @expectedExceptionMessage Could not execute query "http://geocode-maps.yandex.ru/1.x/?format=json&geocode=&results=5". + * @expectedExceptionMessage Could not execute query "https://geocode-maps.yandex.ru/1.x/?format=json&geocode=&results=5". */ public function testGeocodeWithEmpty() { @@ -58,7 +58,7 @@ public function testGeocodeWithEmpty() /** * @expectedException \Geocoder\Exception\NoResult - * @expectedExceptionMessage Could not execute query "http://geocode-maps.yandex.ru/1.x/?format=json&geocode=foobar&results=5". + * @expectedExceptionMessage Could not execute query "https://geocode-maps.yandex.ru/1.x/?format=json&geocode=foobar&results=5". */ public function testGeocodeWithInvalidData() { @@ -68,7 +68,7 @@ public function testGeocodeWithInvalidData() /** * @expectedException \Geocoder\Exception\NoResult - * @expectedExceptionMessage Could not execute query "http://geocode-maps.yandex.ru/1.x/?format=json&geocode=Kabasakal+Caddesi%2C+Istanbul%2C+Turkey&results=5". + * @expectedExceptionMessage Could not execute query "https://geocode-maps.yandex.ru/1.x/?format=json&geocode=Kabasakal+Caddesi%2C+Istanbul%2C+Turkey&results=5". */ public function testGeocodeWithAddressGetsNullContent() { @@ -78,7 +78,7 @@ public function testGeocodeWithAddressGetsNullContent() /** * @expectedException \Geocoder\Exception\NoResult - * @expectedExceptionMessage Could not execute query "http://geocode-maps.yandex.ru/1.x/?format=json&geocode=foobar&results=5". + * @expectedExceptionMessage Could not execute query "https://geocode-maps.yandex.ru/1.x/?format=json&geocode=foobar&results=5". */ public function testGeocodeWithFakeAddress() { @@ -246,7 +246,7 @@ public function testGeocodeWithRealAddressWithBYLocale() /** * @expectedException \Geocoder\Exception\NoResult - * @expectedExceptionMessage Could not execute query "http://geocode-maps.yandex.ru/1.x/?format=json&geocode=2.000000,1.000000&results=5". + * @expectedExceptionMessage Could not execute query "https://geocode-maps.yandex.ru/1.x/?format=json&geocode=2.000000,1.000000&results=5". */ public function testReverse() { @@ -256,7 +256,7 @@ public function testReverse() /** * @expectedException \Geocoder\Exception\NoResult - * @expectedExceptionMessage Could not execute query "http://geocode-maps.yandex.ru/1.x/?format=json&geocode=0.000000,0.000000&results=5". + * @expectedExceptionMessage Could not execute query "https://geocode-maps.yandex.ru/1.x/?format=json&geocode=0.000000,0.000000&results=5". */ public function testReverseWithInvalidData() { @@ -266,7 +266,7 @@ public function testReverseWithInvalidData() /** * @expectedException \Geocoder\Exception\NoResult - * @expectedExceptionMessage Could not execute query "http://geocode-maps.yandex.ru/1.x/?format=json&geocode=2.388772,48.863216&results=5". + * @expectedExceptionMessage Could not execute query "https://geocode-maps.yandex.ru/1.x/?format=json&geocode=2.388772,48.863216&results=5". */ public function testReverseWithAddressGetsNullContent() { @@ -435,7 +435,7 @@ public function testReverseWithRealCoordinatesWithTRLocaleAndLocalityToponym() $this->assertEquals(29.139021, $result->getBounds()->getEast(), '', 0.01); $this->assertNull($result->getStreetName()); $this->assertNull($result->getStreetNumber()); - $this->assertEquals('Adalar', $result->getLocality()); + $this->assertEquals('Büyükada', $result->getLocality()); $this->assertCount(2, $result->getAdminLevels()); $this->assertEquals('Adalar', $result->getAdminLevels()->get(2)->getName()); $this->assertEquals('İstanbul', $result->getAdminLevels()->get(1)->getName());