Skip to content

Commit

Permalink
Merge 6031f19 into 7818a80
Browse files Browse the repository at this point in the history
  • Loading branch information
froschdesign committed Sep 15, 2020
2 parents 7818a80 + 6031f19 commit fd6221f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 0 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "3.1.x-dev",
"dev-develop": "3.2.x-dev"
},
"laminas": {
"component": "Laminas\\Di",
"config-provider": "Laminas\\Di\\ConfigProvider"
Expand Down
5 changes: 5 additions & 0 deletions docs/book/installation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
**This is only a placeholder.**

The content of this page can be found under:

https://github.com/laminas/documentation-theme/blob/master/theme/pages/installation.html
7 changes: 1 addition & 6 deletions docs/book/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ can be paired with any IoC container that implements this interface, such as

## 1. Installation

If you haven't already, [install Composer](https://getcomposer.org/).
Once you have, you can install laminas-di:

```bash
$ composer require laminas/laminas-di
```
Before starting, make sure laminas-di is [installed and configured](installation.md).

## 2. Configuring the injector

Expand Down
4 changes: 4 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ site_dir: docs/html
nav:
- Home: index.md
- Introduction: intro.md
- Installation: installation.md
- "Quick Start": quick-start.md
- Reference:
- "PSR-11 Support": psr-11.md
Expand All @@ -24,3 +25,6 @@ site_description: "Automated dependency injection for PSR-11 containers"
repo_url: 'https://github.com/laminas/laminas-di'
extra:
project: Components
installation:
config_provider_class: 'Laminas\Di\ConfigProvider'
module_class: 'Laminas\Di\Module'

0 comments on commit fd6221f

Please sign in to comment.