From 14a023d5169c2a2c6ee329bcda230ae7f8c3c237 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo <eduardocesb@fb.com>
Date: Wed, 27 Apr 2022 11:44:53 -0300
Subject: [PATCH 1/5] Add PHP built in for MacOS

---
 build.sh                          | 26 +++++++++++++++++++++-----
 src/js/utils/preview-webserver.js | 12 ++++++++++--
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/build.sh b/build.sh
index 5a7045f..f87eedd 100755
--- a/build.sh
+++ b/build.sh
@@ -18,15 +18,31 @@ message "Downloading PHP binaries for Windows..."
 rm -Rf bin
 mkdir bin
 cd bin
-curl -o php.zip https://windows.php.net/downloads/releases/archives/php-7.4.9-Win32-vc15-x86.zip
+mkdir php
+cd php
+curl -o php-win32.zip https://windows.php.net/downloads/releases/archives/php-7.4.9-Win32-vc15-x86.zip
 message "Extracting PHP binary..."
-unzip php.zip -d ./php
-rm php.zip
+unzip php-win32.zip -d ./win32
+rm php-win32.zip
 message "PHP binary extracted"
-cp ../php.ini ./php/php.ini
+cp ../../php.ini ./win32/php.ini
 
-message "Installing PHP dependencies..."
+message "Downloading PHP binaries for Mac..."
+curl --insecure --show-error --location --globoff https://github.com/php/php-src/archive/refs/tags/php-7.4.29.tar.gz | tar -zx
+message "PHP source code downloaded"
+cd php-src-php-7.4.29
+message "Configuring PHP source code..."
+./buildconf --force
+mkdir ../darwin
+./configure --prefix=$(pwd)/../darwin --enable-shared=no --enable-static=yes --without-iconv --without-sqlite3 -with-openssl=$(which openssl)
+message "Installing PHP binaries for Mac..."
+make -j8
+make install
 cd ..
+rm -r -f php-src-php-7.4.29
+
+message "Installing PHP dependencies..."
+cd ../../
 cd webserver
 composer install
 message "PHP dependencies installed"
diff --git a/src/js/utils/preview-webserver.js b/src/js/utils/preview-webserver.js
index 431b23f..631503a 100644
--- a/src/js/utils/preview-webserver.js
+++ b/src/js/utils/preview-webserver.js
@@ -46,9 +46,17 @@ class PreviewWebserver {
       this.phpServer.server({
         port: this.port,
         base: path.resolve(__dirname) + '/../../../webserver',
-        bin: path.resolve(__dirname) + '/../../../bin/php/php.exe',
+        bin: path.resolve(__dirname) + '/../../../bin/php/win32/php.exe',
       });
-    } else {
+    } else if (process.platform === 'darwin'){
+      var x = this.phpServer.server({
+        port: this.port,
+        base: path.resolve(__dirname) + '/../../../webserver',
+        bin: path.resolve(__dirname) + '/../../../bin/php/darwin/bin/php',
+      });
+    }
+    else
+    {
       this.phpServer.server({
         port: this.port,
         base: path.resolve(__dirname) + '/../../../webserver',

From 85906ae96af8a766ede25e39f801503d2cffeea8 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo <eduardocesb@fb.com>
Date: Wed, 27 Apr 2022 13:01:17 -0300
Subject: [PATCH 2/5] Remove unused variable

---
 src/js/utils/preview-webserver.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/utils/preview-webserver.js b/src/js/utils/preview-webserver.js
index 631503a..f7abaab 100644
--- a/src/js/utils/preview-webserver.js
+++ b/src/js/utils/preview-webserver.js
@@ -49,7 +49,7 @@ class PreviewWebserver {
         bin: path.resolve(__dirname) + '/../../../bin/php/win32/php.exe',
       });
     } else if (process.platform === 'darwin'){
-      var x = this.phpServer.server({
+      this.phpServer.server({
         port: this.port,
         base: path.resolve(__dirname) + '/../../../webserver',
         bin: path.resolve(__dirname) + '/../../../bin/php/darwin/bin/php',

From 4967b337440e6c641cb01cf85497757d1b18867f Mon Sep 17 00:00:00 2001
From: Carlos Eduardo <eduardocesb@fb.com>
Date: Wed, 27 Apr 2022 14:50:00 -0300
Subject: [PATCH 3/5] Update electron version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6f94252..15de84b 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "devtron": "^1.4.0",
-    "electron": "^11.3.0",
+    "electron": "^11.5.0",
     "electron-packager": "^15.2.0",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-15": "^1.4.1",

From ee85aae5e8832c41954e8530318d2910e79f5830 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo <eduardocesb@fb.com>
Date: Fri, 13 May 2022 21:44:15 -0300
Subject: [PATCH 4/5] chore: compile PHP without 'pdo-sqlite'

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index f87eedd..9c82a8b 100755
--- a/build.sh
+++ b/build.sh
@@ -34,7 +34,7 @@ cd php-src-php-7.4.29
 message "Configuring PHP source code..."
 ./buildconf --force
 mkdir ../darwin
-./configure --prefix=$(pwd)/../darwin --enable-shared=no --enable-static=yes --without-iconv --without-sqlite3 -with-openssl=$(which openssl)
+./configure --prefix=$(pwd)/../darwin --enable-shared=no --enable-static=yes --without-iconv --without-pdo-sqlite --without-sqlite3 -with-openssl=$(which openssl)
 message "Installing PHP binaries for Mac..."
 make -j8
 make install

From 31a65411e542ee242667401f77ab2663b0c7e3e9 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo <eduardocesb@fb.com>
Date: Mon, 16 May 2022 10:40:35 -0300
Subject: [PATCH 5/5] chore: ignoring malformed package json file due an issue
 in the flow

---
 .flowconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.flowconfig b/.flowconfig
index cba8a52..91dd1a3 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -3,6 +3,7 @@
 .*/electron-packager/test/.*
 .*/webserver/*
 .*/build/*
+.*/**/malformed_package_json/package.json
 
 [include]
 node_modules/electron