Compare commits

..

11 commits

Author SHA1 Message Date
Daniel Rudolf
f7637ad335
Version 3.0.0-alpha.2
```
* [Changed] Merge all fixes of Pico v2.1.2 to v2.1.4
* [Fixed] #575: Update Symfony YAML v3.4 to support PHP 8.0+
```
2020-12-24 17:41:20 +01:00
Daniel Rudolf
888b910a84
Update Pico::VERSION
Pico::VERSION_ID isn't updated because this is a alpha release.
2020-12-24 17:41:20 +01:00
Daniel Rudolf
4b95733a51
Update CHANGELOG.md 2020-12-24 17:41:20 +01:00
Daniel Rudolf
59d9514ed4
Travis CI: Add PHP 8.0 target 2020-12-24 17:40:58 +01:00
Daniel Rudolf
c3c7606d2c
Merge branch 'master' into pico-3.0-alpha 2020-12-24 17:27:35 +01:00
Daniel Rudolf
039dd4edb2
Version 3.0.0-alpha.1
```
* [New] Kick-start development of Pico 3.0
* [Changed] Require PHP 7.0.8+
* [Changed] Update dependencies: Twig 2.12, Symfony YAML 3.4, Parsedown 1.7.4
            and Parsedown Extra 0.8.1; this is just an interim step, we'll
            update to Twig 3.0+ and Symfony YAML 5.0+ later
```
2020-03-29 15:33:14 +02:00
Daniel Rudolf
b6a0343118
Update CHANGELOG.md 2020-03-29 15:07:32 +02:00
Daniel Rudolf
727d8a12c0
Fix Travis CI trying to build Pico 3.0 on PHP 5.x 2020-03-29 14:59:58 +02:00
Daniel Rudolf
2ee41e9a8d
Update Pico::VERSION and Pico::VERSION_ID 2020-03-29 14:57:08 +02:00
Daniel Rudolf
a053a72a12
Update dependencies, Pico now requires PHP 7.0.8+
Pico now depends on Twig 2.12, Symfony YAML 3.4, Parsedown 1.7.4 and Parsedown Extra 0.8.1.
2020-03-29 14:39:02 +02:00
Daniel Rudolf
718b790b19
Kick-start development of Pico 3.0 2020-03-29 14:37:35 +02:00
15 changed files with 76 additions and 105 deletions

17
.github/stale.yml vendored Normal file
View file

@ -0,0 +1,17 @@
daysUntilStale: 7
daysUntilClose: 2
exemptLabels:
- "type: Bug"
- "type: Enhancement"
- "type: Feature"
- "type: Idea"
- "type: Release"
- "info: Pinned"
staleLabel: "info: Stale"
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed in two days if no further activity
occurs. Thank you for your contributions! :+1:
unmarkComment: false
closeComment: false
only: issues

View file

@ -1,28 +0,0 @@
name: "Mark or close stale issues and PRs"
on:
schedule:
- cron: "0 12 * * *"
jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 7
days-before-close: 2
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed in two days if no further activity
occurs. Thank you for your contributions! :+1:
stale-pr-message: >
This pull request has been automatically marked as stale because it has not had
recent activity. It will be closed in two days if no further activity
occurs. Thank you for your contributions! :+1:
stale-pr-label: "info: Stale"
stale-issue-label: "info: Stale"
exempt-issue-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned"
exempt-pr-labels: "type: Bug,type: Enhancement,type: Feature,type: Idea,type: Release,info: Pinned"
remove-stale-when-updated: true

View file

@ -10,30 +10,22 @@ cache:
jobs:
include:
# Test stage
- php: 5.3
dist: precise
- php: 5.4
dist: trusty
- php: 5.5
dist: trusty
- php: 5.6
dist: xenial
- php: 7.0
dist: xenial
- php: 7.1
- php: 7.2
- php: 7.3
- php: 7.4
- php: 8.0
- php: nightly
- php: hhvm-3.24 # until Dec 2018
- php: hhvm-3.27 # until Sep 2019
- php: hhvm-3.30 # until Nov 2019
# Branch deployment stage
- stage: deploy-branch
if: type == "push" && tag IS blank
php: 5.3
dist: precise
php: 7.0
dist: xenial
install:
- '[[ ",$DEPLOY_PHPDOC_BRANCHES," == *,"$TRAVIS_BRANCH",* ]] || travis_terminate 0'
- install.sh --deploy
@ -43,8 +35,8 @@ jobs:
# Release deployment stage
- stage: deploy-release
if: tag IS present
php: 5.3
dist: precise
php: 7.0
dist: xenial
install:
- install.sh --deploy
script:

View file

@ -16,6 +16,14 @@ Pico Changelog
`PicoDeprecated`'s changelog. Please note that BC-breaking changes
are only possible with a new major version.
### Version 3.0.0-alpha.2
Released: 2020-12-24
```
* [Changed] Merge all fixes of Pico v2.1.2 to v2.1.4
* [Fixed] #575: Update Symfony YAML v3.4 to support PHP 8.0+
```
### Version 2.1.4
Released: 2020-08-29
@ -40,6 +48,17 @@ Released: 2020-04-10
* [Fixed] Fix DummyPlugin declaring API version 3
```
### Version 3.0.0-alpha.1
Released: 2020-03-29
```
* [New] Kick-start development of Pico 3.0
* [Changed] Require PHP 7.0.8+
* [Changed] Update dependencies: Twig 2.12, Symfony YAML 3.4, Parsedown 1.7.4
and Parsedown Extra 0.8.1; this is just an interim step, we'll
update to Twig 3.0+ and Symfony YAML 5.0+ later
```
### Version 2.1.1
Released: 2019-12-31

View file

@ -4,29 +4,13 @@ Pico
[![License](https://picocms.github.io/badges/pico-license.svg)](https://github.com/picocms/Pico/blob/master/LICENSE.md)
[![Version](https://picocms.github.io/badges/pico-version.svg)](https://github.com/picocms/Pico/releases/latest)
[![Build Status](https://api.travis-ci.org/picocms/Pico.svg?branch=master)](https://travis-ci.org/picocms/Pico)
[![Libera.Chat](https://picocms.github.io/badges/pico-chat.svg)](https://web.libera.chat/#picocms)
[![Freenode IRC Webchat](https://picocms.github.io/badges/pico-chat.svg)](https://webchat.freenode.net/?channels=%23picocms)
[![Open Bounties on Bountysource](https://www.bountysource.com/badge/team?team_id=198139&style=bounties_received)](https://www.bountysource.com/teams/picocms)
Pico is a stupidly simple, blazing fast, flat file CMS.
Visit us at http://picocms.org/ and see http://picocms.org/about/ for more info.
---
### PHP 8.0+ Users
Seeing an `Unparenthesized a ? b : c ? d : e is not supported.` error?
Pico currently has issues with PHP versions newer than 8.0. This is due to Pico's dependencies, and not Pico itself. There's currently an "alpha" build of Pico you can download as a [Pre-Bundled Release](https://github.com/picocms/Pico/releases/tag/v3.0.0-alpha.2) that solves this issue.
This "alpha" is **perfectly safe** to use in production, as the *only* changes are **updated dependencies and version number strings**. If you're curious, you can confirm this by [comparing the changes](https://github.com/picocms/Pico/compare/pico-3.0-alpha) between branches.
More work was intended to be done on this branch, hence the "3.0" label, but it hasn't happened yet. There's an [on-going discussion](https://github.com/picocms/Pico/issues/608) about getting just these updated dependencies merged in as an official update (either Pico 2.2 or 3.0) as soon as possible.
Sorry for the inconvenience, and thanks to all Pico users for your patience on the matter. ❤️
---
Screenshot
----------
@ -205,7 +189,7 @@ If you're a developer, please refer to the "Contributing" section below and our
#### You still need help or experience a problem with Pico?
When the docs can't answer your question, you can get help by joining us on [#picocms on Libera.Chat][LiberaChat] ([logs][LiberaChatLogs]). When you're experiencing problems with Pico, please don't hesitate to create a new [Issue][Issues] on GitHub. Concerning problems with plugins or themes, please refer to the website of the developer of this plugin or theme.
When the docs can't answer your question, you can get help by joining us on [#picocms on Freenode IRC][Freenode] ([logs][FreenodeLogs]). When you're experiencing problems with Pico, please don't hesitate to create a new [Issue][Issues] on GitHub. Concerning problems with plugins or themes, please refer to the website of the developer of this plugin or theme.
**Before creating a new Issue,** please make sure the problem wasn't reported yet using [GitHubs search engine][IssuesSearch]. Please describe your issue as clear as possible and always include the *Pico version* you're using. Provided that you're using *plugins*, include a list of them too. We need information about the *actual and expected behavior*, the *steps to reproduce* the problem, and what steps you have taken to resolve the problem by yourself (i.e. *your own troubleshooting*).
@ -261,8 +245,8 @@ Official Pico Contributors won't claim bounties on their own behalf, Pico will n
[WikiThemes]: https://github.com/picocms/Pico/wiki/Pico-Themes
[Issues]: https://github.com/picocms/Pico/issues
[IssuesSearch]: https://github.com/picocms/Pico/search?type=Issues
[LiberaChat]: https://web.libera.chat/#picocms
[LiberaChatLogs]: http://picocms.org/irc-logs
[Freenode]: https://webchat.freenode.net/?channels=%23picocms
[FreenodeLogs]: http://picocms.org/irc-logs
[PullRequests]: https://github.com/picocms/Pico/pulls
[PullRequestsWebsite]: https://github.com/picocms/picocms.github.io/pulls
[ContributionGuidelines]: https://github.com/picocms/Pico/blob/master/CONTRIBUTING.md

View file

@ -1,15 +0,0 @@
# Security Policy
## Supported Versions
Only the most recent stable version of Pico is supported.
## Reporting a Vulnerability
To mitigate the impact of possible security issues we ask you to disclose any security issues with Pico privately first ("responsible disclosure"). To do so please send an email to Pico's lead developer:
> Daniel Rudolf \<picocms.org@daniel-rudolf.de\>
You should receive an answer within 48 hours.
All messages with valid security reports will be puslished on GitHub in full text.

View file

@ -31,12 +31,12 @@
"source": "https://github.com/picocms/Pico"
},
"require": {
"php": ">=5.3.6",
"php": ">=7.0.8",
"ext-mbstring": "*",
"twig/twig": "^1.36",
"symfony/yaml" : "^2.8",
"erusev/parsedown": "1.8.0-beta-7",
"erusev/parsedown-extra": "0.8.0-beta-1"
"twig/twig": "^2.12",
"symfony/yaml" : "^3.4",
"erusev/parsedown": "1.7.4",
"erusev/parsedown-extra": "0.8.1"
},
"suggest": {
"picocms/pico-theme": "Pico requires a theme to actually display the contents of your website. This is Pico's official default theme.",

View file

@ -5,8 +5,8 @@ Social:
- title: Visit us on GitHub
url: https://github.com/picocms/Pico
icon: octocat
- title: Join us on Libera.Chat
url: https://web.libera.chat/#picocms
- title: Join us on Freenode IRC Webchat
url: https://webchat.freenode.net/?channels=%23picocms
icon: chat
- title: Help us by creating/collecting bounties and pledging to fundraisers
url: https://www.bountysource.com/teams/picocms

View file

@ -190,7 +190,8 @@ uses [Twig][] for template rendering. You can select your theme by setting the
productive website, it's rather a starting point for creating your own theme.
If the default theme isn't sufficient for you, and you don't want to create
your own theme, you can use one of the great themes third-party developers and
designers created in the past. As with plugins, you can find themes on [our website][OfficialThemes].
designers created in the past. As with plugins, you can find themes in
[our Wiki][WikiThemes] and on [our website][OfficialThemes].
All themes must include an `index.twig` file to define the HTML structure of
the theme, and a `pico-theme.yml` to set the necessary config parameters. Just
@ -485,23 +486,24 @@ url.rewrite-if-not-file = (
## Documentation
For more help have a look at the Pico documentation at https://picocms.org/docs/.
For more help have a look at the Pico documentation at http://picocms.org/docs.
[Pico]: https://picocms.org/
[Pico]: http://picocms.org/
[PicoTheme]: https://github.com/picocms/pico-theme
[SampleContents]: https://github.com/picocms/Pico/tree/master/content-sample
[Markdown]: https://daringfireball.net/projects/markdown/syntax
[Markdown]: http://daringfireball.net/projects/markdown/syntax
[MarkdownExtra]: https://michelf.ca/projects/php-markdown/extra/
[YAML]: https://en.wikipedia.org/wiki/YAML
[Twig]: https://twig.symfony.com/doc/
[UnixTimestamp]: https://en.wikipedia.org/wiki/Unix_time
[Twig]: http://twig.sensiolabs.org/documentation
[UnixTimestamp]: https://en.wikipedia.org/wiki/Unix_timestamp
[Composer]: https://getcomposer.org/
[FeaturesHttpParams]: https://picocms.org/in-depth/features/http-params/
[FeaturesPageTree]: https://picocms.org/in-depth/features/page-tree/
[FeaturesPagesFunction]: https://picocms.org/in-depth/features/pages-function/
[FeaturesHttpParams]: http://picocms.org/in-depth/features/http-params/
[FeaturesPageTree]: http://picocms.org/in-depth/features/page-tree/
[FeaturesPagesFunction]: http://picocms.org/in-depth/features/pages-function/
[WikiThemes]: https://github.com/picocms/Pico/wiki/Pico-Themes
[WikiPlugins]: https://github.com/picocms/Pico/wiki/Pico-Plugins
[OfficialThemes]: https://picocms.org/themes/
[PluginUpgrade]: https://picocms.org/development/#migrating-plugins
[OfficialThemes]: http://picocms.org/themes/
[PluginUpgrade]: http://picocms.org/development/#upgrade
[ModRewrite]: https://httpd.apache.org/docs/current/mod/mod_rewrite.html
[AllowOverride]: https://httpd.apache.org/docs/current/mod/core.html#allowoverride
[NginxConfig]: https://picocms.org/in-depth/nginx/
[NginxConfig]: http://picocms.org/in-depth/nginx/

View file

@ -11,8 +11,8 @@
*/
// check PHP platform requirements
if (PHP_VERSION_ID < 50306) {
die('Pico requires PHP 5.3.6 or above to run');
if (PHP_VERSION_ID < 70008) {
die('Pico requires PHP 7.0.8 or above to run');
}
if (!extension_loaded('dom')) {
die("Pico requires the PHP extension 'dom' to run");

View file

@ -21,7 +21,7 @@
* @author Daniel Rudolf
* @link http://picocms.org
* @license http://opensource.org/licenses/MIT The MIT License
* @version 2.1
* @version 3.0
*/
abstract class AbstractPicoPlugin implements PicoPluginInterface
{

View file

@ -40,7 +40,7 @@
* @author Daniel Rudolf
* @link http://picocms.org
* @license http://opensource.org/licenses/MIT The MIT License
* @version 2.1
* @version 3.0
*/
class Pico
{
@ -49,14 +49,14 @@ class Pico
*
* @var string
*/
const VERSION = '2.1.4';
const VERSION = '3.0.0-alpha.2';
/**
* Pico version ID
*
* @var int
*/
const VERSION_ID = 20104;
const VERSION_ID = 30000;
/**
* Pico API version
@ -2092,7 +2092,7 @@ class Pico
* {@see PicoTwigExtension} Twig extension.
*
* @see Pico::getTwig()
* @see https://twig.symfony.com/ Twig website
* @see http://twig.sensiolabs.org/ Twig website
* @see https://github.com/twigphp/Twig Twig on GitHub
*
* @return Twig_Environment|null Twig template engine

View file

@ -26,7 +26,7 @@
* @author Daniel Rudolf
* @link http://picocms.org
* @license http://opensource.org/licenses/MIT The MIT License
* @version 2.1
* @version 3.0
*/
interface PicoPluginInterface
{

View file

@ -16,7 +16,7 @@
* @author Daniel Rudolf
* @link http://picocms.org
* @license http://opensource.org/licenses/MIT The MIT License
* @version 2.1
* @version 3.0
*/
class PicoTwigExtension extends Twig_Extension
{

View file

@ -19,7 +19,7 @@
* @author Daniel Rudolf
* @link http://picocms.org
* @license http://opensource.org/licenses/MIT The MIT License
* @version 2.1
* @version 3.0
*/
class DummyPlugin extends AbstractPicoPlugin
{