Problem/Motivation

Make this module ready for Drupal 10.

CommentFileSizeAuthor
#37 3332499-37.patch3.19 KBheddn

Comments

arpeggio created an issue. See original summary.

arpeggio’s picture

Issue summary: View changes

  • arpeggio committed 419cb381 on 5.0.x
    Issue #3332499 by arpeggio: Update WebServiceUtilityBase.php
    

  • arpeggio committed 4f6c8ef6 on 5.0.x
    Issue #3332499 by arpeggio: Update WebServiceUtilityInterface.php
    

  • arpeggio committed d42628d4 on 5.0.x
    Issue #3332499 by arpeggio: Update EventSubscriber/...

  • arpeggio committed c2251fe6 on 5.0.x
    Issue #3332499 by arpeggio: Update SmartIpAdminSettingsForm.php
    

  • arpeggio committed 3ae54b4e on 5.0.x
    Issue #3332499 by arpeggio: Update UserCountry.php
    

  • arpeggio committed f62e6c4b on 5.0.x
    Issue #3332499 by arpeggio: Update device_geolocation.info.yml
    

  • arpeggio committed c591748e on 5.0.x
    Issue #3332499 by arpeggio: Update device_geolocation.install
    

  • arpeggio committed 5a4b5d20 on 5.0.x
    Issue #3332499 by arpeggio: Update device_geolocation.module
    

  • arpeggio committed fdaf4962 on 5.0.x
    Issue #3332499 by arpeggio: Update DeviceGeolocationController.php
    

  • arpeggio committed 3d0df8e5 on 5.0.x
    Issue #3332499 by arpeggio: Update DeviceGeolocation.php
    

  • arpeggio committed 9ed0e961 on 5.0.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed 07e6d043 on 5.0.x
    Issue #3332499 by arpeggio: Update VisitorGeolocation.php
    

  • arpeggio committed f729aff9 on 5.0.x
    Issue #3332499 by arpeggio: Update smart_ip_abstract_web_service.info....

  • arpeggio committed 89df7b79 on 5.0.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed 1d91089e on 5.0.x
    Issue #3332499 by arpeggio: Update WebServiceUtility.php
    

  • arpeggio committed 9121abf7 on 5.0.x
    Issue #3332499 by arpeggio: Update smart_ip_ip2location_bin_db.info.yml
    

  • arpeggio committed 5b26dd6d on 5.0.x
    Issue #3332499 by arpeggio: Update smart_ip_ip2location_bin_db.install
    

  • arpeggio committed f82a7848 on 5.0.x
    Issue #3332499 by arpeggio: Update DatabaseFileUtility.php
    

  • arpeggio committed f2a622c9 on 5.0.x
    Issue #3332499 by arpeggio: Update /SmartIpEventSubscriber.php
    

  • arpeggio committed 2855ca92 on 5.0.x
    Issue #3332499 by arpeggio: Update Ip2locationBinDb.php
    

  • arpeggio committed a00867ff on 5.0.x
    Issue #3332499 by arpeggio: Update smart_ip_ipinfodb_web_service.info....

  • arpeggio committed 453d7384 on 5.0.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed 5409d07a on 5.0.x
    Issue #3332499 by arpeggio: Update WebServiceUtility.php
    

  • arpeggio committed ffc785da on 5.0.x
    Issue #3332499 by arpeggio: Update smart_ip_maxmind_geoip2_bin_db.info....

  • arpeggio committed e768b610 on 5.0.x
    Issue #3332499 by arpeggio: Update smart_ip_maxmind_geoip2_bin_db....

  • arpeggio committed 3c058455 on 5.0.x
    Issue #3332499 by arpeggio: Update DatabaseFileUtility.php
    

  • arpeggio committed d73cb711 on 5.0.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed b556490c on 5.0.x
    Issue #3332499 by arpeggio: Update smart_ip_maxmind_geoip2_web_service....

  • arpeggio committed d1256f5e on 5.0.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed dcaddda9 on 5.0.x
    Issue #3332499 by arpeggio: Update WebServiceUtility.php
    

  • arpeggio committed 397a5369 on 5.0.x
    Issue #3332499 by arpeggio: Update smart_ip.info.yml
    
arpeggio’s picture

Status: Active » Fixed
phma’s picture

Thanks arpeggio for your work on getting smart_ip ready for Drupal 10. Installing 5.0.0-alpha2 still fails though, because it has a dependency to drupal/core ^9 in composer.json. Is this dependency even necessary?

 ],
  "require": {
    "drupal/core": "^8.7.7 || ^9",
    "geoip2/geoip2": "~2.0",
    "ip2location/ip2location-php": "~8.0"
  },
]
heddn’s picture

Status: Fixed » Needs work

NW because of #35.

heddn’s picture

Status: Needs work » Needs review
StatusFileSize
new3.19 KB

This adds a test and does minimal changes to get them passing or fix some odd findings from phpstan.

darvanen’s picture

Code looks good to me, came here because I found the same issue with composer.json.

I note the submodules also have composer.json files with references to drupal/core - should those be updated too?

heddn’s picture

  • heddn committed c3aa32ce on 8.x-4.x
    Issue #3332499 by heddn, arpeggio: Prepare Smart IP for Drupal 10
    

  • arpeggio committed 397a5369 on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip.info.yml
    

  • arpeggio committed dcaddda9 on 8.x-4.x
    Issue #3332499 by arpeggio: Update WebServiceUtility.php
    

  • arpeggio committed d1256f5e on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed b556490c on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip_maxmind_geoip2_web_service....

  • arpeggio committed d73cb711 on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed 3c058455 on 8.x-4.x
    Issue #3332499 by arpeggio: Update DatabaseFileUtility.php
    

  • arpeggio committed e768b610 on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip_maxmind_geoip2_bin_db....

  • arpeggio committed ffc785da on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip_maxmind_geoip2_bin_db.info....

  • arpeggio committed 5409d07a on 8.x-4.x
    Issue #3332499 by arpeggio: Update WebServiceUtility.php
    

  • arpeggio committed 453d7384 on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed a00867ff on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip_ipinfodb_web_service.info....

  • arpeggio committed 2855ca92 on 8.x-4.x
    Issue #3332499 by arpeggio: Update Ip2locationBinDb.php
    

  • arpeggio committed f2a622c9 on 8.x-4.x
    Issue #3332499 by arpeggio: Update /SmartIpEventSubscriber.php
    

  • arpeggio committed f82a7848 on 8.x-4.x
    Issue #3332499 by arpeggio: Update DatabaseFileUtility.php
    

  • arpeggio committed 5b26dd6d on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip_ip2location_bin_db.install
    

  • arpeggio committed 9121abf7 on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip_ip2location_bin_db.info.yml
    

  • arpeggio committed 1d91089e on 8.x-4.x
    Issue #3332499 by arpeggio: Update WebServiceUtility.php
    

  • arpeggio committed 89df7b79 on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed f729aff9 on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip_abstract_web_service.info....

  • arpeggio committed 07e6d043 on 8.x-4.x
    Issue #3332499 by arpeggio: Update VisitorGeolocation.php
    

  • arpeggio committed 9ed0e961 on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriber.php
    

  • arpeggio committed 3d0df8e5 on 8.x-4.x
    Issue #3332499 by arpeggio: Update DeviceGeolocation.php
    

  • arpeggio committed fdaf4962 on 8.x-4.x
    Issue #3332499 by arpeggio: Update DeviceGeolocationController.php
    

  • arpeggio committed 5a4b5d20 on 8.x-4.x
    Issue #3332499 by arpeggio: Update device_geolocation.module
    

  • arpeggio committed c591748e on 8.x-4.x
    Issue #3332499 by arpeggio: Update device_geolocation.install
    

  • arpeggio committed f62e6c4b on 8.x-4.x
    Issue #3332499 by arpeggio: Update device_geolocation.info.yml
    

  • arpeggio committed 3ae54b4e on 8.x-4.x
    Issue #3332499 by arpeggio: Update UserCountry.php
    

  • arpeggio committed c2251fe6 on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpAdminSettingsForm.php
    

  • arpeggio committed d42628d4 on 8.x-4.x
    Issue #3332499 by arpeggio: Update EventSubscriber/...

  • arpeggio committed 4f6c8ef6 on 8.x-4.x
    Issue #3332499 by arpeggio: Update WebServiceUtilityInterface.php
    

  • arpeggio committed 419cb381 on 8.x-4.x
    Issue #3332499 by arpeggio: Update WebServiceUtilityBase.php
    

  • arpeggio committed aaf7bd58 on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIp.php
    

  • arpeggio committed 9412424c on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpLocationInterface.php
    

  • arpeggio committed 9f3157a1 on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpEvents.php and SmartIpLocation...

  • arpeggio committed d9190dd5 on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpEventSubscriberBase.php
    

  • arpeggio committed 4908b4ad on 8.x-4.x
    Issue #3332499 by arpeggio: Update SmartIpDataSourceInterface.php
    

  • arpeggio committed d9bdebff on 8.x-4.x
    Issue #3332499 by arpeggio: Update GetLocationEvent.php
    

  • arpeggio committed 5f12cab0 on 8.x-4.x
    Issue #3332499 by arpeggio: Update DatabaseFileUtilityInterface.php
    

  • arpeggio committed 482b7ec9 on 8.x-4.x
    Issue #3332499 by arpeggio: Update DatabaseFileUtilityBase.php
    

  • arpeggio committed 362dcc5c on 8.x-4.x
    Issue #3332499 by arpeggio: Update DatabaseFileEvent.php
    

  • arpeggio committed 9f77c4d2 on 8.x-4.x
    Issue #3332499 by arpeggio: Update AdminSettingsEvent.php
    

  • arpeggio committed 03330c6d on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip.country_list.inc
    

  • arpeggio committed be602e8f on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip.install
    

  • arpeggio committed fd2ea31b on 8.x-4.x
    Issue #3332499 by arpeggio: Update smart_ip.module
    

  • heddn committed 1b045d38 on 5.0.x
    Issue #3332499 by heddn, arpeggio: Prepare Smart IP for Drupal 10
    
heddn’s picture

Status: Needs review » Fixed

I think this should be marked as done.

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.