Skip to content

Commit

Permalink
Merge branch 'release/1.11.0'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Schlaefer committed Jun 2, 2018
2 parents 748c89f + b37fe7e commit d24f56c
Show file tree
Hide file tree
Showing 88 changed files with 923 additions and 932 deletions.
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
**Please make pull-requests against the develop-branch!**

[TASK|BUGFIX|FEATURE] A meaningfull first line of your pull request

Fixes: # .
Expand Down
21 changes: 8 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,22 @@ notifications:
# Scripts
install:
- composer selfupdate --quiet
- |
if [ "$PHPCS" = "1" ] || [ "$PLUGINS" = "1" ]; then
composer install --prefer-dist --no-interaction
else
composer install --no-dev --no-interaction
fi
- composer install --prefer-dist --no-interaction
- |
if [ "$PLUGINS" = "1" ]; then
lib/vendor/bin/phing phile-plugins-install
fi
script:
- |
echo;
echo "Running unit tests";
phpunit;
echo; echo "Running unit tests";
lib/vendor/bin/phpunit;
- |
echo; echo "Running php lint"; /bin/bash -c "
if ! find lib -name \*.php -not -path 'lib/vendor/*' -exec php -l {} \; > /tmp/errors 2>&1; then
echo; echo "Running code formatting tests";
if [ "$PHPCS" = "1" ]; then
if ! find lib plugins/phile -name \*.php -not -path 'lib/vendor/*' -exec php -l "{}" \; > /tmp/errors 2>&1; then
grep -v \"No syntax errors detected in\" /tmp/errors;
exit 99;
fi
"
- sh -c "if [ '$PHPCS' = '1' ]; then lib/vendor/bin/phpcs --standard=PSR2 -p --extensions=php --ignore=lib/vendor/ lib/ plugins/phile/ .; fi"
lib/vendor/bin/phpcs --standard=PSR2 -p --extensions=php --ignore=lib/vendor/ lib/ plugins/phile/ .;
fi
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Release 1.11.0

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

## Release 1.10.0

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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Phile was forked from Pico when a few community members wanted to contribute mor
* Parser (default: [Markdown](https://github.com/michelf/php-markdown))
* Template Engine (default: [Twig](http://twig.sensiolabs.org/))
* Cache (default: [phpFastCache](https://github.com/khoaofgod/phpfastcache))
* Error handler (default: Phile handler)
* Error handler (default: [Whoops](http://filp.github.io/whoops/))
* Meta parser (default: Phile parser)
* Simple Data Persistence (default: Phile file-based)
* Per-Plugin `config.php` files
Expand Down
20 changes: 13 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "phile-cms/phile",
"version": "1.10.0",
"version": "1.11.0",
"type": "project",
"description": "A file-based CMS with a swappable parser, template engine, cache and storage services, error handler, and meta parser.",
"keywords": ["cms", "markdown", "flat", "file", "twig", "plugins"],
Expand Down Expand Up @@ -33,19 +33,25 @@
"config": {
"vendor-dir": "lib/vendor"
},
"autoload": {
"psr-4": {
"Phile\\": "lib/Phile"
}
},
"require": {
"php": ">=7.1.0",
"phile-cms/plugin-installer-plugin": "^1.0",
"twig/twig": "^1.0 || ^2.0",
"michelf/php-markdown": ">=1.4",
"psr/simple-cache": "^1.0",
"phpfastcache/phpfastcache": "^6.0",
"symfony/yaml": "^3.0 || ^4.0",
"phile-cms/plugin-installer-plugin": "^1.0",
"filp/whoops": "^2.1",
"http-interop/http-factory": "^0.3.0",
"psr/container": "^1.0",
"psr/http-message": "^1.0",
"zendframework/zend-diactoros": "^1.7",
"psr/http-server-middleware": "^1.0",
"http-interop/http-factory": "^0.3.0",
"psr/container": "^1.0"
"psr/simple-cache": "^1.0",
"symfony/yaml": "^3.0 || ^4.0",
"zendframework/zend-diactoros": "^1.7"
},
"require-dev": {
"phing/phing": "^2.14",
Expand Down
Loading

0 comments on commit d24f56c

Please sign in to comment.