Fix xdebug and pcov on PHP7.4 and restructre code

2025-07-25 08:09:08 +07:00 · 2019-09-28 20:09:05 +05:30
parent eaf140ca8b
commit 2a30f9d208
18 changed files with 329 additions and 268 deletions
--- a/src/configs/config.yaml
+++ b/src/configs/config.yaml
@ -35,15 +35,16 @@ variants:
      - --with-openssl
      - --with-pear
      - --with-zip
-      - --with-zlib-dir=/usr/local/opt/zlib
      - --with-libxml
      - --with-kerberos
      - --with-gd
      - --with-ffi
-      - --with-bz2=/usr/local/opt/bzip2
+      - --with-curl
+      - --with-mhash
      - --with-readline=/usr/local/opt/readline
      - --with-iconv=/usr/local/opt/libiconv
      - --with-icu-dir=/usr/local/opt/icu4c
+      - --with-config-file-path=/etc
      - --enable-intl
      - --enable-xml
      - --enable-sysvsem
@ -54,7 +55,4 @@ variants:
      - --enable-gd
      - --enable-soap
      - --enable-xmlreader
-      - --enable-zend-test=shared
-extensions:
-  dev:
-    xdebug: stable
+      - --enable-zend-test=shared
--- a/src/features.ts
+++ b/src/features.ts
@ -76,10 +76,10 @@ export async function enableExtensionUnix(
  os_version: string
 ) {
  return (
-    `if [ ! "$(php -m | grep -i ${extension})" ] && [ -e "$ext_dir/php_${extension}.so" ]; then
+    `if [ ! "$(php -m | grep -i ${extension})" ] && [ -e "$ext_dir/${extension}.so" ]; then
  echo "${await utils.getExtensionPrefix(
    extension
-  )}=php_${extension}.so" >> 'php -i | grep "Loaded Configuration" | sed -e "s|.*=>\s*||"'\n` +
+  )}=${extension}" >> 'php -i | grep "Loaded Configuration" | sed -e "s|.*=>\s*||"'\n` +
    (await utils.log('Enabled ' + extension, os_version, 'success')) +
    `;\n elif [ "$(php -m | grep -i ${extension})" ]; then \n` +
    (await utils.log(
@ -109,25 +109,30 @@ export async function addExtensionDarwin(
    script += await enableExtensionUnix(extension, 'darwin');
    switch (await pecl.checkPECLExtension(extension)) {
      case true:
-        let extension_version: string = extension;
+        let install_command: string = '';
        switch (version + extension) {
-          case '5.6xdebug':
-            extension_version = 'xdebug-2.5.5';
-            break;
          case '7.4xdebug':
-            extension_version = 'xdebug-2.8.0beta2';
+            install_command =
+              'sh ./xdebug_darwin.sh >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file';
+            break;
+          case '7.4pcov':
+            install_command =
+              'sh ./pcov.sh >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file';
+            break;
+          case '5.6xdebug':
+            install_command = 'sudo pecl install xdebug-2.5.5 >/dev/null 2>&1';
            break;
-          case '7.2xdebug':
          default:
-            extension_version = extension;
+            install_command =
+              'sudo pecl install ' + extension + ' >/dev/null 2>&1';
            break;
        }
        script +=
          'if [ ! "$(php -m | grep -i ' +
          extension +
-          ')" ]; then sudo pecl install ' +
-          extension_version +
-          '  >/dev/null 2>&1 && ' +
+          ')" ]; then ' +
+          install_command +
+          ' && ' +
          (await utils.log(
            'Installed and enabled ' + extension,
            'darwin',
@ -175,37 +180,31 @@ export async function addExtensionWindows(
    extension = extension.toLowerCase();
    // add script to enable extension is already installed along with php
    script += await enableExtensionWindows(extension);
-    let extension_stability: string = '';
-    switch (version) {
-      case '7.4':
-        extension_stability = 'beta';
-        break;
-      case '7.2':
-      default:
-        extension_stability = 'stable';
-        break;
-    }

    switch (await pecl.checkPECLExtension(extension)) {
      case true:
-        let extension_version: string = extension;
+        let install_command: string = '';
        switch (version + extension) {
          case '7.4xdebug':
-            extension_version = 'xdebug -Version 2.8';
+            const extension_url: string =
+              'https://xdebug.org/files/php_xdebug-2.8.0beta2-7.4-vc15.dll';
+            install_command =
+              'Invoke-WebRequest -Uri ' +
+              extension_url +
+              ' -OutFile C:\\tools\\php\\ext\\php_xdebug.dll\n';
+            install_command += 'Enable-PhpExtension xdebug';
            break;
          case '7.2xdebug':
          default:
-            extension_version = extension;
+            install_command = 'Install-PhpExtension ' + extension;
            break;
        }
        script +=
          'if(!(php -m | findstr -i ' +
          extension +
          ')) { ' +
-          'try { Install-PhpExtension ' +
-          extension_version +
-          ' -MinimumStability ' +
-          extension_stability +
+          'try { ' +
+          install_command +
          '\n' +
          (await utils.log(
            'Installed and enabled ' + extension,
@ -254,16 +253,32 @@ export async function addExtensionLinux(
    extension = extension.toLowerCase();
    // add script to enable extension is already installed along with php
    script += await enableExtensionUnix(extension, 'linux');
+
+    let install_command: string = '';
+    switch (version + extension) {
+      case '7.4xdebug':
+        install_command =
+          './xdebug.sh >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file';
+        break;
+      case '7.4pcov':
+        install_command =
+          './pcov.sh >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file';
+        break;
+      default:
+        install_command =
+          'sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
+          version +
+          '-' +
+          extension +
+          ' >/dev/null 2>&1';
+        break;
+    }
    script +=
      'if [ ! "$(php -m | grep -i ' +
      extension +
-      ')" ]; then sudo DEBIAN_FRONTEND=noninteractive apt install -y php' +
-      version +
-      '-' +
-      extension +
-      ' >/dev/null 2>&1 || sudo DEBIAN_FRONTEND=noninteractive apt install -y php-' +
-      extension +
-      ' >/dev/null 2>&1 && ' +
+      ')" ]; then ' +
+      install_command +
+      ' && ' +
      (await utils.log(
        'Installed and enabled ' + extension,
        'linux',
@ -271,13 +286,7 @@ export async function addExtensionLinux(
      )) +
      ' || ' +
      (await utils.log(
-        'Could not find php-' +
-          extension +
-          ' or php' +
-          version +
-          '-' +
-          extension +
-          ' on APT repository',
+        'Could not find php' + version + '-' + extension + ' on APT repository',
        'linux',
        'error'
      )) +
@ -334,15 +343,13 @@ export async function addCoverage(
      // if version is 7.1 or newer
      switch (version) {
        default:
-          script += await addExtension(coverage, version, os_version);
+          script += await addExtension('pcov', version, os_version);
          script += await addINIValues('pcov.enabled=1', os_version);

          // add command to disable xdebug and enable pcov
          switch (os_version) {
            case 'linux':
-              script +=
-                "sudo phpdismod xdebug || echo 'xdebug not installed'\n";
-              script += "sudo phpenmod pcov || echo 'pcov not installed'\n";
+              script += 'sudo sed -i "/xdebug/d" $ini_file\n';
              break;
            case 'darwin':
              script += 'sudo sed -i \'\' "/xdebug/d" $ini_file\n';
@ -373,7 +380,7 @@ export async function addCoverage(
      break;
    //xdebug
    case 'xdebug':
-      script += await addExtension(coverage, version, os_version);
+      script += await addExtension('xdebug', version, os_version);
      script += await utils.log(
        'Xdebug enabled as coverage driver',
        os_version,
--- a/src/install.ts
+++ b/src/install.ts
@ -27,7 +27,7 @@ async function run() {
      darwin += await features.addINIValues(ini_values_csv, os_version);
      darwin += await features.addCoverage(coverage, version, os_version);
      await utils.writeScript('darwin.sh', version, darwin);
-      await exec('sh -x ./' + version + 'darwin.sh ' + version);
+      await exec('sh ./' + version + 'darwin.sh ' + version);
    } else if (os_version == 'win32') {
      let windows: string = await utils.readScript(
        'win32.ps1',
--- a/src/scripts/7.4.sh
+++ b/src/scripts/7.4.sh
@ -1,7 +1,7 @@
-brew install pkg-config autoconf bison re2c openssl krb5 bzip2 enchant libffi libpng webp freetype intltool icu4c libiconv zlib t1lib gd libzip gmp tidyp libxml2 libxslt postgresql >/dev/null 2>&1
-brew link icu4c gettext --force >/dev/null 2>&1
+brew install pkg-config autoconf bison re2c openssl@1.1 krb5 bzip2 enchant libffi libpng webp freetype intltool icu4c libiconv zlib t1lib gd libzip gmp tidyp libxml2 libxslt postgresql curl mhash mcrypt >/dev/null 2>&1
+brew link icu4c gettext bzip2 --force >/dev/null 2>&1

-for package in gettext gmp bzip2 krb5 icu4c bison openssl libxml2 libffi libxslt libiconv pkgconfig enchant krb5 readline libedit freetype;
+for package in gettext gmp zlib bzip2 krb5 icu4c bison openssl@1.1 libxml2 libffi libxslt libiconv pkgconfig enchant krb5 readline libedit freetype;
 do
  caps_package=$(echo "$package" | tr '[:lower:]' '[:upper:]')
  {
@ -18,17 +18,16 @@ echo 'export LIBXML_LIBS="-L/usr/local/opt/libxml2/lib"'
 echo 'export LIBXML_CFLAGS="-I/usr/local/opt/libxml2/include"'
 echo 'export ICU_LIBS="-L/usr/local/opt/icu4c/lib"'
 echo 'export ICU_CFLAGS="-I/usr/local/opt/icu4c/include"'
-echo 'export OPENSSL_LIBS="-L/usr/local/Cellar/openssl/1.0.2s/lib -lcrypto"'
-echo 'export OPENSSL_CFLAGS="-I/usr/local/Cellar/openssl/1.0.2s/include"'
-echo 'export OPENSSL_ROOT_DIR="/usr/local/opt/openssl"'
-echo 'export OPENSSL_LIB_DIR="/usr/local/opt/openssl/lib"'
-echo 'export OPENSSL_INCLUDE_DIR="/usr/local/opt/openssl/include"'
-echo 'export PKG_CONFIG_PATH="/usr/local/Cellar/openssl/1.0.2s/lib/pkgconfig:$PKG_CONFIG_PATH"'
+echo 'export OPENSSL_LIBS="-L/usr/local/opt/openssl@1.1/lib -lcrypto"'
+echo 'export OPENSSL_CFLAGS="-I/usr/local/opt/openssl@1.1/include"'
+echo 'export OPENSSL_ROOT_DIR="/usr/local/opt/openssl@1.1/"'
+echo 'export OPENSSL_LIB_DIR="/usr/local/opt/openssl@1.1/lib"'
+echo 'export OPENSSL_INCLUDE_DIR="/usr/local/opt/openssl@1.1/include"'
 echo 'export PKG_CONFIG="/usr/local/opt/pkgconfig/bin/pkg-config"'
 echo 'export EXTRA_LIBS="/usr/local/opt/readline/lib/libhistory.dylib
 /usr/local/opt/readline/lib/libreadline.dylib
-/usr/local/opt/openssl/lib/libssl.dylib
-/usr/local/opt/openssl/lib/libcrypto.dylib
+/usr/local/opt/openssl@1.1/lib/libssl.dylib
+/usr/local/opt/openssl@1.1/lib/libcrypto.dylib
 /usr/local/opt/icu4c/lib/libicudata.dylib
 /usr/local/opt/icu4c/lib/libicui18n.dylib
 /usr/local/opt/icu4c/lib/libicuio.dylib
@ -36,25 +35,26 @@ echo 'export EXTRA_LIBS="/usr/local/opt/readline/lib/libhistory.dylib
 /usr/local/opt/icu4c/lib/libicuuc.dylib"'
 } >> ~/.bash_profile
 config_file=$(pwd)/config.yaml
-cd ~ || echo "could not move to ~"
 curl -L -O https://github.com/phpbrew/phpbrew/raw/master/phpbrew >/dev/null 2>&1
 chmod +x ./phpbrew
 sudo mv phpbrew /usr/local/bin/phpbrew
 sudo mkdir -p /opt/phpbrew
+sudo mkdir -p /usr/local/lib
+sudo mkdir -p /usr/local/bin
 sudo phpbrew init --root=/opt/phpbrew --config="$config_file" >/dev/null 2>&1
 sudo chmod -R 777 /opt/phpbrew
 export PHPBREW_ROOT=/opt/phpbrew
 export PHPBREW_HOME=/opt/phpbrew
-echo "[[ -e ~/.phpbrew/bash_profile ]] && source ~/.phpbrew/bash_profile" >> ~/.bash_profile
+echo "[[ -e ~/.phpbrew/bashrc ]] && source ~/.phpbrew/bashrc" >> ~/.bashrc
 source ~/.bash_profile >/dev/null 2>&1
-sudo mkdir -p /usr/local/lib
-phpbrew install -j 4 7.4.0RC2 +dev
-phpbrew switch php-7.4.0RC2
-phpbrew ext install +dev >/dev/null 2>&1
+source ~/.bashrc >/dev/null 2>&1
+phpbrew install -j 10 7.4.0RC3 +dev
+phpbrew switch 7.4.0RC3
 sudo mkdir -p /usr/local/bin
-sudo ln -sf /opt/phpbrew/php/php-7.4.0RC2/bin/* /usr/local/bin/
+sudo ln -sf /opt/phpbrew/php/php-7.4.0RC3/bin/* /usr/local/bin/
+sudo ln -sf /opt/phpbrew/php/php-7.4.0RC3/etc/php.ini /etc/php.ini
 ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
-pecl config-set php_ini $ini_file
-ext_dir=$(php -i | grep "extension_dir => /usr" | sed -e "s|.*=> s*||")
+ext_dir=$(php -i | grep "extension_dir => /opt" | sed -e "s|.*=> s*||")
+pecl config-set php_ini "$ini_file"
 sudo chmod 777 "$ini_file"
 brew install composer
--- a/src/scripts/darwin.sh
+++ b/src/scripts/darwin.sh
--- a/src/scripts/linux.sh
+++ b/src/scripts/linux.sh
@ -4,6 +4,11 @@ if [ "$version" != "$1" ]; then
 		sudo DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:ondrej/php -y >/dev/null 2>&1
 		sudo DEBIAN_FRONTEND=noninteractive apt update -y >/dev/null 2>&1
 		sudo DEBIAN_FRONTEND=noninteractive apt install -y php"$1" curl php"$1"-curl >/dev/null 2>&1
+		if [ "$1" != "7.4" ]; then
+		  sudo DEBIAN_FRONTEND=noninteractive apt install -y php"$1" curl php"$1"-curl >/dev/null 2>&1
+		else
+		  sudo DEBIAN_FRONTEND=noninteractive apt install -y php"$1" php"$1"-dev curl php"$1"-curl >/dev/null 2>&1
+		fi
 	fi
 	for tool in php phar phar.phar php-cgi php-config phpize; do
 		if [ -e "/usr/bin/$tool$1" ]; then
--- a/src/scripts/pcov.sh
+++ b/src/scripts/pcov.sh
@ -0,0 +1,7 @@
+git clone --depth=1 https://github.com/krakjoe/pcov.git
+(
+cd pcov && phpize
+./configure --enable-pcov
+make
+sudo make install
+)
--- a/src/scripts/win32.ps1
+++ b/src/scripts/win32.ps1
--- a/src/scripts/xdebug.sh
+++ b/src/scripts/xdebug.sh
@ -0,0 +1,5 @@
+git clone --depth=1 https://github.com/xdebug/xdebug.git
+(
+  cd xdebug || echo "cd failed"
+  sudo ./rebuild.sh
+)
--- a/src/scripts/xdebug_darwin.sh
+++ b/src/scripts/xdebug_darwin.sh
@ -0,0 +1,8 @@
+git clone --depth=1 https://github.com/xdebug/xdebug.git
+(
+  cd xdebug || echo "cd failed"
+  sudo phpize
+  sudo ./configure
+  sudo make
+  sudo cp modules/xdebug.so "$(php -i | grep "extension_dir => /opt" | sed -e "s|.*=> s*||")"
+)
--- a/src/utils.ts
+++ b/src/utils.ts
@ -32,6 +32,19 @@ export async function asyncForEach(
  }
 }

+/**
+ * Copy config
+ *
+ * @param files
+ */
+export async function readFiles74(files: Array<string>) {
+  await asyncForEach(files, function(filename: string) {
+    fs.createReadStream(path.join(__dirname, '../src/' + filename)).pipe(
+      fs.createWriteStream(filename.split('/')[1], {mode: 0o755})
+    );
+  });
+}
+
 /**
 * Read the scripts
 *
@ -48,21 +61,40 @@ export async function readScript(
    case 'darwin':
      switch (version) {
        case '7.4':
-          fs.createReadStream(path.join(__dirname, '../src/config.yaml')).pipe(
-            fs.createWriteStream('config.yaml')
+          await readFiles74([
+            'configs/config.yaml',
+            'scripts/xdebug_darwin.sh',
+            'scripts/pcov.sh'
+          ]);
+          return fs.readFileSync(
+            path.join(__dirname, '../src/scripts/7.4.sh'),
+            'utf8'
          );
-          return fs.readFileSync(path.join(__dirname, '../src/7.4.sh'), 'utf8');
        case '7.3':
        default:
          return fs.readFileSync(
-            path.join(__dirname, '../src/' + filename),
+            path.join(__dirname, '../src/scripts/' + filename),
+            'utf8'
+          );
+      }
+    case 'linux':
+      switch (version) {
+        case '7.4':
+          await readFiles74(['scripts/xdebug.sh', 'scripts/pcov.sh']);
+          return fs.readFileSync(
+            path.join(__dirname, '../src/scripts/' + filename),
+            'utf8'
+          );
+        case '7.3':
+        default:
+          return fs.readFileSync(
+            path.join(__dirname, '../src/scripts/' + filename),
            'utf8'
          );
      }
    case 'win32':
-    case 'linux':
      return fs.readFileSync(
-        path.join(__dirname, '../src/' + filename),
+        path.join(__dirname, '../src/scripts/' + filename),
        'utf8'
      );
    default:
@ -96,12 +128,18 @@ export async function writeScript(
 export async function extensionArray(
  extension_csv: string
 ): Promise<Array<string>> {
-  return extension_csv.split(',').map(function(extension: string) {
-    return extension
-      .trim()
-      .replace('php-', '')
-      .replace('php_', '');
-  });
+  switch (extension_csv) {
+    case '':
+    case ' ':
+      return [];
+    default:
+      return extension_csv.split(',').map(function(extension: string) {
+        return extension
+          .trim()
+          .replace('php-', '')
+          .replace('php_', '');
+      });
+  }
 }

 /**
@ -111,9 +149,15 @@ export async function extensionArray(
 * @constructor
 */
 export async function INIArray(ini_values_csv: string): Promise<Array<string>> {
-  return ini_values_csv.split(',').map(function(ini_value: string) {
-    return ini_value.trim();
-  });
+  switch (ini_values_csv) {
+    case '':
+    case ' ':
+      return [];
+    default:
+      return ini_values_csv.split(',').map(function(ini_value: string) {
+        return ini_value.trim();
+      });
+  }
 }

 export async function log(
@ -136,13 +180,10 @@ export async function log(
      return "Write-Host '" + message + "' -ForegroundColor " + color[log_type];

    case 'linux':
-      return (
-        'echo "\\033[' + unix_color[log_type] + ';1m' + message + '\\033[0m"'
-      );
    case 'darwin':
    default:
      return (
-        'echo -e "\\033[' + unix_color[log_type] + ';1m' + message + '\\033[0m"'
+        'echo "\\033[' + unix_color[log_type] + ';1m' + message + '\\033[0m"'
      );
  }
 }