Skip to content
This repository was archived by the owner on Mar 31, 2025. It is now read-only.

Commit d24f56c

Browse files
committed
Merge branch 'release/1.11.0'
* release/1.11.0: document PR against develop-branch update readme and version strings for 1.11.0 release sets new Phile homepage in docblock Improve code quality adds storage_dir config to persistence storage plugin sets error handler from class constant in config refactors plugin loading use Whoops as error handler house everything after bootstrap in try block again remove "display_error" setting don't run lint in every travis-ci env, the code doesn't change use Phile specified PHPUnit on travis-ci replaces custom Phile core autoloader with composer autoloading
2 parents 748c89f + b37fe7e commit d24f56c

File tree

88 files changed

+923
-932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+923
-932
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
**Please make pull-requests against the develop-branch!**
2+
13
[TASK|BUGFIX|FEATURE] A meaningfull first line of your pull request
24

35
Fixes: # .

.travis.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,22 @@ notifications:
2929
# Scripts
3030
install:
3131
- composer selfupdate --quiet
32-
- |
33-
if [ "$PHPCS" = "1" ] || [ "$PLUGINS" = "1" ]; then
34-
composer install --prefer-dist --no-interaction
35-
else
36-
composer install --no-dev --no-interaction
37-
fi
32+
- composer install --prefer-dist --no-interaction
3833
- |
3934
if [ "$PLUGINS" = "1" ]; then
4035
lib/vendor/bin/phing phile-plugins-install
4136
fi
4237
4338
script:
4439
- |
45-
echo;
46-
echo "Running unit tests";
47-
phpunit;
40+
echo; echo "Running unit tests";
41+
lib/vendor/bin/phpunit;
4842
- |
49-
echo; echo "Running php lint"; /bin/bash -c "
50-
if ! find lib -name \*.php -not -path 'lib/vendor/*' -exec php -l {} \; > /tmp/errors 2>&1; then
43+
echo; echo "Running code formatting tests";
44+
if [ "$PHPCS" = "1" ]; then
45+
if ! find lib plugins/phile -name \*.php -not -path 'lib/vendor/*' -exec php -l "{}" \; > /tmp/errors 2>&1; then
5146
grep -v \"No syntax errors detected in\" /tmp/errors;
5247
exit 99;
5348
fi
54-
"
55-
- sh -c "if [ '$PHPCS' = '1' ]; then lib/vendor/bin/phpcs --standard=PSR2 -p --extensions=php --ignore=lib/vendor/ lib/ plugins/phile/ .; fi"
49+
lib/vendor/bin/phpcs --standard=PSR2 -p --extensions=php --ignore=lib/vendor/ lib/ plugins/phile/ .;
50+
fi

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Release 1.11.0
4+
5+
Please see the [release notes](https://github.com/PhileCMS/Phile/releases/tag/1.11.0) or the [complete change-log](https://github.com/PhileCMS/Phile/compare/1.10.0...1.11.0) for more information
6+
37
## Release 1.10.0
48

59
Please see the [release notes](https://github.com/PhileCMS/Phile/releases/tag/1.10.0) or the [complete change-log](https://github.com/PhileCMS/Phile/compare/1.9.0...1.10.0) for more information

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Phile was forked from Pico when a few community members wanted to contribute mor
2020
* Parser (default: [Markdown](https://github.com/michelf/php-markdown))
2121
* Template Engine (default: [Twig](http://twig.sensiolabs.org/))
2222
* Cache (default: [phpFastCache](https://github.com/khoaofgod/phpfastcache))
23-
* Error handler (default: Phile handler)
23+
* Error handler (default: [Whoops](http://filp.github.io/whoops/))
2424
* Meta parser (default: Phile parser)
2525
* Simple Data Persistence (default: Phile file-based)
2626
* Per-Plugin `config.php` files

composer.json

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "phile-cms/phile",
3-
"version": "1.10.0",
3+
"version": "1.11.0",
44
"type": "project",
55
"description": "A file-based CMS with a swappable parser, template engine, cache and storage services, error handler, and meta parser.",
66
"keywords": ["cms", "markdown", "flat", "file", "twig", "plugins"],
@@ -33,19 +33,25 @@
3333
"config": {
3434
"vendor-dir": "lib/vendor"
3535
},
36+
"autoload": {
37+
"psr-4": {
38+
"Phile\\": "lib/Phile"
39+
}
40+
},
3641
"require": {
3742
"php": ">=7.1.0",
43+
"phile-cms/plugin-installer-plugin": "^1.0",
3844
"twig/twig": "^1.0 || ^2.0",
3945
"michelf/php-markdown": ">=1.4",
40-
"psr/simple-cache": "^1.0",
4146
"phpfastcache/phpfastcache": "^6.0",
42-
"symfony/yaml": "^3.0 || ^4.0",
43-
"phile-cms/plugin-installer-plugin": "^1.0",
47+
"filp/whoops": "^2.1",
48+
"http-interop/http-factory": "^0.3.0",
49+
"psr/container": "^1.0",
4450
"psr/http-message": "^1.0",
45-
"zendframework/zend-diactoros": "^1.7",
4651
"psr/http-server-middleware": "^1.0",
47-
"http-interop/http-factory": "^0.3.0",
48-
"psr/container": "^1.0"
52+
"psr/simple-cache": "^1.0",
53+
"symfony/yaml": "^3.0 || ^4.0",
54+
"zendframework/zend-diactoros": "^1.7"
4955
},
5056
"require-dev": {
5157
"phing/phing": "^2.14",

0 commit comments

Comments
 (0)