Merge pull request #15 from klimslim/BR-8634

[BR-8634] – update basedir for PHP 8.0

Author: kadunuthula-sugarcrm

.travis.yml

@@ -1,12 +1,11 @@
 language: php
 sudo: yes
-dist: trusty
+dist: bionic
 
 env:
-  - PHPVER="5.4.29"
-  - PHPVER="5.6.26"
-  - PHPVER="7.0.14"
-  - PHPVER="7.1.0"
+  - PHPVER="7.3.14"
+  - PHPVER="7.4.2"
+  - PHPVER="8.0.0"
 
 # This replaces the travis supplied phpbuild which defaults to ZTS enabled
 # builds.  Since we are replacing using the same config, we don't have to add
@@ -15,10 +14,9 @@ install:
   - rm -rf ~/.phpenv
   - sudo apt-get clean
   - sudo apt-get update
-  - sudo apt-get purge --auto-remove mysql-client-5.6 mysql-client-core-5.6 mysql-server-5.6 mysql-server-core-5.6
+  - sudo apt-get purge --auto-remove mysql-client-5.7 mysql-client-core-5.7 mysql-server-5.7 mysql-server-core-5.7
   - sudo rm -rf /var/lib/mysql
-  - sudo apt-get build-dep php5
-  - sudo apt-get install git libmcrypt-dev libreadline-dev
+  - sudo apt-get install libzip-dev libonig-dev
   - curl -L http://git.io/phpenv-installer | bash
   - travis_wait phpenv install "${PHPVER}"
   - phpenv global "${PHPVER}"

Dockerfile

@@ -0,0 +1,39 @@
+FROM amazonlinux:2
+
+ARG PHP_BUILD_DIR=/var/task
+ARG PHP_CONF_DIR=/etc/php.d
+ARG PHP_EXT_DIR=/usr/lib64/php/modules
+
+RUN yum clean all && \
+    yum -y upgrade && \
+    yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
+      https://rpms.remirepo.net/enterprise/remi-release-7.rpm \
+      re2c \
+      yum-utils && \
+    yum-config-manager --disable remi-safe && \
+    yum-config-manager --enable remi-php80 && \
+    yum-config-manager --setopt=remi-php80.priority=10 --save && \
+    yum -y install php-cli php-common php-devel && \
+    yum clean all
+
+#Extension install
+RUN mkdir -p ${PHP_EXT_DIR} && mkdir -p ${PHP_CONF_DIR}
+
+#basedir
+RUN mkdir -p ${PHP_BUILD_DIR}
+RUN cd ${PHP_BUILD_DIR} && \
+    mkdir basedir
+COPY basedir.c basedir/
+COPY cache.php basedir/
+COPY config.m4 basedir/
+COPY php_basedir.h basedir/
+COPY tests basedir/
+RUN cd basedir && \
+    phpize && \
+    ./configure && \
+    make && \
+    make install && \
+    make test && \
+    echo "extension=${PHP_EXT_DIR}/basedir.so" > ${PHP_CONF_DIR}/basedir.ini
+
+ENTRYPOINT ["/usr/bin/php", "--ri", "basedir"]

README.md

@@ -1,5 +1,7 @@
 # SugarCRM Basedir
-
+Build Status
+------------
+[![Build Status](https://app.travis-ci.com/sugarcrm/basedir.svg?branch=master)](https://app.travis-ci.com/sugarcrm/basedir)
 ## Description
 
 The SugarCRM Basedir extension allows you to take take advantage of 
@@ -17,6 +19,11 @@ The basedir module also keeps realpath cache enabled.  Realpath cache is normall
     make
     make install
 
+## Building in docker
+
+    docker build -t basedir .
+    docker run basedir:latest
+
 ## Configuration Documentation
 
 | Parameter | Description |

basedir.c

@@ -211,7 +211,7 @@ PHP_RINIT_FUNCTION(basedir)
 
 		strcpy(new_basedir, SG(request_info).path_translated);
 
-		char *path_info = sapi_getenv("PATH_INFO", sizeof("PATH_INFO")-1 TSRMLS_CC);
+		char *path_info = sapi_getenv("PATH_INFO", sizeof("PATH_INFO")-1);
 
         calculate_basedir(SG(request_info).path_translated, SG(request_info).request_uri, path_info, BASEDIR_G(basedir_uri_component), new_basedir);
 
@@ -254,7 +254,7 @@ static PHP_FUNCTION(basedir_calculate)
    size_t path_len, uri_len, path_info_len, component_len;
 #endif
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssss", &path, &path_len, &uri, &uri_len, &path_info, &path_info_len, &component, &component_len) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssss", &path, &path_len, &uri, &uri_len, &path_info, &path_info_len, &component, &component_len) == FAILURE) {
              return;
     }
 

php_basedir.h

@@ -11,7 +11,7 @@
 extern zend_module_entry basedir_module_entry;
 #define phpext_basedir_ptr &basedir_module_entry
 
-#define PHP_BASEDIR_VERSION "0.1.0"
+#define PHP_BASEDIR_VERSION "1.0.0"
 
 #ifdef PHP_WIN32
 #	define PHP_BASEDIR_API __declspec(dllexport)