Unfortunately, it turns out it was a good idea to check with a developer, rather than trusting me.
One of the other changes in the qa/2.x development branch is the introduction of a PHP syntax checker (PHP CS Fixer
, first added to AtoM here
). This was added months before the OAI fixes in the commits linked above - meaning that a lot of AtoM's code changed in the interim. A consequence of this is that picking the commit above and attempting to apply it to a 2.6.1 installation will almost certainly cause conflicts. Additionally, as you can see from the size of the commit
(not to mention there have been several other adjustments to it in other commits since), trying to apply the PHP CS Fixer addition into AtoM as a patch first as a way of attempting to resolve this issue is strongly not recommended.
With this in mind, I think your best plan is likely to either wait for a formal 2.7 release (we're working on a release plan, hopefully later this year!), or else do something like install a development version just for OAI harvesting... or decide to upgrade your production instance to the development branch, taking on some of the risks that there are undiscovered bugs and regressions still present that might affect you.
Sorry for the confusion!