revert(master): to junction point)

.github/stale.yml

@@ -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

.github/workflows/stale.yml

@@ -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
-

README.md

@@ -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

SECURITY.md

@@ -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.

content-sample/_meta.md

@@ -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

content-sample/index.md

@@ -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/

lib/Pico.php

@@ -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