Selaa lähdekoodia

Various small improvements

Daniel Rudolf 2 vuotta sitten
vanhempi
commit
0c87fae09b
3 muutettua tiedostoa jossa 6 lisäystä ja 6 poistoa
  1. 2 2
      .build/build.sh
  2. 1 1
      CONTRIBUTING.md
  3. 3 3
      lib/Pico.php

+ 2 - 2
.build/build.sh

@@ -464,10 +464,10 @@ find . -mindepth 1 -maxdepth 1 -printf '%f\0' \
 echo "Creating release archive '$ARCHIVE_FILENAME.zip'..."
 echo "Creating release archive '$ARCHIVE_FILENAME.zip'..."
 zip -q -r "$APP_DIR/$ARCHIVE_FILENAME.zip" .
 zip -q -r "$APP_DIR/$ARCHIVE_FILENAME.zip" .
 
 
-echo
-
 # publish release
 # publish release
 if [ -n "$PUBLISH" ]; then
 if [ -n "$PUBLISH" ]; then
+    echo
+
     # switch to app dir
     # switch to app dir
     cd "$APP_DIR"
     cd "$APP_DIR"
 
 

+ 1 - 1
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: 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: 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: 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.
 - 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.
 
 

+ 3 - 3
lib/Pico.php

@@ -370,7 +370,7 @@ class Pico
         $this->configDir = $this->getAbsolutePath($configDir);
         $this->configDir = $this->getAbsolutePath($configDir);
         $this->pluginsDir = $this->getAbsolutePath($pluginsDir);
         $this->pluginsDir = $this->getAbsolutePath($pluginsDir);
         $this->themesDir = $this->getAbsolutePath($themesDir);
         $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
      * 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.
      * 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
      * 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
      * a sub folder of {@see Pico::$rootDir} (what is often identical to the
@@ -2741,7 +2741,7 @@ class Pico
      *
      *
      * @return string normalized path
      * @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
      *     although absolute paths aren't allowed
      */
      */
     public function getNormalizedPath(string $path, bool $allowAbsolutePath = false, bool $endSlash = true): string
     public function getNormalizedPath(string $path, bool $allowAbsolutePath = false, bool $endSlash = true): string