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

Commit f6d580c

Browse files
committed
Documentation updates
- removed white characters at the end of the lines - changed links to the documentation to docs.zendframework.com
1 parent a0bbe6e commit f6d580c

File tree

10 files changed

+41
-41
lines changed

10 files changed

+41
-41
lines changed

docs/book/controllers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function getServiceLocator();
8181

8282
> #### ServiceLocatorInterface is deprecated
8383
>
84-
> `ServiceLocatorAwareInterface` [was removed from zend-servicemanager v3.0](http://zendframework.github.io/zend-servicemanager/migration/#miscellaneous-interfaces-traits-and-classes),
84+
> `ServiceLocatorAwareInterface` [was removed from zend-servicemanager v3.0](http://docs.zendframework.com/zend-servicemanager/migration/#miscellaneous-interfaces-traits-and-classes),
8585
> and, as such, starting in zend-mvc 2.7.0, the `AbstractController`
8686
> implementation no longer implements the interface, though it implements the
8787
> methods the interface defines; this allows forwards compatibility with
@@ -92,7 +92,7 @@ public function getServiceLocator();
9292
> pulling them from a composed `ServiceManager` instance.
9393
>
9494
> In cases where an object will not be used in all code paths, we recommend
95-
> splitting into discrete controllers, or using [lazy services](http://zendframework.github.io/zend-servicemanager/lazy-services/).
95+
> splitting into discrete controllers, or using [lazy services](http://docs.zendframework.com/zend-servicemanager/lazy-services/).
9696
9797
### EventManagerAware
9898

docs/book/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="container">
22
<div class="jumbotron">
33
<h1>zend-mvc</h1>
4-
4+
55
<p>Zend Framework's event-driven MVC layer, including MVC Applications, Controllers, and Plugins.</p>
66

77
<pre><code class="language-bash">$ composer require zendframework/zend-mvc</code></pre>

docs/book/intro.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ If you do not want these actions, or want to provide alternatives, you can do so
257257
The second action you can take with the configured `Application` is to `run()`
258258
it. Calling this method performs the following:
259259

260-
- it triggers the "route" event,
261-
- followed by the "dispatch" event, and, depending on execution,
260+
- it triggers the "route" event,
261+
- followed by the "dispatch" event, and, depending on execution,
262262
- the "render" event
263263

264264
When done, it triggers the "finish" event, and then returns the response

docs/book/middleware.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[PSR-7](http://www.php-fig.org/psr/psr-7/) defines interfaces for HTTP messages,
44
and is now being adopted by many frameworks; Zend Framework itself offers a
5-
parallel microframework targeting PSR-7 with [Expressive](https://zendframework.github.io/zend-expressive).
5+
parallel microframework targeting PSR-7 with [Expressive](https://docs.zendframework.com/zend-expressive).
66
What if you want to dispatch PSR-7 middleware from zend-mvc?
77

88
zend-mvc currently uses [zend-http](https://github.com/zendframework/zend-http)
@@ -61,7 +61,7 @@ http-middleware instance. These will then be piped into a
6161
present in the array.
6262

6363
> ### No action required
64-
>
64+
>
6565
> Unlike action controllers, middleware typically is single purpose, and, as
6666
> such, does not require a default `action` parameter.
6767
@@ -99,7 +99,7 @@ Starting in 3.1.0, the `MiddlewareListener` always adds middleware to a
9999
`Zend\Stratigility\MiddlewarePipe` instance, and invokes it as
100100
[http-interop/http-middleware](https://github.com/http-interop/http-middleware),
101101
passing it a PSR-7 `ServerRequestInterface` and an http-interop
102-
`DelegateInterface`.
102+
`DelegateInterface`.
103103

104104
As such, ideally your middleware should implement the `MiddlewareInterface` from
105105
[http-interop/http-middleware](https://github.com/http-interop/http-middleware):

docs/book/migration/to-v2-7.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ zend-mvc provides two mechanisms for injecting event managers into
4848
registered in `Zend\Mvc\Service\ServiceManagerConfig`, and the other is the
4949
`Zend\Mvc\Controller\ControllerManager::injectEventManager()` initializer. In
5050
both cases, the logic was updated to be forwards compatible with
51-
zend-eventmanager v3.
51+
zend-eventmanager v3.
5252

5353
Previously each would check if the instance's `getEventManager()` method
5454
returned an event manager instance, and, if so, inject the shared event manager:
@@ -194,7 +194,7 @@ two approaches you can use:
194194
specific controllers. This way you don't need to inject dependencies that are
195195
only used in some actions. (We recommend doing this regardless, as it helps
196196
keep your code more maintainable.)
197-
- Use [lazy services](http://zendframework.github.io/zend-servicemanager/lazy-services/).
197+
- Use [lazy services](http://docs.zendframework.com/zend-servicemanager/lazy-services/).
198198
When you configure these, zend-servicemanager gives you a proxy instance that,
199199
on first access, loads the full service. This allows you to delay the most
200200
expensive operations until absolutely needed.

docs/book/migration/to-v3-0.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Upgrading to 3.0
1+
# Upgrading to 3.0
22

33
With the release of Zend Framework 2, all components current at that time,
44
regardless of history, were tagged as v2 releases; in reality, it was the first
@@ -21,7 +21,7 @@ however, raised another problem: you now have to register components as modules
2121
in your application.
2222

2323
To solve this new problem, we created a new component,
24-
[zend-component-installer](http://zendframework.github.io/zend-component-installer/).
24+
[zend-component-installer](http://docs.zendframework.com/zend-component-installer/).
2525
Install this in your application now:
2626

2727
```bash
@@ -82,9 +82,9 @@ service alias.
8282

8383
## DI-ServiceManager integration
8484

85-
The integration between [zend-servicemanager](https://zendframework.github.io/zend-servicemanager) and
85+
The integration between [zend-servicemanager](https://docs.zendframework.com/zend-servicemanager) and
8686
[zend-di](https://github.com/zendframework/zend-di) has been moved to a new
87-
standalone component, [zend-servicemanager-di](https://zendframework.github.io/zend-servicemanager-di/).
87+
standalone component, [zend-servicemanager-di](https://docs.zendframework.com/zend-servicemanager-di/).
8888
In most cases, installing the component will restore the original behavior:
8989

9090
```bash
@@ -96,10 +96,10 @@ $ composer require zendframework/zend-servicemanager-di
9696
> The above assumes you're using the new component installer detailed in the
9797
> [dependency reduction](#dependency-reduction) section, above. If you are not,
9898
> you will need to inject the zend-servicemanager-di module into your
99-
> application manually; follow the [instructions in the zend-servicemanager-di documentation](https://zendframework.github.io/zend-servicemanager-di/)
99+
> application manually; follow the [instructions in the zend-servicemanager-di documentation](https://docs.zendframework.com/zend-servicemanager-di/)
100100
> to do so.
101101
102-
The new component also contains a [migration document](https://zendframework.github.io/zend-servicemanager-di/migration/v2-to-v3/)
102+
The new component also contains a [migration document](https://docs.zendframework.com/zend-servicemanager-di/migration/v2-to-v3/)
103103
detailing potential issues for users migrating to version 3.
104104

105105
## DispatchListener
@@ -111,14 +111,14 @@ with the v3 release.
111111
## Routing
112112

113113
Routing was removed from zend-mvc, and moved to a new component,
114-
[zend-router](https://zendframework.github.io/zend-router/), which is now a
114+
[zend-router](https://docs.zendframework.com/zend-router/), which is now a
115115
dependency of zend-mvc.
116116

117117
The changes that will impact users are:
118118

119-
- [Query route removal](http://zendframework.github.io/zend-router/migration/v2-to-v3/#query-route-removal);
119+
- [Query route removal](http://docs.zendframework.com/zend-router/migration/v2-to-v3/#query-route-removal);
120120
this route had been deprecated since 2.3.0, and removed for the 3.0 release.
121-
- [Namespace changes](http://zendframework.github.io/zend-router/migration/v2-to-v3/#namespace-change);
121+
- [Namespace changes](http://docs.zendframework.com/zend-router/migration/v2-to-v3/#namespace-change);
122122
with the separation to the zend-router component, all routes changed
123123
namespaces from `Zend\Mvc\Router` to `Zend\Router`.
124124

@@ -128,7 +128,7 @@ your code.
128128
## Console tooling
129129

130130
Console tooling, including console routes, were split off to a new component,
131-
[zend-mvc-console](https://zendframework.github.io/zend-mvc-console/). If you
131+
[zend-mvc-console](https://docs.zendframework.com/zend-mvc-console/). If you
132132
were using the console tooling, install zend-mvc-console:
133133

134134
```bash
@@ -140,7 +140,7 @@ ensure the component is registered with your application!)
140140

141141
zend-mvc-console exposes all of the same functionality as was in the v2 series
142142
of zend-mvc, but most components are in different namespaces. Please read the
143-
[zend-mvc-console migration guide](http://zendframework.github.io/zend-mvc-console/migration/v2-to-v3/)
143+
[zend-mvc-console migration guide](http://docs.zendframework.com/zend-mvc-console/migration/v2-to-v3/)
144144
for full details of what changes you may need to make to your application to
145145
ensure console tooling continues to work.
146146

@@ -159,7 +159,7 @@ provided specifications to zend-modulemanager's `ServiceListener`
159159
to allow modules to provide filter configuration.
160160

161161
This functionality is now removed from zend-mvc. It is now exposed directly by
162-
the [zend-filter](https://zendframework.github.io/zend-filter/) component
162+
the [zend-filter](https://docs.zendframework.com/zend-filter/) component
163163
itself. To add it, install zend-filter:
164164

165165
```bash
@@ -201,7 +201,7 @@ provided specifications to zend-modulemanager's `ServiceListener`
201201
to allow modules to provide hydrator configuration.
202202

203203
This functionality is now removed from zend-mvc. It is now exposed directly by
204-
the [zend-hydrator](https://zendframework.github.io/zend-hydrator/) component
204+
the [zend-hydrator](https://docs.zendframework.com/zend-hydrator/) component
205205
itself. To add it, install zend-hydrator:
206206

207207
```bash
@@ -218,7 +218,7 @@ provided specifications to zend-modulemanager's `ServiceListener`
218218
to allow modules to provide validator configuration.
219219

220220
This functionality is now removed from zend-mvc. It is now exposed directly by
221-
the [zend-inputfilter](https://zendframework.github.io/zend-inputfilter/) component
221+
the [zend-inputfilter](https://docs.zendframework.com/zend-inputfilter/) component
222222
itself. To add it, install zend-inputfilter:
223223

224224
```bash
@@ -240,8 +240,8 @@ Internationalization tooling, including:
240240
- the `TranslatorAwareTreeRouteStack` implementation
241241
- factories for the translator and translator loader managers
242242

243-
were removed, and re-assigned to the [zend-i18n](https://zendframework.github.io/zend-i18n/)
244-
and [zend-mvc-i18n](https://zendframework.github.io/zend-mvc-i18n/) packages.
243+
were removed, and re-assigned to the [zend-i18n](https://docs.zendframework.com/zend-i18n/)
244+
and [zend-mvc-i18n](https://docs.zendframework.com/zend-mvc-i18n/) packages.
245245
In most cases, you can install `zendframework/zend-mvc-i18n` to restore i18n
246246
functionality to your application:
247247

@@ -261,9 +261,9 @@ Second, if you were extending one of the service factories for either the
261261
factories have changed. In such situations, you have two options:
262262

263263
- Update your extensions to extend the new classes. See the [zend-mvc-i18n
264-
migration guide](https://zendframework.github.io/zend-mvc-i18n/migration/v2-to-v3/)
264+
migration guide](https://docs.zendframework.com/zend-mvc-i18n/migration/v2-to-v3/)
265265
to determine what names have changed.
266-
- Instead of extending, consider using [delegator factories](https://zendframework.github.io/zend-servicemanager/delegators/),
266+
- Instead of extending, consider using [delegator factories](https://docs.zendframework.com/zend-servicemanager/delegators/),
267267
as these decorate the service factory, regardless of what factory is used.
268268

269269
## Log integration
@@ -273,7 +273,7 @@ services by default, and provided specifications to zend-modulemanager's
273273
`ServiceListener` to allow modules to provide configuration for each.
274274

275275
This functionality is now removed from zend-mvc. It is now exposed directly by
276-
the [zend-log](https://zendframework.github.io/zend-log/) component
276+
the [zend-log](https://docs.zendframework.com/zend-log/) component
277277
itself. To add it, install zend-log:
278278

279279
```bash
@@ -400,7 +400,7 @@ provided specifications to zend-modulemanager's `ServiceListener`
400400
to allow modules to provide validator configuration.
401401

402402
This functionality is now removed from zend-mvc. It is now exposed directly by
403-
the [zend-validator](https://zendframework.github.io/zend-validator/) component
403+
the [zend-validator](https://docs.zendframework.com/zend-validator/) component
404404
itself. To add it, install zend-validator:
405405

406406
```bash

docs/book/plugins.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ class SomeController extends AbstractActionController
7272

7373
The above would return a standard `Zend\View\Model\ViewModel` instance if no
7474
criterias are met, and the specified view model types if a specific criteria
75-
is met. Rules are matched in order, with the first match "winning".
76-
Make sure to put your fallback view model *first* as a fallback for unknown
75+
is met. Rules are matched in order, with the first match "winning".
76+
Make sure to put your fallback view model *first* as a fallback for unknown
7777
content types or `*/*`.
7878

79-
> Browsers are sending `*/*` as last content type of the Accept header so you have to define every
79+
> Browsers are sending `*/*` as last content type of the Accept header so you have to define every
8080
> acceptable view model and their content type.
8181
8282
## Forward Plugin

docs/book/routing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,4 +722,4 @@ echo $this->url('packages.zendframework.com/index', [], [], true);
722722
## Console Route Types
723723

724724
zend-mvc also allows routing Console based applications; console routes are
725-
explained in the [zend-console routing documentation](http://zendframework.github.io/zend-console/routes/).
725+
explained in the [zend-console routing documentation](http://docs.zendframework.com/zend-console/routes/).

docs/book/send-response-event.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Class | Priority | Method
2222
------------------------------------------------------------ | -------: | ------------- | -----------
2323
`Zend\Mvc\SendResponseListener\PhpEnvironmentResponseSender` | -1000 | `__invoke` | This is used in HTTP contexts (this is the most often used).
2424
`Zend\Mvc\SendResponseListener\ConsoleResponseSender` | -2000 | `__invoke` | This is used in console contexts.
25-
`Zend\Mvc\SendResponseListener\SimpleStreamResponseSender` | -3000 | `__invoke` |
25+
`Zend\Mvc\SendResponseListener\SimpleStreamResponseSender` | -3000 | `__invoke` |
2626

2727
Because each listener has negative priority, adding your own logic to modify the
2828
`Response` involves adding a new listener without priority (as priority defaults

docs/book/services.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ As a quick review, the following service types may be configured:
4848
service manager as an argument, the resolved service name, and the requested
4949
service name; it **must** be a class or object implementing
5050
`Zend\ServiceManager\AbstractFactoryInterface`. See the section on
51-
[abstract factories](http://zendframework.github.io/zend-servicemanager/configuring-the-service-manager/#abstract-factories)
51+
[abstract factories](http://docs.zendframework.com/zend-servicemanager/configuring-the-service-manager/#abstract-factories)
5252
for configuration information.
5353
- **Aliases**, which alias one service name to another. Aliases can also
5454
reference other aliases.
@@ -107,7 +107,7 @@ services configured out of the box.
107107

108108
- If the controller implements `Zend\EventManager\EventManagerAwareInterface`,
109109
an instance of the `EventManager` will be injected into it.
110-
110+
111111
- Finally, an initializer will inject it with the `ControllerPluginManager`
112112
service, as long as the `setPluginManager` method is implemented.
113113

@@ -126,7 +126,7 @@ services configured out of the box.
126126
- If the `adapter` subkey is present, it is used to get the adapter
127127
instance, otherwise, `Zend\Console\Console::detectBestAdapter()` will be
128128
called to configure an adapter instance.
129-
129+
130130
- If the `charset` subkey is present, the value is used to set the adapter
131131
charset.
132132

@@ -166,7 +166,7 @@ services configured out of the box.
166166

167167
- `FilterManager`, mapping to `Zend\Mvc\Service\FilterManagerFactory`. This
168168
instantiates the `Zend\Filter\FilterPluginManager` instance, passing it the
169-
service manager instance; this is used to manage filters for [filter chains](http://zendframework.github.io/zend-filter/filter-chains/).
169+
service manager instance; this is used to manage filters for [filter chains](http://docs.zendframework.com/zend-filter/filter-chains/).
170170
It also uses the `DiAbstractServiceFactory` service, effectively allowing
171171
you to fall back to DI in order to retrieve filters.
172172

@@ -380,7 +380,7 @@ return [
380380
];
381381
```
382382

383-
See the [cache documentation](https://zendframework.github.io/zend-cache/storage/adapter/)
383+
See the [cache documentation](https://docs.zendframework.com/zend-cache/storage/adapter/)
384384
for more configuration options.
385385

386386
### Zend\\Db\\Adapter\\AdapterAbstractServiceFactory
@@ -469,7 +469,7 @@ return [
469469
];
470470
```
471471

472-
See the [log documentation](https://zendframework.github.io/zend-log/intro/)
472+
See the [log documentation](https://docs.zendframework.com/zend-log/intro/)
473473
for more configuration options.
474474

475475
## Plugin Managers

0 commit comments

Comments
 (0)