Skip to content

Commit ab7b464

Browse files
authored
Merge pull request #3 from php/master
update fork
2 parents 5374acd + 51a305d commit ab7b464

File tree

19,246 files changed

+937231
-1164292
lines changed

Some content is hidden

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

19,246 files changed

+937231
-1164292
lines changed

.appveyor.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
version: "{branch}.build.{build}"
2+
3+
image: Visual Studio 2019
4+
5+
branches:
6+
except:
7+
- PHP-5.6
8+
- PHP-7.0
9+
10+
clone_depth: 64
11+
12+
skip_commits:
13+
files:
14+
- docs/*
15+
- NEWS
16+
- UPGRADING
17+
- UPGRADING.INTERNALS
18+
19+
cache:
20+
- c:\build-cache
21+
22+
environment:
23+
PHP_BUILD_CACHE_BASE_DIR: c:\build-cache
24+
PHP_BUILD_OBJ_DIR: c:\obj
25+
PHP_BUILD_CACHE_SDK_DIR: c:\build-cache\sdk
26+
PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
27+
PHP_BUILD_CRT: vs16
28+
# ext and env setup for tests
29+
#MYSQL_TEST_PASSWD: Password12!
30+
#MYSQL_TEST_USER: root
31+
#PDO_MYSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=root password=Password12!"
32+
#PDO_MYSQL_TEST_USER: root
33+
#PDO_MYSQL_TEST_PASS: Password12!
34+
#PGSQL_TEST_CONNSTR: "host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!"
35+
#PDO_PGSQL_TEST_DSN: "pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=Password12!"
36+
#build permutations
37+
matrix:
38+
- THREAD_SAFE: 0
39+
OPCACHE: 0
40+
PARALLEL: -j2
41+
- THREAD_SAFE: 1
42+
OPCACHE: 1
43+
PARALLEL: -j2
44+
INTRINSICS: AVX
45+
46+
services:
47+
# the setup scripts have to be touched, once some other db version is used
48+
- mysql
49+
- postgresql101
50+
- mssql2017
51+
52+
platform:
53+
- x64
54+
# - x86
55+
56+
build_script:
57+
- appveyor\build.bat
58+
59+
test_script:
60+
- appveyor\test.bat

.editorconfig

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# https://editorconfig.org/
2+
3+
root = true
4+
5+
[*]
6+
trim_trailing_whitespace = true
7+
insert_final_newline = true
8+
end_of_line = lf
9+
charset = utf-8
10+
tab_width = 4
11+
12+
[{*.{awk,bat,c,cpp,d,h,l,re,skl,w32,y},Makefile*}]
13+
indent_size = 4
14+
indent_style = tab
15+
16+
[*.{dtd,html,inc,php,phpt,rng,wsdl,xml,xsd,xsl}]
17+
indent_size = 4
18+
indent_style = space
19+
20+
[*.{ac,m4,sh,yml}]
21+
indent_size = 2
22+
indent_style = space
23+
24+
[*.md]
25+
indent_style = space
26+
max_line_length = 80
27+
28+
[COMMIT_EDITMSG]
29+
indent_size = 4
30+
indent_style = space
31+
max_line_length = 80
32+
33+
[*.patch]
34+
trim_trailing_whitespace = false

0 commit comments

Comments
 (0)