Procházet zdrojové kódy

Merge branch 'master' of github.com:mevdschee/php-crud-api

Maurits van der Schee před 6 roky
rodič
revize
608dc3eba6
1 změnil soubory, kde provedl 7 přidání a 5 odebrání
  1. 7
    5
      README.md

+ 7
- 5
README.md Zobrazit soubor

@@ -24,7 +24,7 @@ These implementations are a proof-of-concept and do only support basic REST CRUD
24 24
 
25 25
   - PHP 5.3 or higher with MySQLi, libpq, SQLSRV or sqlite3 enabled (PHP 7 recommended)
26 26
   - 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
28 28
   - PostGIS 2.0 or higher for spatial features in PostgreSQL 9.1 or higher
29 29
 
30 30
 ## Installation
@@ -828,13 +828,15 @@ I am testing mainly on Ubuntu and I have the following test setups:
828 828
 
829 829
   - Ubuntu 12.04 Server with PHP 5.3 and MySQL 5.5 and PostgreSQL 9.1
830 830
   - 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
832 832
   - 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
835 836
   - Windows 2012 R2 with PHP 5.6 and SQL Server 2012
836 837
 
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.
838 840
 
839 841
 ### Travis CI
840 842
 

Loading…
Zrušit
Uložit