diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index e415e61..ad60dc1 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -382,19 +382,20 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = phpmon/phpmon.entitlements; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 22; - DEVELOPMENT_TEAM = ""; + CURRENT_PROJECT_VERSION = 23; + DEVELOPMENT_TEAM = 8M54J5J787; INFOPLIST_FILE = phpmon/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; name = Debug; @@ -404,19 +405,20 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = phpmon/phpmon.entitlements; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 22; - DEVELOPMENT_TEAM = ""; + CURRENT_PROJECT_VERSION = 23; + DEVELOPMENT_TEAM = 8M54J5J787; INFOPLIST_FILE = phpmon/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", ); - MARKETING_VERSION = 2.0; + MARKETING_VERSION = 2.1; PRODUCT_BUNDLE_IDENTIFIER = com.nicoverbruggen.phpmon; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; }; name = Release; diff --git a/README.md b/README.md index 146fb38..4748692 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,47 @@ Follow instructions as specified in the alert in order to resolve any issues. ### Additional troubleshooting +#### Q: This app is doing network requests? + +It's Homebrew. I can't prevent `brew` from doing things via the network when I invoke it. + +PHP Monitor itself doesn't do any network requests. Feel free to check the source code or intercept the traffic, if you don't believe me. + +#### Q: How can I set this up on a fresh Mac? + +If you want to set up your computer for the very first time, here's how I do it: + +Install [Homebrew](https://brew.sh) first. + +Install PHP, composer, add to path: + + brew install php + brew install composer + nano .zshrc + +Make sure the following line is not in the comments: + + export PATH=$HOME/bin:/usr/local/bin:$PATH + +and add the following to your .zshrc: + + export PATH=$HOME/bin:~/.composer/vendor/bin:$PATH + +Make sure PHP is linked correctly: + + which php + +should return: `/usr/local/bin/php` + + composer global require laravel/valet + valet install + +This should install `dnsmasq` and set up Valet. Great, almost there! + + valet trust + +Finally, run PHP Monitor (you may need to option + right-click and select Open to avoid issues with macOS Gatekeeper). Yay! + #### Q: I want PHP Monitor to start up when I boot my Mac! You can do this by dragging *PHP Monitor.app* into the **Login Items** section in **System Preferences > Users & Groups** for your account. diff --git a/assets.sketch b/assets.sketch index 12f1a5d..453cd15 100644 Binary files a/assets.sketch and b/assets.sketch differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/Contents.json b/phpmon/Assets.xcassets/AppIcon.appiconset/Contents.json index 7cd4f8e..64dc11e 100644 --- a/phpmon/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/phpmon/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,68 +1,68 @@ { "images" : [ { - "size" : "16x16", - "idiom" : "mac", "filename" : "icon_16x16.png", - "scale" : "1x" + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" }, { - "size" : "16x16", - "idiom" : "mac", "filename" : "icon_16x16@2x.png", - "scale" : "2x" + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" }, { - "size" : "32x32", - "idiom" : "mac", "filename" : "icon_32x32.png", - "scale" : "1x" + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" }, { - "size" : "32x32", - "idiom" : "mac", "filename" : "icon_32x32@2x.png", - "scale" : "2x" + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" }, { - "size" : "128x128", - "idiom" : "mac", "filename" : "icon_128x128.png", - "scale" : "1x" + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" }, { - "size" : "128x128", - "idiom" : "mac", "filename" : "icon_128x128@2x.png", - "scale" : "2x" + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" }, { - "size" : "256x256", - "idiom" : "mac", "filename" : "icon_256x256.png", - "scale" : "1x" + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" }, { - "size" : "256x256", - "idiom" : "mac", "filename" : "icon_256x256@2x.png", - "scale" : "2x" + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" }, { - "size" : "512x512", - "idiom" : "mac", "filename" : "icon_512x512.png", - "scale" : "1x" + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" }, { - "size" : "512x512", - "idiom" : "mac", "filename" : "icon_512x512@2x.png", - "scale" : "2x" + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128.png index 49c9e0e..a4b3b89 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png index 77e6ccd..bc9d436 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_16x16.png index 7d07e6c..eadea2f 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_16x16.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png index 8dd6d46..4c0527f 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_256x256.png index 77e6ccd..bc9d436 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_256x256.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png index 727cf22..284a7b0 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_32x32.png index 8dd6d46..4c0527f 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_32x32.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png index 3b0cf2e..bbe60b1 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_512x512.png index 727cf22..284a7b0 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_512x512.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png index c5a8432..a95f50f 100644 Binary files a/phpmon/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png and b/phpmon/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/phpmon/Classes/Commands/Startup.swift b/phpmon/Classes/Commands/Startup.swift index cb9421b..e4f20a5 100644 --- a/phpmon/Classes/Commands/Startup.swift +++ b/phpmon/Classes/Commands/Startup.swift @@ -27,7 +27,7 @@ class Startup { self.presentAlertOnMainThreadIf( !Shell.user.pipe("which valet").contains("/usr/local/bin/valet"), messageText: "Laravel Valet is not correctly installed", - informativeText: "You must install Valet via brew. Try running `which valet` in Terminal, it should return `/usr/local/bin/valet`. The app will not work correctly until you resolve this issue." + informativeText: "You must install Valet with composer. Try running `which valet` in Terminal, it should return `/usr/local/bin/valet`. The app will not work correctly until you resolve this issue." ) self.presentAlertOnMainThreadIf(