(Go: >> BACK << -|- >> HOME <<)

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pico 3.0 #535

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
718b790
Kick-start development of Pico 3.0
PhrozenByte Mar 29, 2020
a053a72
Update dependencies, Pico now requires PHP 7.0.8+
PhrozenByte Mar 29, 2020
2ee41e9
Update Pico::VERSION and Pico::VERSION_ID
PhrozenByte Mar 29, 2020
727d8a1
Fix Travis CI trying to build Pico 3.0 on PHP 5.x
PhrozenByte Mar 29, 2020
b6a0343
Update CHANGELOG.md
PhrozenByte Mar 29, 2020
039dd4e
Version 3.0.0-alpha.1
PhrozenByte Mar 29, 2020
812ae5c
Move Pico to picocms\Pico\ namespace
PhrozenByte Apr 10, 2020
b1a58b9
Update code styling to PHP 7.0+
PhrozenByte Apr 10, 2020
85d7573
Update to Symfony YAML 5.0 and Twig 3.0
PhrozenByte Apr 10, 2020
dffaa01
Merge branch 'master' into pico-3.0
PhrozenByte Apr 10, 2020
62aa4db
Check theme dir before trying to load theme
PhrozenByte Apr 10, 2020
bdafcb5
Fix Travis CI
PhrozenByte Apr 10, 2020
646aa35
Various small improvements
PhrozenByte Apr 11, 2020
1b1fa73
Fix Travis CI
PhrozenByte Apr 11, 2020
de5bd43
Update to phpDocumentor 3 config
PhrozenByte Apr 11, 2020
9f596ac
Improve phpDocumentor 3 config
PhrozenByte Apr 11, 2020
efc4fb5
Remove deprecated AbstractPlugin::__call()
PhrozenByte Apr 11, 2020
bc816fe
Remove deprecated Pico::getBaseThemeUrl()
PhrozenByte Apr 11, 2020
d6f9806
Replace substr()-based comparisons by substr_compare()
PhrozenByte May 1, 2020
9bf317f
Travis CI: Use phpDocumentor 3
PhrozenByte Jul 10, 2020
c3c7606
Merge branch 'master' into pico-3.0-alpha
PhrozenByte Dec 24, 2020
59d9514
Travis CI: Add PHP 8.0 target
PhrozenByte Dec 24, 2020
4b95733
Update CHANGELOG.md
PhrozenByte Dec 24, 2020
888b910
Update Pico::VERSION
PhrozenByte Dec 24, 2020
f7637ad
Version 3.0.0-alpha.2
PhrozenByte Dec 24, 2020
edfab74
Add %page_*% replacements for Markdown files
PhrozenByte Feb 6, 2022
41fc15a
Remove picocms\Pico\ namespace
PhrozenByte Feb 6, 2022
fe6c8f8
Re-add deprecated Pico::getBaseThemeUrl() and AbstractPicoPlugin::__c…
PhrozenByte Feb 6, 2022
1b956af
Code cleanup
PhrozenByte Feb 6, 2022
4e572ad
Merge branch 'master' into pico-3.0
PhrozenByte Feb 6, 2022
5a81fe8
CONTRIBUTING.md: Probot Stale was replaced by GitHub Actions
PhrozenByte Feb 6, 2022
f7ccd0b
Revert "Added Temporary PHP 8.0 Notice"
PhrozenByte Feb 6, 2022
0f152c7
Travis CI: Test on PHP 8.0 and 8.1
PhrozenByte Feb 6, 2022
76a761c
Bump to API version 4
PhrozenByte Feb 6, 2022
e33f6c8
Update various links
PhrozenByte Feb 13, 2022
68c4742
Add GitHub workflow 'test'
PhrozenByte Feb 13, 2022
8b4b20f
PHP_CodeSniffer: Allow using strftime()
PhrozenByte Feb 13, 2022
92907a1
GitHub 'test' workflow: Run on any pull request
PhrozenByte Feb 13, 2022
23b00ba
CI: Move install steps to reusable 'install' action
PhrozenByte Feb 13, 2022
b9de38f
CI: Improve reusable 'install' action
PhrozenByte Feb 19, 2022
d01918a
CI: Update Stale Bot config
PhrozenByte Feb 19, 2022
f4706bb
CI: Improve GitHub Actions YAML formatting
PhrozenByte Feb 19, 2022
bdb86d3
CI: Improve Composer root version guessing for PRs
PhrozenByte Feb 19, 2022
61880d1
Update Pico::VERSION to '3.0.0-dev'
PhrozenByte Feb 26, 2022
93dbbe7
Add 'SECURITY.md' to .htaccess
PhrozenByte Feb 26, 2022
4bf3260
phpDoc: Ignore .github dir
PhrozenByte Feb 26, 2022
e3365a4
CI: Check Pico version on tag push
PhrozenByte Feb 26, 2022
261b5c6
CI: Add 'deploy-branch.yml' workflow to update website on branch updates
PhrozenByte Feb 26, 2022
67408ce
Merge branch 'pico-3.0-alpha' into pico-3.0
PhrozenByte Feb 27, 2022
1aacce8
:tada: Switch from Travis CI to GitHub Actions for release deployment
PhrozenByte Feb 27, 2022
9d08d42
CI: Add Composer oauth token for github.com
PhrozenByte Feb 27, 2022
6f1fc9f
CI: Run 'test' workflow as part of the 'deploy-branch' workflow
PhrozenByte Feb 27, 2022
0f48280
composer.json: Allow using all Composer plugins in the 'picocms/*' na…
PhrozenByte Feb 27, 2022
a3f801b
Enable PHP strict typing
PhrozenByte Mar 3, 2022
9a8b3da
Simplify PHP class imports
PhrozenByte Mar 3, 2022
71c0dfb
Proberly handle page data of hidden pages when accessing such a page
PhrozenByte Mar 3, 2022
872da57
DummyPlugin: Remove missed imports of the picocms namespace
PhrozenByte Mar 3, 2022
070714d
DummyPlugin: Encourage devs to use PHP strict typing
PhrozenByte Mar 3, 2022
dde3a76
CI: Fix Composer root version guessing
PhrozenByte Mar 6, 2022
00ac6c0
CI: Some small styling improvements
PhrozenByte Mar 6, 2022
cb2cf3a
DummyPlugin: Add PHP return types to event methods
PhrozenByte Mar 6, 2022
998f0d1
CI: Fix Composer root version guessing (again)
PhrozenByte Mar 7, 2022
60d0f54
CI: Use build script to publish new releases
PhrozenByte Mar 8, 2022
3b6984d
Add some "art" to Pico class docs
PhrozenByte Mar 8, 2022
c0639cc
Minor code improvements
PhrozenByte Mar 9, 2022
81c2172
Update CONTRIBUTING.md to include latest changes
PhrozenByte Mar 12, 2022
0068406
Update CHANGELOG.md
PhrozenByte Mar 13, 2022
6698130
Update dependencies in composer.json
PhrozenByte Mar 13, 2022
1da5e26
Remove Pico's `map` Twig filter
PhrozenByte Mar 21, 2022
268f403
Sample contents: Remove Pico's `map` Twig filter
PhrozenByte Mar 21, 2022
a178e85
Update sample contents for Pico 3.0
PhrozenByte Apr 3, 2022
a5fefa4
Update README.md and sample contents for Pico 3.0
PhrozenByte Apr 3, 2022
35d894e
Add 'page' Twig function to return a single page
PhrozenByte Jan 5, 2023
311e21b
Allow $markdown = null in 'markdown' Twig filter
PhrozenByte Jan 5, 2023
0c87fae
Various small improvements
PhrozenByte Jan 5, 2023
efa51f6
CI: Add bouncer step to PR testing
PhrozenByte Jan 5, 2023
a3dd0b9
replace strlen in readPages() with variables
dkyme Aug 14, 2023
0fa644e
Merge pull request #674 from dkyme/dkyme-patch-1
PhrozenByte Aug 14, 2023
869ab1f
Enhanced Sorting by Nested Meta Values in Pages (#681)
PxaMMaxP Dec 2, 2023
914dd94
fix Wrong config keys in discoverPageSiblings #675
dkyme Dec 30, 2023
ae9a8eb
Merge pull request #686 from dkyme/fix-discoverPageSiblings
PhrozenByte Dec 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow $markdown = null in 'markdown' Twig filter
  • Loading branch information
PhrozenByte committed Jan 5, 2023
commit 311e21bcf30b7c37993a23c6668e9bcf7a0d03db
10 changes: 5 additions & 5 deletions lib/PicoTwigExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,15 @@ public function getFunctions(): array
* @see Pico::substituteFileContent()
* @see Pico::parseFileContent()
*
* @param string $markdown markdown to parse
* @param array $meta meta data to use for %meta.*% replacement
* @param bool $singleLine whether to parse just a single line of markup
* @param string|null $markdown markdown to parse
* @param array $meta meta data to use for %meta.*% replacement
* @param bool $singleLine whether to parse a single line of markup
*
* @return string parsed HTML
*/
public function markdownFilter(string $markdown, array $meta = [], bool $singleLine = false): string
public function markdownFilter(?string $markdown, array $meta = [], bool $singleLine = false): string
{
$markdown = $this->getPico()->substituteFileContent($markdown, $meta);
$markdown = $this->getPico()->substituteFileContent($markdown ?? '', $meta);
return $this->getPico()->parseFileContent($markdown, $singleLine);
}

Expand Down