Skip to content

Commit d7e1c25

Browse files
committed
Merge branch 'release/1.2.3'
2 parents a61047c + d289a0f commit d7e1c25

File tree

4 files changed

+34
-51
lines changed

4 files changed

+34
-51
lines changed

composer.lock

Lines changed: 30 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/conf.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
# Doxygen
2424
subprocess.call('doxygen Doxyfile', shell=True)
2525

26-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
27-
2826
# -- Project information -----------------------------------------------------
2927

3028
project = 'PHP BitArray'
@@ -108,10 +106,7 @@
108106
# a list of builtin themes.
109107
#
110108
#html_theme = 'alabaster'
111-
if not on_rtd: # only import and set the theme if we're building docs locally
112-
import sphinx_rtd_theme
113-
html_theme = 'sphinx_rtd_theme'
114-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
109+
html_theme = 'sphinx_rtd_theme'
115110

116111
from sphinx.highlighting import lexers
117112
from pygments.lexers.web import PhpLexer

docs/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Sphinx>=6.0
2-
sphinx_rtd_theme>=1.2
1+
Sphinx>=7.2
2+
sphinx_rtd_theme>=2.0
33
sphinxcontrib-phpdomain>=0.11
44
breathe>=4.35
55
myst-parser>=2.0

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache" displayDetailsOnTestsThatTriggerDeprecations="true" stopOnDeprecation="true">
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" cacheDirectory=".phpunit.cache">
33
<coverage>
44
<report>
55
<clover outputFile="build/logs/clover.xml"/>

0 commit comments

Comments
 (0)