Skip to content
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Removes Bookdown config and updates MkDocs config #26

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
.*.un~
nbproject
tmp/
doc/html/
zf-mkdoc-theme/

clover.xml
composer.lock
coveralls-upload.json
phpunit.xml
doc/html/
vendor/
21 changes: 16 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ branches:
cache:
directories:
- $HOME/.composer/cache
- $HOME/.local
- zf-mkdoc-theme

env:
global:
- SITE_URL: https://zendframework.github.io/zend-eventmanager
- GH_USER_NAME: "Matthew Weier O'Phinney"
- GH_USER_EMAIL: [email protected]
- GH_REF: github.com/zendframework/zend-eventmanager.git
- secure: ""

matrix:
fast_finish: true
Expand All @@ -21,6 +31,8 @@ matrix:
- php: 5.6
env:
- EXECUTE_TEST_COVERALLS=true
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
- PATH="$HOME/.local/bin:$PATH"
- php: 7
- php: hhvm
allow_failures:
Expand All @@ -33,21 +45,20 @@ notifications:
before_install:
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
- composer self-update
- if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then composer require --dev --no-update phly/bookdown2mkdocs ; fi
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi

install:
- travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
- composer info -i

before_script:
- if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then cp mkdocs.yml mkdocs.yml.orig ; fi

script:
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi
- if [[ $EXECUTE_DOC_CHECK == 'true' ]]; then make mkdocs ; diff mkdocs.yml mkdocs.yml.orig ; return $? ; fi
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi

after_success:
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi

after_script:
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi
11 changes: 11 additions & 0 deletions doc/book/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<div class="container">
<div class="jumbotron">
<h1>zend-eventmanager</h1>

<p>
Powerful event bus system for Zend Framework
</p>

<pre><code class="language-bash">$ composer require zendframework/zend-eventmanager</code></pre>
</div>
</div>
10 changes: 0 additions & 10 deletions doc/book/lazy-listeners/bookdown.json

This file was deleted.

8 changes: 0 additions & 8 deletions doc/book/migration/bookdown.json

This file was deleted.

17 changes: 0 additions & 17 deletions doc/bookdown.json

This file was deleted.

30 changes: 19 additions & 11 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,25 @@ docs_dir: doc/book
site_dir: doc/html
pages:
- index.md
- { Overview: intro.md }
- { 'Quick Start': quick-start.md }
- { Tutorial: tutorial.md }
- { 'Wildcard Listeners': wildcard-listeners.md }
- { 'Listener Aggregates': aggregates.md }
- { 'Lazy Listeners': [{ Introduction: lazy-listeners/intro.md }, { LazyListener: lazy-listeners/lazy-listener.md }, { LazyEventListener: lazy-listeners/lazy-event-listener.md }, { LazyListenerAggregate: lazy-listeners/lazy-listener-aggregate.md }] }
- { Examples: examples.md }
- { 'EventManager API': api.md }
- { 'Intercepting Filters': intercepting-filters.md }
- { 'Migration Guide': [{ Introduction: migration/intro.md }, { 'Removed Functionality': migration/removed.md }, { 'Changed Functionality': migration/changed.md }] }
- Intro: intro.md
- "Quick Start": quick-start.md
- Tutorial: tutorial.md
- Reference:
- "Wildcard Listeners": wildcard-listeners.md
- "Listener Aggregates": aggregates.md
- "Lazy Listeners":
- Intro: lazy-listeners/intro.md
- LazyListener: lazy-listeners/lazy-listener.md
- LazyEventListener: lazy-listeners/lazy-event-listener.md
- LazyListenerAggregate: lazy-listeners/lazy-listener-aggregate.md
- Examples: examples.md
- "EventManager API": api.md
- "Intercepting Filters": intercepting-filters.md
- "Migration Guide":
- Intro: migration/intro.md
- "Removed Functionality": migration/removed.md
- "Changed Functionality": migration/changed.md
site_name: zend-eventmanager
site_description: 'zend-eventmanager: Powerful event bus system for Zend Framework'
site_description: "zend-eventmanager: Powerful event bus system for Zend Framework"
repo_url: 'https://github.com/zendframework/zend-eventmanager'
copyright: 'Copyright (c) 2016 <a href="http://www.zend.com/">Zend Technologies USA Inc.</a>'