Skip to content

Commit d7ec807

Browse files
authored
Merge pull request #2 from php/master
Pull updates to fork
2 parents ac026a8 + 6b15163 commit d7ec807

File tree

16,600 files changed

+740325
-1000721
lines changed

Some content is hidden

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

16,600 files changed

+740325
-1000721
lines changed

.appveyor.yml

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

.editorconfig

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# https://editorconfig.org/
2+
3+
root = true
4+
5+
[*]
6+
tab_width = 4
7+
8+
[*.{c,h,y,awk,w32,bat,mk,frag,cpp}]
9+
charset = utf-8
10+
end_of_line = lf
11+
indent_size = 4
12+
indent_style = tab
13+
trim_trailing_whitespace = true
14+
insert_final_newline = true
15+
16+
[*.{php,phpt,inc}]
17+
charset = utf-8
18+
end_of_line = lf
19+
indent_size = 4
20+
indent_style = space
21+
trim_trailing_whitespace = true
22+
insert_final_newline = true
23+
24+
[*.{yml,m4,sh}]
25+
charset = utf-8
26+
end_of_line = lf
27+
indent_size = 2
28+
indent_style = space
29+
trim_trailing_whitespace = true
30+
insert_final_newline = true
31+
32+
[*.md]
33+
charset = utf-8
34+
end_of_line = lf
35+
indent_style = space
36+
trim_trailing_whitespace = true
37+
insert_final_newline = true
38+
max_line_length = 80
39+
40+
[COMMIT_EDITMSG]
41+
charset = utf-8
42+
end_of_line = lf
43+
indent_size = 4
44+
indent_style = space
45+
trim_trailing_whitespace = true
46+
insert_final_newline = true
47+
max_line_length = 80

0 commit comments

Comments
 (0)