From 0c87fae09b9dee569db22d93ee24dcc622af378d Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Thu, 5 Jan 2023 22:32:10 +0100 Subject: [PATCH] Various small improvements --- .build/build.sh | 4 ++-- CONTRIBUTING.md | 2 +- lib/Pico.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.build/build.sh b/.build/build.sh index 02693b3..24a54b0 100755 --- a/.build/build.sh +++ b/.build/build.sh @@ -464,10 +464,10 @@ find . -mindepth 1 -maxdepth 1 -printf '%f\0' \ echo "Creating release archive '$ARCHIVE_FILENAME.zip'..." zip -q -r "$APP_DIR/$ARCHIVE_FILENAME.zip" . -echo - # publish release if [ -n "$PUBLISH" ]; then + echo + # switch to app dir cd "$APP_DIR" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a38aae..5c4444a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -188,7 +188,7 @@ Issues and pull requests labeled with `info: Feedback Needed` indicate that feed - `status: Resolved` is used when the issue has been resolved (used with issues only). - `status: Conflict` indicates a conflict with another issue or behavior of Pico, making it impossible to resolve the problem at the moment. - `status: Won't Fix` means, that there is indeed a problem, but for some reason we made the decision that resolving it isn't reasonable, making it intended behavior. - - `status: Rejected` is used when the issue was rejected for another reason. + - `status: Rejected` is used when the issue was rejected for another reason (used with issues only). - The `type: Enhancement` and `type: Feature` labels are used to tag pull requests, which introduce either a comparatively small enhancement, or a "big" new feature. As with the `type: Bug` label, they might get combined with the `pri: High` or `pri: Low` labels to indicate the pull request's priority. They might also be labeled with `status: Work In Progress`. After merging or closing the pull request, it is labeled with one of the `status` labels as described above for the `type: Bug` label. diff --git a/lib/Pico.php b/lib/Pico.php index 3fa5bdd..4c3b0ab 100644 --- a/lib/Pico.php +++ b/lib/Pico.php @@ -370,7 +370,7 @@ class Pico $this->configDir = $this->getAbsolutePath($configDir); $this->pluginsDir = $this->getAbsolutePath($pluginsDir); $this->themesDir = $this->getAbsolutePath($themesDir); - $this->enableLocalPlugins = (bool) $enableLocalPlugins; + $this->enableLocalPlugins = $enableLocalPlugins; } /** @@ -2450,7 +2450,7 @@ class Pico /** * Returns the URL of a given absolute path within this Pico instance * - * We assume that the given path is a arbitrary deep sub folder of the + * We assume that the given path is an arbitrary deep sub folder of the * script's base path (i.e. the directory {@path "index.php"} is in resp. * the `httpdocs` directory). If this isn't the case, we check whether it's * a sub folder of {@see Pico::$rootDir} (what is often identical to the @@ -2741,7 +2741,7 @@ class Pico * * @return string normalized path * - * @throws UnexpectedValueException thrown when a absolute path is passed + * @throws UnexpectedValueException thrown when an absolute path is passed * although absolute paths aren't allowed */ public function getNormalizedPath(string $path, bool $allowAbsolutePath = false, bool $endSlash = true): string