Skip to content

Migrate ext/geoip to doc-extensions - #11

Open
jordikroon wants to merge 63 commits into
php:mainfrom
jordikroon:migration-ext-geoip
Open

Migrate ext/geoip to doc-extensions#11
jordikroon wants to merge 63 commits into
php:mainfrom
jordikroon:migration-ext-geoip

Conversation

@jordikroon

@jordikroon jordikroon commented Aug 5, 2026

Copy link
Copy Markdown
Member

The point of this PR is to migrate extensions from doc-en while preserving it's (linear) history.
The scope is to only add files that are listed in the reference folder.

Command to replicate:

git -C ../doc-en format-patch --root -o /path/to/patches -- reference/<ext>
git am --committer-date-is-author-date /path/to/patches/*.patch

This is still a draft. The next (possible) step would be to fix the XML entities. Also planning to do a docbook-cs sweep.

olivierhill and others added 30 commits August 22, 2006 18:57
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@218789 c90b9560-bf6c-de11-be94-00142212c4b1
… namespace to all root elements - Replace <ulink /> with <link xlink:href /> - Minor markup fixes here and there

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@238160 c90b9560-bf6c-de11-be94-00142212c4b1
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@241757 c90b9560-bf6c-de11-be94-00142212c4b1
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@245390 c90b9560-bf6c-de11-be94-00142212c4b1
…sections in setup.xml, if any) - Moved the intro (the giant table) to book.xml - Changed the intro ID from <extname>.intro to intro.<extname> - Moved the constants entity to book.xml - Changed constants.xml to be an appendix - Moed the requirements/installation/resources sections to setup.xml

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@248726 c90b9560-bf6c-de11-be94-00142212c4b1
…nce.xml See the following bug report for details: http://bugs.php.net/44736

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@260480 c90b9560-bf6c-de11-be94-00142212c4b1
… # Originally from the following location (although modified): # phpdoc/phpbook/phpbook-xsl/version.xml

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@268000 c90b9560-bf6c-de11-be94-00142212c4b1
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@270190 c90b9560-bf6c-de11-be94-00142212c4b1
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@283811 c90b9560-bf6c-de11-be94-00142212c4b1
…ill using this, after discussion on the phpdoc list. From now on, manual.ced will need to be found at ~/.phpdoc/manual.ced.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@288721 c90b9560-bf6c-de11-be94-00142212c4b1
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@294386 c90b9560-bf6c-de11-be94-00142212c4b1
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297028 c90b9560-bf6c-de11-be94-00142212c4b1
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297058 c90b9560-bf6c-de11-be94-00142212c4b1
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@297077 c90b9560-bf6c-de11-be94-00142212c4b1
olivierhill and others added 23 commits April 30, 2014 12:55
…ntent change, but some revision numbers will upgrade.

See https://github.com/phpdocbrbridge/bridge/blob/master/src/revbumper.php for automatic tool for translations.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@342988 c90b9560-bf6c-de11-be94-00142212c4b1
Patch provided by Laurent B.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@344977 c90b9560-bf6c-de11-be94-00142212c4b1
Patch contributed by Benjamin Morel <benjamin.morel@gmail.com>.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@350988 c90b9560-bf6c-de11-be94-00142212c4b1
We do not xi:include core INI settings, since we want to keep
alphabetic sort order (well, roughly at least).

We do add xi:fallback elements to all xi:includes, just in case.
Performed via a bash script which can be found on PR GH-3140

Closes GH-3140

Co-authored-by: haszi <haszika80@gmail.com>
Co-authored-by: haszi <haszika80@gmail.com>
@jordikroon

Copy link
Copy Markdown
Member Author

@lacatoire since you were planning to migrate a few extensions. This should be the way forward so we don't lose credibility towards contributors.

@jordikroon

jordikroon commented Aug 5, 2026

Copy link
Copy Markdown
Member Author

Okay scrap this. While it works, it's not practical for all extensions. It's best to migrate all the extensions at once code-wise. Without creating a PR.
Why, because it would preserve history without us either squashing.

If we were to use PRs and allow to merge with commits preserved, it would create a lot of duplicates as well.
So my approach would be as follows:

So the steps would be:

  • Agree on the final list (see RFC, but let's double check)
  • Migrate these extensions here
  • Run docbook-cs on them
  • Fix and migrate DTD entities to XML entities

CC @lacatoire, @alfsb and @NickSdot

@lacatoire

Copy link
Copy Markdown
Member

Okay scrap this. While it works, it's not practical for all extensions. It's best to migrate all the extensions at once code-wise. Without creating a PR. Why, because it would preserve history without us either squashing.

If we were to use PRs and allow to merge with commits preserved, it would create a lot of duplicates as well. So my approach would be as follows:

So the steps would be:

* Agree on the final list (see RFC, but let's double check)

* Migrate these extensions here

* Run docbook-cs on them

* Fix and migrate DTD entities to XML entities

CC @lacatoire, @alfsb and @NickSdot

Damn, i was in the middle of doing them all of mine

@lacatoire

Copy link
Copy Markdown
Member

@jordikroon i let you do this, don't have the permission to do it

@alfsb

alfsb commented Aug 5, 2026

Copy link
Copy Markdown
Member

Why, because it would preserve history without us either squashing.

There is also "Rebase and merge", no squash involved. In theory, there will be no file conflicts, as extensions are imported per directory. But Commit Date is updated, AFAIK.

If we were to use PRs and allow to merge with commits preserved, it would create a lot of duplicates as well. So my approach would be as follows:

Duplication of hashes, duplication of contents, both?

In theory, doing per directory imports, direct in master and outside PRs, will allow using --committer-date-is-author-date, both in git am and git rebase, so each file name will show the correct chronology, even if the repository itself will have a non-linear chronology.

But as there are many transversal commits, that change many files in many directories, the only way I know to have a fully consistent chronological order at repository level is to make the import in one go.

That said, fixing everything in one go, while tempting, may not be viable. Possibly many "main manual" entities will need to be created, with different contents, and that will be a piecewise process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.