Permalink
Browse files

* fixed bug #17101: Unit tests fail (64 bit systems),

* fixed package.xml to allow installation via pyrus.



git-svn-id: http://svn.php.net/repository/pear/packages/Services_GeoNames/trunk@297796 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent 8d4e87c commit 45d7e8db93c53b717a420a32d1fef15071b6db56 @izimobil izimobil committed Apr 10, 2010
Showing with 67 additions and 47 deletions.
  1. +56 −36 package.xml
  2. +11 −11 tests/test_findnearbywikipedia.phpt
View
@@ -42,46 +42,19 @@ For more information please visit:
<email>izimobil@gmail.com</email>
<active>yes</active>
</lead>
- <date>2009-01-23</date>
+ <date>2010-04-10</date>
<version>
- <release>0.2.3</release>
- <api>0.2.3</api>
+ <release>1.0.0</release>
+ <api>1.0.0</api>
</version>
<stability>
- <release>beta</release>
- <api>beta</api>
+ <release>stable</release>
+ <api>stable</api>
</stability>
<license uri="http://www.opensource.org/licenses/mit-license.html">MIT</license>
<notes>
-<![CDATA[
-* clone the HTTP_Request2 instance instead of the reusing the same instance,
-* ability to set an array of failover servers,
-* better doc strings and various cosmetic changes.
-
-Important note
-==============
-From http://www.geonames.org/export/ :
-"We have temporarily removed the domain ws.geonames.org from the dns setting to
-protect the server from exessive use by an iphone application. You can access
-the server with the domain ws5.geonames.org"
-
-So until ws.geonames.org is not restored, you'll have to do either:
-<?php
-require_once 'Services/GeoNames.php';
-
-$geo = new Services_GeoNames();
-$geo->url = 'http://ws5.geonames.org';
-?>
-
-or:
-
-<?php
-require_once 'Services/GeoNames.php';
-
-$geo = new Services_GeoNames();
-$geo->failoverServers[] = 'http://ws5.geonames.org';
-?>
-]]>
+* fixed bug #17101: Unit tests fail (64 bit systems),
+* fixed package.xml to allow installation via pyrus.
</notes>
<contents>
<dir name="/">
@@ -185,6 +158,7 @@ $geo->failoverServers[] = 'http://ws5.geonames.org';
<!-- version 0.1.0 -->
<release>
+ <date>2008-09-03</date>
<version>
<release>0.1.0</release>
<api>0.1.0</api>
@@ -193,12 +167,12 @@ $geo->failoverServers[] = 'http://ws5.geonames.org';
<release>beta</release>
<api>beta</api>
</stability>
- <date>2008-09-03</date>
<notes>Initial release.</notes>
</release>
<!-- version 0.2.0 -->
<release>
+ <date>2008-12-10</date>
<version>
<release>0.2.0</release>
<api>0.2.0</api>
@@ -207,7 +181,6 @@ $geo->failoverServers[] = 'http://ws5.geonames.org';
<release>beta</release>
<api>beta</api>
</stability>
- <date>2008-12-10</date>
<notes>
* use HTTP_Request2,
* use JSON as exchange format,
@@ -217,6 +190,7 @@ $geo->failoverServers[] = 'http://ws5.geonames.org';
<!-- version 0.2.1 -->
<release>
+ <date>2008-12-11</date>
<version>
<release>0.2.1</release>
<api>0.2.1</api>
@@ -237,6 +211,7 @@ $geo->failoverServers[] = 'http://ws5.geonames.org';
<!-- version 0.2.2 -->
<release>
+ <date>2008-12-19</date>
<version>
<release>0.2.2</release>
<api>0.2.2</api>
@@ -253,5 +228,50 @@ $geo->failoverServers[] = 'http://ws5.geonames.org';
</notes>
</release>
+ <!-- version 0.2.3 -->
+ <release>
+ <date>2009-01-23</date>
+ <version>
+ <release>0.2.3</release>
+ <api>0.2.3</api>
+ </version>
+ <stability>
+ <release>beta</release>
+ <api>beta</api>
+ </stability>
+ <license uri="http://www.opensource.org/licenses/mit-license.html">MIT</license>
+ <notes>
+<![CDATA[
+* clone the HTTP_Request2 instance instead of the reusing the same instance,
+* ability to set an array of failover servers,
+* better doc strings and various cosmetic changes.
+
+Important note
+==============
+From http://www.geonames.org/export/ :
+"We have temporarily removed the domain ws.geonames.org from the dns setting to
+protect the server from exessive use by an iphone application. You can access
+the server with the domain ws5.geonames.org"
+
+So until ws.geonames.org is not restored, you'll have to do either:
+<?php
+require_once 'Services/GeoNames.php';
+
+$geo = new Services_GeoNames();
+$geo->url = 'http://ws5.geonames.org';
+?>
+
+or:
+
+<?php
+require_once 'Services/GeoNames.php';
+
+$geo = new Services_GeoNames();
+$geo->failoverServers[] = 'http://ws5.geonames.org';
+?>
+]]>
+ </notes>
+ </release>
+
</changelog>
</package>
@@ -16,7 +16,7 @@ try {
echo $exc->getMessage();
}
?>
---EXPECT--
+--EXPECTF--
Array
(
[0] => stdClass Object
@@ -27,10 +27,10 @@ Array
[wikipediaUrl] => en.wikipedia.org/wiki/Gl%C3%A4rnisch
[elevation] => 0
[countryCode] => CH
- [lng] => 8.99861111111
+ [lng] => %s
[feature] => mountain
[lang] => en
- [lat] => 46.9986111111
+ [lat] => %s
[population] => 0
)
@@ -42,10 +42,10 @@ Array
[wikipediaUrl] => en.wikipedia.org/wiki/Oberblegisee
[elevation] => 0
[countryCode] => CH
- [lng] => 9.01333333333
+ [lng] => %s
[feature] => waterbody
[lang] => en
- [lat] => 46.9808333333
+ [lat] => %s
[population] => 0
)
@@ -57,11 +57,11 @@ Array
[wikipediaUrl] => en.wikipedia.org/wiki/Kl%C3%B6ntalersee
[elevation] => 0
[countryCode] => CH
- [lng] => 8.98055555556
+ [lng] => %s
[feature] => waterbody
[thumbnailImg] => http://www.geonames.org/img/wikipedia/2000/thumb-1904-100.jpg
[lang] => en
- [lat] => 47.0255555556
+ [lat] => %s
[population] => 0
)
@@ -73,10 +73,10 @@ Array
[wikipediaUrl] => en.wikipedia.org/wiki/Canton_of_Glarus
[elevation] => 0
[countryCode] => CH
- [lng] => 9.06666666667
+ [lng] => %s
[feature] => adm1st
[lang] => en
- [lat] => 46.9833333333
+ [lat] => %s
[population] => 0
)
@@ -88,10 +88,10 @@ Array
[wikipediaUrl] => en.wikipedia.org/wiki/Obersee_%28Glarus%29
[elevation] => 0
[countryCode] => CH
- [lng] => 9.01388888889
+ [lng] => %s
[feature] => waterbody
[lang] => en
- [lat] => 47.0869444444
+ [lat] => %s
[population] => 0
)

0 comments on commit 45d7e8d

Please sign in to comment.