🐛 Fixes #3 : Bad Gateway caused by valet use

Note: The terminal output work-in-progress is currently disabled in this particular commit.
🚧 Adds window to view terminal output
2025-08-08 04:20:07 +02:00 · 2019-07-08 10:43:56 +02:00 · 2019-07-08 08:40:29 +02:00
7 changed files with 113 additions and 13 deletions
--- a/phpmon.xcodeproj/project.pbxproj
+++ b/phpmon.xcodeproj/project.pbxproj
@ -8,7 +8,7 @@

 /* Begin PBXBuildFile section */
 		C41C1B3722B0097F00E7CF16 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */; };
-		C41C1B3922B0097F00E7CF16 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B3822B0097F00E7CF16 /* ViewController.swift */; };
+		C41C1B3922B0097F00E7CF16 /* LogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B3822B0097F00E7CF16 /* LogViewController.swift */; };
 		C41C1B3B22B0098000E7CF16 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C41C1B3A22B0098000E7CF16 /* Assets.xcassets */; };
 		C41C1B3E22B0098000E7CF16 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C41C1B3C22B0098000E7CF16 /* Main.storyboard */; };
 		C41C1B4722B009A400E7CF16 /* Shell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4622B009A400E7CF16 /* Shell.swift */; };
@ -17,12 +17,13 @@
 		C41C1B4D22B0215A00E7CF16 /* Services.swift in Sources */ = {isa = PBXBuildFile; fileRef = C41C1B4C22B0215A00E7CF16 /* Services.swift */; };
 		C476FF9822B0DD830098105B /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = C476FF9722B0DD830098105B /* Alert.swift */; };
 		C4D8016622B1584700C6DA1B /* BootChecks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4D8016522B1584700C6DA1B /* BootChecks.swift */; };
+		C4EE188422D3386B00E126E5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4EE188322D3386B00E126E5 /* Constants.swift */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
 		C41C1B3322B0097F00E7CF16 /* phpmon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = phpmon.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		C41C1B3622B0097F00E7CF16 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
-		C41C1B3822B0097F00E7CF16 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		C41C1B3822B0097F00E7CF16 /* LogViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogViewController.swift; sourceTree = "<group>"; };
 		C41C1B3A22B0098000E7CF16 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		C41C1B3D22B0098000E7CF16 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		C41C1B3F22B0098000E7CF16 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -33,6 +34,7 @@
 		C41C1B4C22B0215A00E7CF16 /* Services.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Services.swift; sourceTree = "<group>"; };
 		C476FF9722B0DD830098105B /* Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = "<group>"; };
 		C4D8016522B1584700C6DA1B /* BootChecks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BootChecks.swift; sourceTree = "<group>"; };
+		C4EE188322D3386B00E126E5 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@ -65,6 +67,7 @@
 		C41C1B3522B0097F00E7CF16 /* phpmon */ = {
 			isa = PBXGroup;
 			children = (
+				C4EE188322D3386B00E126E5 /* Constants.swift */,
 				C41E181722CB61EB0072CF09 /* Classes */,
 				C41E181622CB61890072CF09 /* Startup */,
 				C41E181522CB614C0072CF09 /* Terminal */,
@ -116,7 +119,7 @@
 			isa = PBXGroup;
 			children = (
 				C41C1B3C22B0098000E7CF16 /* Main.storyboard */,
-				C41C1B3822B0097F00E7CF16 /* ViewController.swift */,
+				C41C1B3822B0097F00E7CF16 /* LogViewController.swift */,
 			);
 			path = "View Controllers";
 			sourceTree = "<group>";
@ -195,10 +198,11 @@
 				C41C1B4722B009A400E7CF16 /* Shell.swift in Sources */,
 				C41C1B4D22B0215A00E7CF16 /* Services.swift in Sources */,
 				C41C1B4922B00A9800E7CF16 /* ImageGenerator.swift in Sources */,
-				C41C1B3922B0097F00E7CF16 /* ViewController.swift in Sources */,
+				C41C1B3922B0097F00E7CF16 /* LogViewController.swift in Sources */,
 				C41C1B3722B0097F00E7CF16 /* AppDelegate.swift in Sources */,
 				C41C1B4B22B019FF00E7CF16 /* PhpVersion.swift in Sources */,
 				C476FF9822B0DD830098105B /* Alert.swift in Sources */,
+				C4EE188422D3386B00E126E5 /* Constants.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/phpmon/AppDelegate.swift
+++ b/phpmon/AppDelegate.swift
@ -18,6 +18,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
    var version: PhpVersion? = nil
    var availablePhpVersions : [String] = []
    var busy: Bool = false
+    var log: String = ""
+    var windowController: NSWindowController? = nil
    
    // MARK: - Lifecycle

@ -71,6 +73,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                // Actions
                menu.addItem(NSMenuItem.separator())
                menu.addItem(NSMenuItem(title: "Open php.ini in Finder", action: #selector(self.openActiveConfigFolder), keyEquivalent: ""))
+                // OPTIONAL
                // menu.addItem(NSMenuItem(title: "Restart PHP \(self.version!.short) service", action: #selector(self.restartPhp), keyEquivalent: ""))
            }
            menu.addItem(NSMenuItem.separator())
@ -90,6 +93,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                menu.addItem(NSMenuItem(title: "Switching PHP versions...", action: nil, keyEquivalent: ""))
                menu.addItem(NSMenuItem.separator())
            }
+            // TODO: Enable when implementation is complete
+            // menu.addItem(NSMenuItem(title: "View terminal output", action: #selector(self.openOutput), keyEquivalent: ""))
            menu.addItem(NSMenuItem(title: "About phpmon", action: #selector(self.openAbout), keyEquivalent: ""))
            menu.addItem(NSMenuItem(title: "Quit phpmon", action: #selector(NSApplication.terminate(_:)), keyEquivalent: "q"))
            DispatchQueue.main.async {
@ -100,6 +105,17 @@ class AppDelegate: NSObject, NSApplicationDelegate {
    
    // MARK: - Callable via Obj-C (#selector)
    
+    @objc func openOutput() {
+        if (self.windowController == nil) {
+            let vc = NSStoryboard(name: "Main", bundle: nil).instantiateController(withIdentifier: "logWindow") as! LogViewController
+            let window = NSWindow(contentViewController: vc)
+            window.title = "Terminal Output"
+            self.windowController = NSWindowController(window: window)
+        }
+        self.windowController!.showWindow(self)
+        // TODO: Send window to front (if possible)
+    }
+    
    @objc func updatePhpVersionInStatusBar() {
        self.version = PhpVersion()
        if (self.busy) {
--- a/phpmon/Constants.swift
+++ b/phpmon/Constants.swift
@ -0,0 +1,26 @@
+//
+//  Constants.swift
+//  phpmon
+//
+//  Created by Nico Verbruggen on 08/07/2019.
+//  Copyright © 2019 Nico Verbruggen. All rights reserved.
+//
+
+import Cocoa
+
+class Constants {
+    
+    /**
+     * The PHP versions supported by this application.
+     */
+    static let SupportedPhpVersions = [
+        "5.6", "7.0", "7.1", "7.2", "7.3"
+    ]
+    
+    /**
+     Which php version is aliased as `php` to brew?
+     This is usually the latest PHP version.
+     */
+    static let LatestPhpVersion = "7.3"
+
+}
--- a/phpmon/Info.plist
+++ b/phpmon/Info.plist
@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>1.2</string>
 	<key>CFBundleVersion</key>
 	<string>10</string>
 	<key>LSApplicationCategoryType</key>
--- a/phpmon/Terminal/Services.swift
+++ b/phpmon/Terminal/Services.swift
@ -41,7 +41,11 @@ class Services {
        }
        if (availableVersions.contains("7.3")) {
            _ = Shell.execute(command: "brew link php@7.3")
-            _ = Shell.execute(command: "valet use php@\(version)")
+            if (version == Constants.LatestPhpVersion) {
+                _ = Shell.execute(command: "valet use php")
+            } else {
+                _ = Shell.execute(command: "valet use php@\(version)")
+            }
        }
    }
    
--- a/Controllers/Base.lproj/Main.storyboard
+++ b/Controllers/Base.lproj/Main.storyboard
@ -52,20 +52,66 @@
                <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="75" y="0.0"/>
+            <point key="canvasLocation" x="134" y="40"/>
        </scene>
-        <!--View Controller-->
+        <!--Log View Controller-->
        <scene sceneID="hIz-AP-VOD">
            <objects>
-                <viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="phpmon" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="logWindow" id="XfG-lQ-9wD" customClass="LogViewController" customModule="phpmon" customModuleProvider="target" sceneMemberID="viewController">
                    <view key="view" identifier="main" id="m2S-Jp-Qdl">
-                        <rect key="frame" x="0.0" y="0.0" width="425" height="264"/>
+                        <rect key="frame" x="0.0" y="0.0" width="578" height="308"/>
                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ICa-gx-jgq">
+                                <rect key="frame" x="489" y="13" width="75" height="32"/>
+                                <buttonCell key="cell" type="push" title="Close" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3md-FI-EWa">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="pressed:" target="XfG-lQ-9wD" id="fIC-Bz-vTK"/>
+                                </connections>
+                            </button>
+                            <scrollView borderType="line" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vZy-5S-021">
+                                <rect key="frame" x="20" y="51" width="538" height="237"/>
+                                <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="s5L-AU-0fw">
+                                    <rect key="frame" x="1" y="1" width="536" height="235"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <textView importsGraphics="NO" richText="NO" verticallyResizable="YES" smartInsertDelete="YES" id="tN6-Y9-1pA">
+                                            <rect key="frame" x="0.0" y="0.0" width="536" height="235"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            <size key="minSize" width="536" height="235"/>
+                                            <size key="maxSize" width="538" height="10000000"/>
+                                            <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        </textView>
+                                    </subviews>
+                                </clipView>
+                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Kho-JF-NZJ">
+                                    <rect key="frame" x="-100" y="-100" width="240" height="16"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
+                                <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="qp7-7R-gTO">
+                                    <rect key="frame" x="521" y="1" width="16" height="235"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
+                            </scrollView>
+                        </subviews>
+                        <constraints>
+                            <constraint firstItem="vZy-5S-021" firstAttribute="leading" secondItem="m2S-Jp-Qdl" secondAttribute="leading" constant="20" id="K0k-oE-r37"/>
+                            <constraint firstAttribute="trailing" secondItem="ICa-gx-jgq" secondAttribute="trailing" constant="20" id="LFS-0E-Ibw"/>
+                            <constraint firstItem="vZy-5S-021" firstAttribute="top" secondItem="m2S-Jp-Qdl" secondAttribute="top" constant="20" id="Nec-oI-CjE"/>
+                            <constraint firstAttribute="trailing" secondItem="vZy-5S-021" secondAttribute="trailing" constant="20" id="kBJ-O5-eYI"/>
+                            <constraint firstAttribute="bottom" secondItem="ICa-gx-jgq" secondAttribute="bottom" constant="20" id="kYB-Fn-DSA"/>
+                            <constraint firstItem="ICa-gx-jgq" firstAttribute="top" secondItem="vZy-5S-021" secondAttribute="bottom" constant="10" id="xdn-yU-LVb"/>
+                        </constraints>
                    </view>
                </viewController>
                <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
            </objects>
-            <point key="canvasLocation" x="74.5" y="217"/>
+            <point key="canvasLocation" x="-147" y="294"/>
        </scene>
    </scenes>
 </document>
--- a/Controllers/LogViewController.swift
+++ b/Controllers/LogViewController.swift
@ -8,6 +8,10 @@

 import Cocoa

-class ViewController: NSViewController {
-
+class LogViewController: NSViewController {
+    
+    @IBAction func pressed(_ sender: Any) {
+        self.view.window?.windowController?.close()
+    }
+    
 }
Author	SHA1	Message	Date
Nico Verbruggen	1bfcdd546b	🐛 Fixes #3 : Bad Gateway caused by `valet use` Note: The terminal output work-in-progress is currently disabled in this particular commit.	2019-07-08 10:43:56 +02:00
Nico Verbruggen	78702ae325	🚧 Adds window to view terminal output	2019-07-08 08:40:29 +02:00