It is used statically in provisionConfig_dns_zone::process() and I think it makes sense to use it that way.
Because it is not declared as static currently, verifying a site with E_STRICT on throws a notice and fails.

CommentFileSizeAuthor
#2 1295942-provision-dns-increment-serial-static.patch480 byteststoeckler
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

anarcat’s picture

anarcat CreditAttribution: anarcat commented

sounds like a good idea.

tstoeckler’s picture

tstoeckler
he/him
Primary language German
Location Essen, Germany
CreditAttribution: tstoeckler commented
Status: Active » Needs review
FileSize
1295942-provision-dns-increment-serial-static.patch480 bytes
Steven Jones’s picture

Steven Jones CreditAttribution: Steven Jones commented
Version: 7.x-2.x-dev » 6.x-1.x-dev
Status: Needs review » Patch (to be ported)

This is a helper function sitting in a class, so absolutely should be static. Patch applied in 6.x-2.x and 7.x-2.x.

I think we should fix 6.x-1.x, but in order to not change the API, we should just call the non-static method properly, but I'm not entirely sure how to do that within a config class.

tstoeckler’s picture

tstoeckler
he/him
Primary language German
Location Essen, Germany
CreditAttribution: tstoeckler commented

Something like:


  // increment the serial.
  $serial = (isset($records['@']['SOA']['serial']) ? $records['@']['SOA']['serial'] : NULL);
+ $provisionService_dns = new provisionServive_dns((object) array());
+ $this->store->records['@']['SOA']['serial'] = $records['serial'] = $provisionService_dns->increment_serial($serial);
- $this->store->records['@']['SOA']['serial'] = $records['serial'] = provisionService_dns::increment_serial($serial);
  $this->data['records'] = $records;

??

I'll try to roll a patch...

anarcat’s picture

anarcat CreditAttribution: anarcat commented
Status: Patch (to be ported) » Fixed

we're not going to backport to 1.x.

Status: Fixed » Closed (fixed)

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

  • Commit 6b17bb6 on 6.x-2.x, dev-ssl-ip-allocation-refactor, dev-1205458-move_sites_out_of_platforms, 7.x-3.x, dev-subdir-multiserver, 6.x-2.x-backports, dev-helmo-3.x authored by tstoeckler, committed by Steven Jones: 
    Issue #1295942 by tstoeckler: Fixed Make provisionService_dns()::...