From a068b4c81846fbbef2a8d5831ec471e384849508 Mon Sep 17 00:00:00 2001
From: hanshenrik <hans@easy-ad.no>
Date: Sat, 17 Feb 2024 02:20:34 +0100
Subject: [PATCH 1/3] script to format pull requests

usage: make sure your git working dir is clean (like "git reset --hard" clean) and run
php scripts/dev/format_pull_request.php 'https://github.com/php/php-src/pull/13401.diff' > formatted.diff
---
 scripts/dev/format_pull_request.php | 68 +++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 scripts/dev/format_pull_request.php

diff --git a/scripts/dev/format_pull_request.php b/scripts/dev/format_pull_request.php
new file mode 100644
index 0000000000000..54d7c14af888c
--- /dev/null
+++ b/scripts/dev/format_pull_request.php
@@ -0,0 +1,68 @@
+<?php
+declare(strict_types=1);
+error_reporting(E_ALL);
+set_error_handler(function ($errno, $errstr, $errfile, $errline){
+    if(error_reporting() & $errno) {
+        throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
+    }
+});
+$force = array_search('--force', $argv, true);
+if ($force !== false) {
+    unset($argv[$force]);
+    $force = true;
+    $argv = array_values($argv);
+    $argc = count($argv);
+}
+if ($argc !== 2) {
+    ob_start();
+    echo "Usage: php {$argv[0]} [diff-uri]\n";
+    echo "example:\nphp {$argv[0]} " . escapeshellarg('https://github.com/php/php-src/pull/13401.diff') . "\n";
+    fwrite(STDERR, ob_get_clean());
+    exit(1);
+}
+chdir(__DIR__ . '/../../'); // php-src root
+if(!$force){
+    $gitStatus = null;
+    system('git diff --quiet --exit-code', $gitStatus);
+    if($gitStatus !== 0){
+        fwrite(STDERR, "Error: Working directory is not clean according to 'git diff'\n");
+        fwrite(STDERR, "commit your stuff -or- run 'git reset --hard' and try again\n");
+        exit(1);
+    }
+    unset($gitStatus);
+}
+//
+$diff = file_get_contents($argv[1]);
+$diffFileHandle = tmpfile();
+fwrite($diffFileHandle, $diff);
+$diffFilePath = stream_get_meta_data($diffFileHandle)['uri'];
+passthru("git apply " . escapeshellarg($diffFilePath), $ret);
+if($ret !== 0){
+    fwrite(STDERR, "Error: git apply failed with exit code {$ret}\n");
+    passthru("git reset --hard");
+    exit(1);
+}
+$clangFormatOptions = array(
+    // tests on ext/standard/array.c indicate that the clang-format
+    // preset that most closely resembles the php-src coding style is WebKit
+    'BasedOnStyle' => 'WebKit',
+    'UseTab' => 'ForIndentation',
+    // clang-format's support for tabs isn't great, and we have to say "4 spaces" to get 1 tab
+    'IndentWidth' => 4, 
+    'TabWidth' => 4,
+);
+
+$cmd = array(
+    'git diff -U0 --no-color --relative  |',
+    'clang-format-diff -p1 -style=' . escapeshellarg(json_encode($clangFormatOptions)),
+    '-iregex=' . escapeshellarg('.*\.(c|cc|cpp|c\+\+|cxx|h|hh|hpp|h\+\+|h)$'),
+);
+$cmd = implode(' ', $cmd);
+passthru($cmd, $ret);
+if($ret !== 0){
+    fwrite(STDERR, "Error: clang-format-diff failed with exit code {$ret}\n");
+    fwrite(STDERR, "cmd:\n{$cmd}\n");
+    //passthru("git reset --hard");
+    exit(1);
+}
+shell_exec("git reset --hard");

From 649e2617505ee9cb866aa603e419b7115be6486c Mon Sep 17 00:00:00 2001
From: hanshenrik <hans@easy-ad.no>
Date: Sat, 17 Feb 2024 02:37:07 +0100
Subject: [PATCH 2/3] forgot to remove debugging

---
 scripts/dev/format_pull_request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/dev/format_pull_request.php b/scripts/dev/format_pull_request.php
index 54d7c14af888c..682fc9f6376ec 100644
--- a/scripts/dev/format_pull_request.php
+++ b/scripts/dev/format_pull_request.php
@@ -62,7 +62,7 @@
 if($ret !== 0){
     fwrite(STDERR, "Error: clang-format-diff failed with exit code {$ret}\n");
     fwrite(STDERR, "cmd:\n{$cmd}\n");
-    //passthru("git reset --hard");
+    passthru("git reset --hard");
     exit(1);
 }
 shell_exec("git reset --hard");

From 406669a9fa819c7d64e6ee673b0d42512952aed2 Mon Sep 17 00:00:00 2001
From: hanshenrik <hans@easy-ad.no>
Date: Sat, 17 Feb 2024 02:55:29 +0100
Subject: [PATCH 3/3] make sure git-apply-compatible prefix is present

... that was a lot harder than it should have been x.x
---
 scripts/dev/format_pull_request.php | 44 ++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/scripts/dev/format_pull_request.php b/scripts/dev/format_pull_request.php
index 682fc9f6376ec..7b2e23e5ceb79 100644
--- a/scripts/dev/format_pull_request.php
+++ b/scripts/dev/format_pull_request.php
@@ -1,8 +1,9 @@
 <?php
+
 declare(strict_types=1);
 error_reporting(E_ALL);
-set_error_handler(function ($errno, $errstr, $errfile, $errline){
-    if(error_reporting() & $errno) {
+set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+    if (error_reporting() & $errno) {
         throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
     }
 });
@@ -21,10 +22,10 @@
     exit(1);
 }
 chdir(__DIR__ . '/../../'); // php-src root
-if(!$force){
+if (!$force) {
     $gitStatus = null;
     system('git diff --quiet --exit-code', $gitStatus);
-    if($gitStatus !== 0){
+    if ($gitStatus !== 0) {
         fwrite(STDERR, "Error: Working directory is not clean according to 'git diff'\n");
         fwrite(STDERR, "commit your stuff -or- run 'git reset --hard' and try again\n");
         exit(1);
@@ -37,9 +38,20 @@
 fwrite($diffFileHandle, $diff);
 $diffFilePath = stream_get_meta_data($diffFileHandle)['uri'];
 passthru("git apply " . escapeshellarg($diffFilePath), $ret);
-if($ret !== 0){
+if ($ret !== 0) {
     fwrite(STDERR, "Error: git apply failed with exit code {$ret}\n");
-    passthru("git reset --hard");
+    if (!$force) {
+        passthru('git reset --hard');
+    }
+    exit(1);
+}
+// commit
+passthru('git commit -a --message=clangformat --quiet', $ret);
+if ($ret !== 0) {
+    fwrite(STDERR, "Error: git commit failed with exit code {$ret}\n");
+    if (!$force) {
+        passthru('git reset --hard');
+    }
     exit(1);
 }
 $clangFormatOptions = array(
@@ -48,21 +60,27 @@
     'BasedOnStyle' => 'WebKit',
     'UseTab' => 'ForIndentation',
     // clang-format's support for tabs isn't great, and we have to say "4 spaces" to get 1 tab
-    'IndentWidth' => 4, 
+    'IndentWidth' => 4,
     'TabWidth' => 4,
 );
-
 $cmd = array(
-    'git diff -U0 --no-color --relative  |',
-    'clang-format-diff -p1 -style=' . escapeshellarg(json_encode($clangFormatOptions)),
+    'git diff -U0 --no-color --relative HEAD^ |',
+    'clang-format-diff -i -p1 -style=' . escapeshellarg(json_encode($clangFormatOptions)),
     '-iregex=' . escapeshellarg('.*\.(c|cc|cpp|c\+\+|cxx|h|hh|hpp|h\+\+|h)$'),
 );
 $cmd = implode(' ', $cmd);
 passthru($cmd, $ret);
-if($ret !== 0){
+if ($ret !== 0) {
     fwrite(STDERR, "Error: clang-format-diff failed with exit code {$ret}\n");
     fwrite(STDERR, "cmd:\n{$cmd}\n");
-    passthru("git reset --hard");
+    if (!$force) {
+        // remove last commit and reset
+        passthru('git reset --hard HEAD^ --quiet');
+    }
     exit(1);
 }
-shell_exec("git reset --hard");
+passthru('git diff');
+if (!$force) {
+    // remove last commit and reset
+    passthru('git reset --hard HEAD^ --quiet');
+}