Skip to content

Commit f684d50

Browse files
authored
Merge branch 'master' into include-fail
2 parents f355717 + 2a086e4 commit f684d50

File tree

25,659 files changed

+2222922
-2082245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

25,659 files changed

+2222922
-2082245
lines changed

.appveyor.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.circleci/config.yml

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
version: 2.1
2+
3+
jobs:
4+
arm:
5+
resource_class: arm.medium
6+
docker:
7+
- image: cimg/base:current-22.04
8+
- image: mysql:8.3
9+
environment:
10+
MYSQL_ALLOW_EMPTY_PASSWORD: true
11+
MYSQL_ROOT_PASSWORD: ''
12+
MYSQL_DATABASE: test
13+
- image: postgres:16
14+
environment:
15+
POSTGRES_PASSWORD: postgres
16+
POSTGRES_DB: test
17+
environment:
18+
LANGUAGE: ''
19+
LANG: en_US.UTF-8
20+
MYSQL_TEST_HOST: '127.0.0.1'
21+
MYSQL_TEST_PASSWD: ''
22+
MYSQL_TEST_USER: root
23+
PDO_MYSQL_TEST_DSN: 'mysql:host=127.0.0.1;dbname=test'
24+
PDO_MYSQL_TEST_PASS: ''
25+
PDO_MYSQL_TEST_USER: root
26+
PDO_PGSQL_TEST_DSN: 'pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=postgres'
27+
steps:
28+
- checkout
29+
- run:
30+
name: apt
31+
command: |
32+
export DEBIAN_FRONTEND=noninteractive
33+
sudo apt-get update -y
34+
sudo apt-get install -y \
35+
gcc \
36+
g++ \
37+
autoconf \
38+
bison \
39+
re2c \
40+
locales \
41+
locales-all \
42+
ldap-utils \
43+
openssl \
44+
slapd \
45+
libgmp-dev \
46+
libicu-dev \
47+
libtidy-dev \
48+
libenchant-2-dev \
49+
libsasl2-dev \
50+
libxpm-dev \
51+
libzip-dev \
52+
libbz2-dev \
53+
libsqlite3-dev \
54+
libwebp-dev \
55+
libonig-dev \
56+
libcurl4-openssl-dev \
57+
libxml2-dev \
58+
libxslt1-dev \
59+
libpq-dev \
60+
libreadline-dev \
61+
libldap2-dev \
62+
libsodium-dev \
63+
libargon2-0-dev \
64+
libmm-dev \
65+
libsnmp-dev \
66+
snmpd \
67+
`#snmp-mibs-downloader` \
68+
freetds-dev \
69+
`#unixodbc-dev` \
70+
dovecot-core \
71+
dovecot-pop3d \
72+
dovecot-imapd \
73+
sendmail \
74+
firebird-dev \
75+
liblmdb-dev \
76+
libtokyocabinet-dev \
77+
libdb-dev \
78+
libqdbm-dev \
79+
libjpeg-dev \
80+
libpng-dev \
81+
libfreetype6-dev
82+
- run:
83+
name: ./configure
84+
command: |
85+
./buildconf -f
86+
./configure \
87+
--enable-debug \
88+
--enable-zts \
89+
--enable-option-checking=fatal \
90+
--prefix=/usr \
91+
--enable-phpdbg \
92+
--enable-fpm \
93+
--with-pdo-mysql=mysqlnd \
94+
--with-mysqli=mysqlnd \
95+
--with-pgsql \
96+
--with-pdo-pgsql \
97+
--with-pdo-sqlite \
98+
--enable-intl \
99+
--without-pear \
100+
--enable-gd \
101+
--with-jpeg \
102+
--with-webp \
103+
--with-freetype \
104+
--with-xpm \
105+
--enable-exif \
106+
--with-zip \
107+
--with-zlib \
108+
--enable-soap \
109+
--enable-xmlreader \
110+
--with-xsl \
111+
--with-tidy \
112+
--enable-sysvsem \
113+
--enable-sysvshm \
114+
--enable-shmop \
115+
--enable-pcntl \
116+
--with-readline \
117+
--enable-mbstring \
118+
--with-curl \
119+
--with-gettext \
120+
--enable-sockets \
121+
--with-bz2 \
122+
--with-openssl \
123+
--with-gmp \
124+
--enable-bcmath \
125+
--enable-calendar \
126+
--enable-ftp \
127+
--with-enchant=/usr \
128+
--enable-sysvmsg \
129+
--with-ffi \
130+
--enable-zend-test \
131+
--enable-dl-test=shared \
132+
--with-ldap \
133+
--with-ldap-sasl \
134+
--with-password-argon2 \
135+
--with-mhash \
136+
--with-sodium \
137+
--enable-dba \
138+
--with-cdb \
139+
--enable-flatfile \
140+
--enable-inifile \
141+
--with-tcadb \
142+
--with-lmdb \
143+
--with-qdbm \
144+
--with-snmp \
145+
`#--with-unixODBC` \
146+
`#--with-pdo-odbc=unixODBC,/usr` \
147+
--with-config-file-path=/etc \
148+
--with-config-file-scan-dir=/etc/php.d \
149+
--with-pdo-firebird \
150+
`#--with-pdo-dblib` \
151+
--disable-phpdbg \
152+
`#--enable-werror`
153+
- run:
154+
name: make
155+
no_output_timeout: 30m
156+
command: make -j2 > /dev/null
157+
- run:
158+
name: make install
159+
command: |
160+
sudo make install
161+
sudo mkdir -p /etc/php.d
162+
sudo chmod 777 /etc/php.d
163+
echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
164+
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
165+
- run:
166+
name: Test
167+
no_output_timeout: 30m
168+
command: |
169+
sapi/cli/php run-tests.php \
170+
-d opcache.enable_cli=1 \
171+
-d opcache.jit_buffer_size=64M \
172+
-d opcache.jit=tracing \
173+
-d zend_test.observer.enabled=1 \
174+
-d zend_test.observer.show_output=0 \
175+
-P -q -x -j2 \
176+
-g FAIL,BORK,LEAK,XLEAK \
177+
--no-progress \
178+
--offline \
179+
--show-diff \
180+
--show-slow 1000 \
181+
--set-timeout 120 \
182+
--repeat 2
183+
184+
workflows:
185+
push-workflow:
186+
jobs:
187+
- arm

.editorconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ end_of_line = lf
99
charset = utf-8
1010
tab_width = 4
1111

12-
[{*.{awk,bat,c,cpp,d,h,l,re,skl,w32,y},Makefile*}]
12+
[{*.{awk,bat,c,cpp,d,dasc,h,l,re,skl,w32,y},Makefile*}]
1313
indent_size = 4
1414
indent_style = tab
1515

@@ -32,3 +32,7 @@ max_line_length = 80
3232

3333
[*.patch]
3434
trim_trailing_whitespace = false
35+
36+
[*.rst]
37+
indent_style = space
38+
max_line_length = 100

0 commit comments

Comments
 (0)