The Secure Sessions extensions has a php-geoip folder, which contains the geoip_country_code_by_name function, but it seems the php55 on the test infrastructure already knows this function from PECL geoip - http://php.net/manual/en/function.geoip-country-code-by-name.php
The extension needs to check, if geoip is already there and do not include it
| Subject | Repo | Branch | Lines +/- | |
|---|---|---|---|---|
| Move php-geoip to composer dependancy | mediawiki/extensions/SecureSessions | master | +13 -7 K |
It unconditionally requires it
It should be included via composer I think too (support since 1.13) -- https://packagist.org/packages/geoip/geoip and https://github.com/maxmind/geoip-api-php
Change 337053 had a related patch set uploaded (by Reedy):
Move php-geoip to composer dependancy
Tests now pass on that version... I wonder if I should've done it before the extension registration? :P
Now the composer is running on the repo and the following error is given:
16:21:28 [10.3MB/0.02s] Loading composer repositories with package information 16:21:28 [10.8MB/0.54s] Updating dependencies (including require-dev) 16:21:31 [92.6MB/2.78s] Dependency resolution completed in 0.006 seconds 16:21:31 [92.7MB/2.78s] Your requirements could not be resolved to an installable set of packages. 16:21:31 [92.7MB/2.78s] 16:21:31 Problem 1 16:21:31 - Installation request for ext-geoip 1.0.8 -> satisfiable by ext-geoip[1.0.8]. 16:21:31 - geoip/geoip v1.17 conflicts with ext-geoip[1.0.8]. 16:21:31 - Installation request for geoip/geoip 1.17 -> satisfiable by geoip/geoip[v1.17]. 16:21:31
Please have another look here. Thanks.
Seen on https://gerrit.wikimedia.org/r/#/c/352792/1 / https://integration.wikimedia.org/ci/job/mwext-testextension-php55-trusty/1867/console