From 9e2c690cbd2e3b39ebb5e43dfdbffa9bc1953b36 Mon Sep 17 00:00:00 2001
From: Richard Kuhnt <r15ch13+git@gmail.com>
Date: Thu, 17 Jan 2019 18:34:27 +0100
Subject: [PATCH] php & php-nts: fix persistence

See #2897
---
 php-nts.json | 15 +++++----------
 php.json     | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/php-nts.json b/php-nts.json
index bd78d2c82c..ecfd24f993 100644
--- a/php-nts.json
+++ b/php-nts.json
@@ -1,5 +1,5 @@
 {
-    "homepage": "http://windows.php.net",
+    "homepage": "https://windows.php.net/",
     "license": {
         "identifier": "PHP-3.01",
         "url": "https://secure.php.net/license/"
@@ -30,18 +30,13 @@
     "env_set": {
         "PHP_INI_SCAN_DIR": "$dir\\cli;$dir\\cli\\conf.d;"
     },
-    "post_install": [
-        "# Copy ini scan dir from old location before persistent update",
-        "if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$dir\\cli\\conf.d\")) {",
-        "    Write-Host -ForegroundColor Cyan \"We are moving your php configuration to $dir\\cli\\conf.d\"",
-        "    Move-Item \"$dir\\..\\conf\" \"$dir\\cli\\conf.d\"",
-        "}",
-        "",
+    "pre_install": [
         "# Create directory for custom PHP configuration",
         "if (!(Test-Path \"$dir\\cli\\conf.d\")) {",
         "    (New-Item -Type directory \"$dir\\cli\\conf.d\") | Out-Null",
-        "}",
-        "",
+        "}"
+    ],
+    "post_install": [
         "# Enable extensions to be found in installation-relative folder (the default is to search C:/php)",
         "(gc \"$dir\\cli\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\cli\\php.ini\""
     ],
diff --git a/php.json b/php.json
index 0e86a83a50..a797973350 100644
--- a/php.json
+++ b/php.json
@@ -1,5 +1,5 @@
 {
-    "homepage": "http://windows.php.net",
+    "homepage": "https://windows.php.net/",
     "license": {
         "identifier": "PHP-3.01",
         "url": "https://secure.php.net/license/"
@@ -30,18 +30,13 @@
     "env_set": {
         "PHP_INI_SCAN_DIR": "$dir\\cli;$dir\\cli\\conf.d;"
     },
-    "post_install": [
-        "# Copy ini scan dir from old location before persistent update",
-        "if ((Test-Path \"$dir\\..\\conf\") -and !(Test-Path \"$dir\\cli\\conf.d\")) {",
-        "    Write-Host -ForegroundColor Cyan \"We are moving your php configuration to $dir\\cli\\conf.d\"",
-        "    Move-Item \"$dir\\..\\conf\" \"$dir\\cli\\conf.d\"",
-        "}",
-        "",
+    "pre_install": [
         "# Create directory for custom PHP configuration",
         "if (!(Test-Path \"$dir\\cli\\conf.d\")) {",
         "    (New-Item -Type directory \"$dir\\cli\\conf.d\") | Out-Null",
-        "}",
-        "",
+        "}"
+    ],
+    "post_install": [
         "# Enable extensions to be found in installation-relative folder (the default is to search C:/php)",
         "(gc \"$dir\\cli\\php.ini\") | % { $_ -replace '; extension_dir = \"ext\"', 'extension_dir = \"ext\"' } | sc \"$dir\\cli\\php.ini\""
     ],