Skip to content

Commit 5296272

Browse files
committed
Merge branch 'master' into v4
2 parents bd09d21 + 02752fa commit 5296272

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.travis.yml export-ignore
44
/.appveyor.yml export-ignore
55
/.travis.yml export-ignore
6+
/.vscode export-ignore
67
/codecov.yml export-ignore
78
/examples export-ignore
89
/phpunit.xml.dist export-ignore

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# **ezsql**
22

3-
[![Build Status](https://travis-ci.org/ezSQL/ezSQL.svg?branch=v4)](https://travis-ci.org/ezSQL/ezSQL)
4-
[![Build status](https://ci.appveyor.com/api/projects/status/6s8oqnoxa2i5k04f?svg=true)](https://ci.appveyor.com/project/jv2222/ezsql)
5-
[![codecov](https://codecov.io/gh/ezSQL/ezSQL/branch/v4/graph/badge.svg)](https://codecov.io/gh/ezSQL/ezSQL)
6-
[![Maintainability](https://api.codeclimate.com/v1/badges/0071eb99ab4f5ac5b1f2/maintainability)](https://codeclimate.com/github/ezSQL/ezSQL/maintainability)
3+
[![Build Status](https://travis-ci.org/ezSQL/ezSQL.svg?branch=master)](https://travis-ci.org/ezSQL/ezSQL)[![Build status](https://ci.appveyor.com/api/projects/status/6s8oqnoxa2i5k04f?svg=true)](https://ci.appveyor.com/project/jv2222/ezsql)[![Coverage Status](https://coveralls.io/repos/github/ezSQL/ezSQL/badge.svg?branch=master)](https://coveralls.io/github/ezSQL/ezSQL?branch=master)[![codecov](https://codecov.io/gh/ezSQL/ezSQL/branch/master/graph/badge.svg)](https://codecov.io/gh/ezSQL/ezSQL)[![Maintainability](https://api.codeclimate.com/v1/badges/0071eb99ab4f5ac5b1f2/maintainability)](https://codeclimate.com/github/ezSQL/ezSQL/maintainability)
74

85
***A class to make it very easy to deal with database connections.***
96

@@ -15,7 +12,7 @@ This library has an `Database` class, an combination of the [Factory](https://en
1512

1613
* More Todo...
1714

18-
For an full overview see [documentation Wiki](https://github.com/ezSQL/ezSQL/WIKI.md), which is not completely finish.
15+
For an full overview see [documentation Wiki](https://github.com/ezSQL/ezSQL/wiki/Documentation), which is not completely finish.
1916

2017
## Installation
2118

@@ -106,4 +103,4 @@ prepareOff(); // When off shortcut SQL Methods calls will use vendors escape rou
106103

107104
query_prepared(string $query_string, array $param_array);
108105

109-
**For** **[Authors/Contributors](https://github.com/ezsql/ezsql/CONTRIBUTORS.md)**
106+
**For** **[Authors/Contributors](https://github.com/ezSQL/ezSQL/blob/master/CONTRIBUTORS.md)**

WIKI.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Any articles referencing WordPress database engine is an good source of what kin
156156

157157
Version 4 of this library attempts to, beside all the additional features, _remove some bad coding styles_, _bring the library to modern coding practices of which_, _follow proper __OOP__ and be __PSR__ compliant_.
158158

159-
This version further break things introduced in version 3 that broke version 2.1.7. See [CHANGE LOG](https://github.com/ezsql/ezsql/CHANGELOG.md)
159+
This version further break things introduced in version 3 that broke version 2.1.7. See [CHANGE LOG](https://github.com/ezSQL/ezSQL/blob/master/CHANGELOG.md)
160160

161161
____Installation and Usage____
162162
---

_config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@ include:
1111
- CODE_OF_CONDUCT.md
1212
- ISSUE_TEMPLATE.md
1313
- PULL_REQUEST_TEMPLATE.md
14+
15+
theme: jekyll-theme-architect

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
- mssql2014
1818
- mysql
1919
- postgresql
20-
20+
2121
## Set up environment variables
2222
init:
2323
- SET PATH=C:\Program Files\OpenSSL;c:\tools\php;C:\Program Files\PostgreSQL\9.4\bin\;%PATH%

0 commit comments

Comments
 (0)