Skip to content

Commit 608dc3e

Browse files
committed
Merge branch 'master' of github.com:mevdschee/php-crud-api
2 parents 2e73e1a + 479ce82 commit 608dc3e

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ These implementations are a proof-of-concept and do only support basic REST CRUD
2424

2525
- PHP 5.3 or higher with MySQLi, libpq, SQLSRV or sqlite3 enabled (PHP 7 recommended)
2626
- PHP on Windows when connecting to SQL Server 2012
27-
- MySQL 5.6 or higher for spatial features in MySQL
27+
- MySQL 5.6 / MariaDB 10.0 or higher for spatial features in MySQL
2828
- PostGIS 2.0 or higher for spatial features in PostgreSQL 9.1 or higher
2929

3030
## Installation
@@ -828,13 +828,15 @@ I am testing mainly on Ubuntu and I have the following test setups:
828828

829829
- Ubuntu 12.04 Server with PHP 5.3 and MySQL 5.5 and PostgreSQL 9.1
830830
- Ubuntu 14.04 Server with PHP 5.5 and MySQL 5.5 and PostgreSQL 9.3
831-
- Ubuntu 16.04 Server with PHP 7.0 and MySQL 5.7 and PostgreSQL 9.5
831+
- Ubuntu 16.04 Server with PHP 7.0 and MySQL 5.7 / MariaDB 10.0 and PostgreSQL 9.5
832832
- Debian 7 Server with PHP 5.4 and MySQL 5.5 and PostgreSQL 9.1
833-
- Debian 8 Server with PHP 5.6 and MariaDB 5.5 and PostgreSQL 9.4
834-
- CentOS 7 Server with PHP 5.4 and MySQL 5.5 and PostgreSQL 9.2
833+
- Debian 8 Server with PHP 5.6 and MySQL 5.5 / MariaDB 10.0 and PostgreSQL 9.4
834+
- Debian 9 Server with PHP 7.0 and MySQL 5.5 / MariaDB 10.1 and PostgreSQL 9.6
835+
- CentOS 7 Server with PHP 5.4 and MariaDB 5.5 and PostgreSQL 9.2
835836
- Windows 2012 R2 with PHP 5.6 and SQL Server 2012
836837

837-
This should cover most environments, but please notify me of failing tests and report your environment.
838+
This should cover most environments, but please notify me of failing tests and report your environment.
839+
I will try to cover most of the above setup in the "docker" folder of the project.
838840

839841
### Travis CI
840842

0 commit comments

Comments
 (0)