Merge pull request #452 from cytopia/oracle-support

Fixes #394 Native Oracle Database support for PHP
cytopia · Jan 2, 2019 · 40d9bd1 · 40d9bd1
2 parents 5cc0b54 + 39d1e1e
commit 40d9bd1
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 144 deletions.
diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php
@@ -14,7 +14,7 @@
 
 
 $DEVILBOX_VERSION = 'v0.15';
-$DEVILBOX_DATE = '2018-12-31';
+$DEVILBOX_DATE = '2019-01-02';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

diff --git a/README.md b/README.md
@@ -649,13 +649,15 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
 | mysql          |    ✔    |    ✔    |    🗸    |    🗸    |    🗸    |         |         |         |         |         |
 | mysqli         |    ✔    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | mysqlnd        |         |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
+| oci8           |         |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |
 | openssl        |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | pcntl          |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | pcre           |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | PDO            |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | pdo_dblib      |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | PDO_Firebird   |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | pdo_mysql      |    ✔    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
+| PDO_OCI        |         |         |         |         |         |    d    |    d    |    d    |    d    |    d    |
 | pdo_pgsql      |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | pdo_sqlite     |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | pdo_sqlsrv     |         |         |         |         |         |    d    |    d    |    d    |    d    |         |

diff --git a/cfg/php-startup-7.0/03-oracle-oci8-and-pdo_oci.sh-example b/cfg/php-startup-7.0/03-oracle-oci8-and-pdo_oci.sh-example
diff --git a/cfg/php-startup-7.1/03-oracle-oci8-and-pdo_oci.sh-example b/cfg/php-startup-7.1/03-oracle-oci8-and-pdo_oci.sh-example
diff --git a/cfg/php-startup-7.2/03-oracle-oci8-and-pdo_oci.sh-example b/cfg/php-startup-7.2/03-oracle-oci8-and-pdo_oci.sh-example
diff --git a/cfg/php-startup-7.3/03-oracle-oci8-and-pdo_oci.sh-example b/cfg/php-startup-7.3/03-oracle-oci8-and-pdo_oci.sh-example
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -95,7 +95,7 @@ services:
   # PHP
   # ------------------------------------------------------------
   php:
-    image: devilbox/php-fpm:${PHP_SERVER}-work-0.64
+    image: devilbox/php-fpm:${PHP_SERVER}-work-0.65
     hostname: php
 
     ##

diff --git a/docs/configuration-files/env-file.rst b/docs/configuration-files/env-file.rst
@@ -1201,11 +1201,11 @@ PHP_MODULES_DISABLE
 
 Disable any PHP modules in a comma separated list.
 
-+-------------------------+--------------------------------------+--------------------------------------+
-| Name                    | Allowed values                       | Default value                        |
-+=========================+======================================+======================================+
-| ``PHP_MODULES_DISABLE`` | comma separated list of module names | ``pdo_sqlsrv,sqlsrv,rdkafka,swoole`` |
-+-------------------------+--------------------------------------+--------------------------------------+
++-------------------------+--------------------------------------+---------------------------------------------------+
+| Name                    | Allowed values                       | Default value                                     |
++=========================+======================================+===================================================+
+| ``PHP_MODULES_DISABLE`` | comma separated list of module names | ``oci8,PDO_OCI,pdo_sqlsrv,sqlsrv,rdkafka,swoole`` |
++-------------------------+--------------------------------------+---------------------------------------------------+
 
 Example:
 

diff --git a/env-example b/env-example
@@ -472,7 +472,7 @@ PHP_MODULES_ENABLE=
 ###
 ### PHP_MODULES_DISABLE=xdebug,imagick,swoole
 ###
-PHP_MODULES_DISABLE=pdo_sqlsrv,sqlsrv,rdkafka,swoole
+PHP_MODULES_DISABLE=oci8,PDO_OCI,pdo_sqlsrv,sqlsrv,rdkafka,swoole
 
 
 ###