Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions .github/workflows/check-whitespace.yml

This file was deleted.

94 changes: 94 additions & 0 deletions .github/workflows/docbook-cs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# https://docs.github.com/en/actions

name: "DocBook Lint"

on:
push:
branches:
- "master"
pull_request:
branches:
- "master"

permissions:
contents: "read"

concurrency:
group: "${{ github.workflow }}-${{ github.ref }}"
cancel-in-progress: true

jobs:
docbook-cs:
name: "DocBook Style Check"
runs-on: "ubuntu-latest"

strategy:
matrix:
language:
- "en"

steps:
- name: "Checkout php/doc-${{ matrix.language }}"
uses: "actions/checkout@v6"
with:
ref: "${{ github.event.pull_request.head.sha }}"
path: "${{ matrix.language }}"
fetch-depth: 50

- name: "Checkout php/doc-base"
uses: "actions/checkout@v6"
with:
path: "doc-base"
repository: "php/doc-base"

- name: "Fetch base branch with merge-base"
working-directory: "${{ matrix.language }}"
run: |
git fetch origin ${{ github.base_ref }} --depth=50
# Deepen until we find the merge-base (handles long-lived PRs)
for i in 1 2 3 4 5; do
if git merge-base origin/${{ github.base_ref }} HEAD >/dev/null 2>&1; then
break
fi
git fetch --deepen=100 origin ${{ github.base_ref }}
done

- name: "Setup PHP"
uses: "shivammathur/setup-php@v2"
with:
php-version: "8.5"
extensions: "dom, libxml, simplexml"
tools: composer:v2, cs2pr:^1.8

- name: "Build documentation"
run: |
php doc-base/configure.php \
--disable-libxml-check \
--enable-xml-details \
--redirect-stderr-to-stdout \
--with-lang=${{ matrix.language }}

- name: "Install docbook-cs"
working-directory: "${{ matrix.language }}"
run: composer require jordikroon/docbook-cs:^1.1

- name: "Run docbook-cs with diff"
working-directory: "${{ matrix.language }}"
run: |
set -o pipefail
git diff origin/${{ github.base_ref }}...HEAD | vendor/bin/docbook-cs \
--report=checkstyle \
--diff \
--no-colors > docbook-report.xml || true

- name: "Upload report"
if: ${{ ! cancelled() }}
uses: "actions/upload-artifact@v7"
with:
name: "docbook-report"
path: "${{ matrix.language }}/docbook-report.xml"

- name: "Annotate PR with violations"
if: ${{ ! cancelled() }}
working-directory: "${{ matrix.language }}"
run: cs2pr docbook-report.xml --colorize --prepend-filename
38 changes: 38 additions & 0 deletions docbookcs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<docbookcs xmlns="https://jordikroon.github.io/docbook-cs/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jordikroon.github.io/docbook-cs/config
https://jordikroon.github.io/docbook-cs/config.xsd">

<project>
<directory alias="doc-en">en</directory>
<directory>doc-base</directory>
</project>

<sniffs>
<sniff class="DocbookCS\Sniff\SimparaSniff" />
<sniff class="DocbookCS\Sniff\ExceptionNameSniff" />
<sniff class="DocbookCS\Sniff\AttributeOrderSniff" />
<sniff class="DocbookCS\Sniff\WhitespaceSniff" />
</sniffs>

<paths>
<path>.</path>
</paths>

<entities>
<file>contributors.ent</file>
<file>extensions.ent</file>
<file>language-defs.ent</file>
<file>language-snippets.ent</file>
<directory>../doc-base/entities/</directory>
<file>../doc-base/temp/file-entities.ent</file>
<directory>../doc-base/temp/file-entities</directory>
</entities>

<exclude>
<pattern>*/wkhtmltox/bits/*</pattern>
<pattern>output/*</pattern>
</exclude>

</docbookcs>
9 changes: 4 additions & 5 deletions faq/com.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<chapter xml:id="faq.com" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<chapter xmlns="http://docbook.org/ns/docbook" xml:id="faq.com" xmlns:xlink="http://www.w3.org/1999/xlink">

Check failure on line 3 in faq/com.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

com.xml: Element <chapter>: xml:id should appear before xmlns attributes.
<title>PHP and COM</title>
<titleabbrev>PHP and COM</titleabbrev>

<para>

Check failure on line 7 in faq/com.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

com.xml: <para> contains only inline content and should be <simpara>.
PHP can be used to access COM and DCOM objects on Win32 platforms.
This should be simpara
</para>

<qandaset>
<qandaentry xml:id="faq.com.q1">
<question>
<para>

Check failure on line 14 in faq/com.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

com.xml: <para> contains only inline content and should be <simpara>.
I have built a DLL to calculate something. Is there any way to run this DLL under PHP?
This also should be simpara
</para>
</question>
<answer>
<para>

Check failure on line 19 in faq/com.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

com.xml: <para> contains only inline content and should be <simpara>.
If this is a simple DLL there is no way yet to run it from PHP. If the DLL contains a COM
server you may be able to access it if it implements the IDispatch interface.
Also this should not be a <classname>ValueError</classname>.

Check failure on line 20 in faq/com.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

com.xml: "ValueError" is wrapped in <classname> but should use <exceptionname>.
</para>
</answer>
</qandaentry>
Expand Down
10 changes: 4 additions & 6 deletions faq/databases.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@
<title>Database issues</title>
<titleabbrev>Database issues</titleabbrev>

<para>

Check failure on line 7 in faq/databases.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

databases.xml: <para> contains only inline content and should be <simpara>.
This section holds common questions about relation between
PHP and databases. Yes, PHP can access virtually any
database available today.
This file has been changed.
</para>

<qandaset>
<qandaentry xml:id="faq.databases.mssql">
<question>
<para>
I heard it's possible to access Microsoft SQL Server from PHP. How?
</para>
<simpara>
This also, but it's correct
</simpara>
</question>
<answer>
<para>
Expand Down
2 changes: 1 addition & 1 deletion faq/installation.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- $Revision$ -->
<chapter xml:id="faq.installation" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<chapter xmlns="http://docbook.org/ns/docbook" xml:id="faq.installation" xmlns:xlink="http://www.w3.org/1999/xlink">

Check failure on line 3 in faq/installation.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

installation.xml: Element <chapter>: xml:id should appear before xmlns attributes.
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>

Expand Down
4 changes: 2 additions & 2 deletions install/pecl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<chapter xml:id="install.pecl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Installation of PECL extensions</title>

Check failure on line 6 in install/pecl.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

pecl.xml: Trailing whitespace detected.
<sect1 xml:id="install.pecl.intro">
<title>Introduction to PECL Installations</title>
&pecl.moving.to.pie;
Expand All @@ -12,7 +12,7 @@
<link xlink:href="&url.php.pear;">PEAR</link>
packaging system.
This section of the manual is intended to demonstrate how to obtain and
install PECL extensions.
install PECL extensions.

Check failure on line 15 in install/pecl.xml

View workflow job for this annotation

GitHub Actions / DocBook Style Check (en)

pecl.xml: Trailing whitespace detected.
</simpara>
<simpara>
These instructions assume <literal>/path/to/php/src/dir/</literal> is the
Expand Down
Loading