Merge pull request #358 from tlwt/master

Adding php support

Author: twibiral

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
+## [Unreleased]
+
+### Added
+- Support for PHP (Thanks to @tlwt)
+
 
 
 ## [2.0.0]

README.md

@@ -437,6 +437,18 @@ puts "Hello, World!"
 ```
 </details>
 
+<details>
+<summary>PHP</summary>
+
+- Requirements: PHP is installed and the correct path is set in the settings.
+
+```php
+<?php
+echo "Hello, World!";
+?>
+```
+</details>
+
 <details>
 <summary>Octave</summary>
 

src/main.ts

@@ -37,7 +37,7 @@ import {ReleaseNoteModel} from "./ReleaseNoteModal";
 export const languageAliases = ["javascript", "typescript", "bash", "csharp", "wolfram", "nb", "wl", "hs", "py"] as const;
 export const canonicalLanguages = ["js", "ts", "cs", "lean", "lua", "python", "cpp", "prolog", "shell", "groovy", "r",
 	"go", "rust", "java", "powershell", "kotlin", "mathematica", "haskell", "scala", "swift", "racket", "fsharp", "c", "dart",
-	"ruby", "batch", "sql", "octave", "maxima", "applescript", "zig", "ocaml"] as const;
+	"ruby", "batch", "sql", "octave", "maxima", "applescript", "zig", "ocaml", "php"] as const;
 export const supportedLanguages = [...languageAliases, ...canonicalLanguages] as const;
 export type LanguageId = typeof canonicalLanguages[number];
 
@@ -440,6 +440,12 @@ export default class ExecuteCodePlugin extends Plugin {
 				const transformedCode = await new CodeInjector(this.app, this.settings, language).injectCode(srcCode);
 				this.runCodeInShell(transformedCode, out, button, this.settings.ocamlPath, this.settings.ocamlArgs, "ocaml", language, file);
 			})
+		} else if (language === "php") {
+			button.addEventListener("click", async () => {
+				button.className = runButtonDisabledClass;
+				const transformedCode = await new CodeInjector(this.app, this.settings, language).injectCode(srcCode);
+				this.runCodeInShell(transformedCode, out, button, this.settings.phpPath, this.settings.phpArgs, this.settings.phpFileExtension, language, file);
+			})
 		}
 
 	}

src/settings/Settings.ts

@@ -109,6 +109,10 @@ export interface ExecutorSettings {
 	mathematicaArgs: string;
 	mathematicaFileExtension: string;
 	mathematicaInject: string;
+	phpPath: string;
+	phpArgs: string;
+	phpFileExtension: string;
+	phpInject: string;	
 	scalaPath: string;
 	scalaArgs: string;
 	scalaFileExtension: string;
@@ -175,6 +179,7 @@ export interface ExecutorSettings {
 	applescriptInteractive: boolean;
 	zigInteractive: boolean;
 	ocamlInteractive: boolean;
+	phpInteractive: boolean;
 }
 
 
@@ -319,6 +324,10 @@ export const DEFAULT_SETTINGS: ExecutorSettings = {
 	ocamlPath: "ocaml",
 	ocamlArgs: "",
 	ocamlInject: "",
+	phpPath: "php",
+	phpArgs: "",
+	phpFileExtension: "php",
+	phpInject: "",	
 	jsInteractive: true,
 	tsInteractive: false,
 	csInteractive: false,
@@ -352,4 +361,5 @@ export const DEFAULT_SETTINGS: ExecutorSettings = {
 	applescriptInteractive: false,
 	zigInteractive: false,
 	ocamlInteractive: false,
+	phpInteractive: false,
 }

src/settings/SettingsTab.ts

@@ -15,6 +15,7 @@ import makeLeanSettings from "./per-lang/makeLeanSettings";
 import makeLuaSettings from "./per-lang/makeLuaSettings";
 import makeDartSettings from "./per-lang/makeDartSettings";
 import makeMathematicaSettings from "./per-lang/makeMathematicaSettings";
+import makePhpSettings from "./per-lang/makePhpSettings";
 import makePowershellSettings from "./per-lang/makePowershellSettings";
 import makePrologSettings from "./per-lang/makePrologSettings";
 import makePythonSettings from "./per-lang/makePythonSettings";
@@ -243,6 +244,9 @@ export class SettingsTab extends PluginSettingTab {
 		// ========== OCaml ============
 		makeOCamlSettings(this, this.makeContainerFor("ocaml"));
 
+		// ========== Ruby ============
+		makePhpSettings(this, this.makeContainerFor("php"));
+
 		this.focusContainer(this.plugin.settings.lastOpenLanguageTab || canonicalLanguages[0]);
 	}
 

src/settings/languageDisplayName.ts

@@ -11,6 +11,7 @@ export const DISPLAY_NAMES: Record<LanguageId, string> = {
     kotlin: "Kotlin",
     lua: "Lua",
     mathematica: "Mathematica",
+    php: "PHP",
     powershell: "Powershell",
     prolog: "Prolog",
     python: "Python",

src/settings/per-lang/makePhpSettings.ts

@@ -0,0 +1,27 @@
+import { Setting } from "obsidian";
+import { SettingsTab } from "../SettingsTab";
+
+export default (tab: SettingsTab, containerEl: HTMLElement) => {
+    containerEl.createEl('h3', { text: 'PHP Settings' });
+    new Setting(containerEl)
+        .setName('php path')
+        .setDesc("Path to your php installation")
+        .addText(text => text
+            .setValue(tab.plugin.settings.phpPath)
+            .onChange(async (value) => {
+                const sanitized = tab.sanitizePath(value);
+                tab.plugin.settings.phpPath = sanitized;
+                console.log('php path set to: ' + sanitized);
+                await tab.plugin.saveSettings();
+            }));
+    new Setting(containerEl)
+        .setName('php arguments')
+        .addText(text => text
+            .setValue(tab.plugin.settings.phpArgs)
+            .onChange(async (value) => {
+                tab.plugin.settings.phpArgs = value;
+                console.log('php args set to: ' + value);
+                await tab.plugin.saveSettings();
+            }));
+    tab.makeInjectSetting(containerEl, "php");
+}