Skip to content

Commit 5abfa70

Browse files
committed
Merge branch 'v4' into newmaster
2 parents 8153179 + 2c9087d commit 5abfa70

File tree

138 files changed

+6777
-36825
lines changed

Some content is hidden

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

138 files changed

+6777
-36825
lines changed

.gitattributes

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/.gitattributes export-ignore
2+
/.gitignore export-ignore
3+
/.travis.yml export-ignore
4+
/.appveyor.yml export-ignore
5+
/.travis.yml export-ignore
6+
/codecov.yml export-ignore
7+
/examples export-ignore
8+
/phpunit.xml.dist export-ignore
9+
/tests export-ignore
10+
/docs export-ignore
11+
/tmp export-ignore

.gitignore

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/nbproject/private/
22
/nbproject/
3-
~
4-
~*.*
53
*.lock
64
clover.xml
75
*.sqlite
86
*.sqlite3
97
vendor
10-
build/logs/clover.xml
11-
.vscode/settings.json
12-
*.crt
8+
build/
9+
tests/pdo/ez_test.sqlite
10+
tests/sqlite/ez_test.sqlite
11+
tests/sqlite/ez_test.sqlite3
12+
.DS_Store
13+
test.php
1314
*.csr
1415
*.key
15-
test.php
16-
build
16+
*.crt
17+
*.cache
1718
tmp
18-
.phpunit.result.cache

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ language: php
22

33
# Versions of PHP you want your project run with.
44
php:
5-
- 5.6
65
- 7.0
6+
- 7.1
7+
- 7.2
8+
- 7.3
79

810
env:
911
- MYSQL_HOST=127.0.0.1 MYSQL_USER=root
@@ -33,4 +35,6 @@ script:
3335
# fast_finish: If your build fails do not continue trying to build, just stop.
3436
matrix:
3537
allow_failures:
36-
- php: 5.6
38+
- php: 7.0
39+
- php: 7.3
40+

.vscode/settings.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"cSpell.words": [
3+
"AUTOINCREMENT",
4+
"BIGINT",
5+
"LONGTEXT",
6+
"MEDIUMBLOB",
7+
"MEDIUMINT",
8+
"MEDIUMTEXT",
9+
"NCHAR",
10+
"NTEXT",
11+
"NVAR",
12+
"NVARCHAR",
13+
"Postgres",
14+
"SMALLINT",
15+
"TINYBLOB",
16+
"TINYINT",
17+
"TINYTEXT",
18+
"VARBINARY",
19+
"VARBIT",
20+
"VARCHAR",
21+
"autoload",
22+
"codecov",
23+
"ezmysqli",
24+
"ezpdo",
25+
"ezpgsql",
26+
"ezsql",
27+
"ezsqlite",
28+
"ezsqlsvr",
29+
"filebase",
30+
"isfile",
31+
"mysqli",
32+
"pgsql",
33+
"postgresql",
34+
"repo",
35+
"sqlserver",
36+
"sqlsrv",
37+
"tomssql",
38+
"tosql",
39+
"zerofill"
40+
]
41+
}

0 commit comments

Comments
 (0)