Merge branch 'master' into pico-1.1

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
@@ -11,6 +10,9 @@ php:
   - hhvm-nightly
 
 matrix:
+  include:
+    - php: 5.3
+      dist: precise
   allow_failures:
     - php: nightly
     - php: hhvm-nightly
@@ -44,4 +46,5 @@ deploy:
     tags: true
     php: 5.3
 
+dist: trusty
 sudo: false

CONTRIBUTING.md

@@ -97,3 +97,34 @@ Version 1.0.0
 Before pushing a new Git tag, make sure to update the `Pico::VERSION` and `Pico::VERSION_ID` constants. If you've simultaneously developed a new version of Pico's official [default theme](https://github.com/picocms/pico-theme) and/or the [`PicoDeprecated` plugin](https://github.com/picocms/pico-deprecated), make sure to remove a previously added `@dev` suffix from the corresponding dependencies in Pico's [`composer.json`](https://github.com/picocms/Pico/blob/master/composer.json).
 
 Travis CI will draft the new [release on GitHub](https://github.com/picocms/Pico/releases) automatically, but will require you to manually amend the descriptions formatting. The latest Pico version is always available at https://github.com/picocms/Pico/releases/latest, so please make sure to publish this URL rather than version-specific URLs. [Packagist](http://packagist.org/packages/picocms/pico) will be updated automatically.
+
+Labeling of Issues & Pull Requests
+----------------------------------
+
+Pico makes use of GitHub's label and milestone features, to aide developers in quickly identifying and prioritizing which issues need to be worked on. The starting point for labeling issues and pull requests is the `type` label, which is explained in greater detail below. The `type` label might get combined with a `pri` label, describing the issue's priority, and a `status` label, describing the current status of the issue.
+
+Issues and pull requests labeled with `info: Feedback Needed` indicate that feedback from others is highly appreciated. We always appreciate feedback at any time and from anyone, but when this label is present, we explicitly *ask* you to give feedback. It would be great if you leave a comment!
+
+- The `type: Bug` label is assigned to issues or pull requests, which have been identified as bugs or security issues in Pico's core. It might get combined with the `pri: High` label, when the problem was identified as security issue, or as a so-called "show stopper" bug. In contrast, uncritical problems might get labeled with `pri: Low`. `type: Bug` issues and pull requests are usually labeled with one of the following `status` labels when being closed:
+  - `status: Resolved` is used when the issue has been resolved.
+  - `status: Conflict` indicates a conflict with another issue.
+  - `status: Won't Fix` means, that the problem was identified as intended behavior.
+  - `status: Rejected` is used when the issue was rejected for another reason (e.g. when the issue wasn't reproducible).
+
+- 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. A pull request isn't necessarily mergeable when being opened, so it might get labeled with `status: Pending Merge` when development of the pull request is finished, but merging isn't intended yet. 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: Idea` label is similar to the `type: Enhancement` and `type: Feature` labels, but is used for issues or incomplete and abandoned pull requests. It is otherwise used in the exact same way as `type: Enhancement` and `type: Feature`.
+
+- The `type: Release` label is used in the exact same way as `type: Feature` and indicates the primary pull request of a new Pico release (please refer to the *Branching* and *Build & Release process* sections above).
+
+- The `type: Notice`, `type: Question` and `type: Discussion` labels are used to indicate "fyi" issues, issues opened by users or developers asking questions, and issues with disucssions about arbitrary topics related to Pico. They are neither combined with `pri` labels, nor with `status` labels.
+
+- The `type: Duplicate` label is used when there is already another issue or pull request related to this problem or feature request. Issues labeled with `type: Duplicate` are immediately closed.
+
+- The `type: Invalid` label is used for everything else, e.g. issues or pull requests not related to Pico, or invalid bug reports.
+
+The `status: Deferred` label might get added to any open issue or pull request to indicate that it still open and will be resolved later.
+
+Issues and pull requests, which are rather related to upstream projects (i.e. projects Pico depends on, like Twig), are additionally labeled with `info: Upstream`.
+
+When a issue or pull request isn't directly related to Pico's core, but the project as a whole, it is labeled with `info: Meta`.  The same applies to the `info: Website` label, however, in this case it is usually expedient to move the issue to the [`picocms.github.io` repo](https://github.com/picocms/picocms.github.io) containing Pico's website.

composer.json

@@ -24,6 +24,8 @@
     },
     "require": {
         "php": ">=5.3.6",
+        "ext-dom": "*",
+        "ext-mbstring": "*",
         "twig/twig": "^1.18",
         "symfony/yaml" : "^2.3",
         "erusev/parsedown-extra": "^0.7",

index.php.dist

@@ -1,9 +1,15 @@
 <?php // @codingStandardsIgnoreFile
 
-// check PHP version
+// check PHP platform requirements
 if (PHP_VERSION_ID < 50306) {
     die('Pico requires PHP 5.3.6 or above to run');
 }
+if (!extension_loaded('dom')) {
+    die('Pico requires the PHP extension "dom" to run');
+}
+if (!extension_loaded('mbstring')) {
+    die('Pico requires the PHP extension "mbstring" to run');
+}
 
 // load dependencies
 require_once(__DIR__ . '/vendor/autoload.php');