Skip to content

Commit 58a8c56

Browse files
authored
Merge pull request #89 from gsteel/fix-readme-lint
Readme Linting Fixes
2 parents f5a0053 + b3d47f4 commit 58a8c56

File tree

1 file changed

+23
-32
lines changed

1 file changed

+23
-32
lines changed

README.md

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# laminas-mvc-skeleton
22

33
> ## 🇷🇺 Русским гражданам
4-
>
4+
>
55
> Мы, участники Laminas, родились и живем в разных странах. У многих из нас есть друзья, родственники и коллеги как в России, так и в Украине. Некоторые из нас родились в России. Некоторые из нас живут в России. У некоторых бабушки и дедушки сражались с фашистами во Второй мировой войне. Здесь никто не поддерживает фашизм.
6-
>
6+
>
77
> У одного из нас есть украинская родственница, которая спаслась из дома вместе с сыном. Поезд задержался из-за бомбежки на дороге впереди. У нас есть друзья, которые прячутся в бомбоубежищах. Мы с тревогой ждем весточки от них после воздушных налетов, которые беспорядочно наносят удары и попадают по больницам, школам, детским садам и домам. Мы не берем это из каких-либо СМИ. Мы наблюдаем это напрямую.
8-
>
8+
>
99
> Вы доверяете нам достаточно, чтоб использовать наши программы, и мы просим вас довериться нам вновь. Мы нуждаемся в помощи. Выходите и протестуйте против этой бесполезной войны. Остановите кровопролитие. Скажите "Нет войне!"
10-
>
10+
>
1111
> ## 🇺🇸 To Citizens of Russia
12-
>
12+
>
1313
> We at Laminas come from all over the world. Many of us have friends, family and colleagues in both Russia and Ukraine. Some of us were born in Russia. Some of us currently live in Russia. Some have grandparents who fought Nazis in World War II. Nobody here supports fascism.
14-
>
14+
>
1515
> One team member has a Ukrainian relative who fled her home with her son. The train was delayed due to bombing on the road ahead. We have friends who are hiding in bomb shelters. We anxiously follow up on them after the air raids, which indiscriminately fire at hospitals, schools, kindergartens and houses. We're not taking this from any media. These are our actual experiences.
16-
>
16+
>
1717
> You trust us enough to use our software. We ask that you trust us to say the truth on this. We need your help. Go out and protest this unnecessary war. Stop the bloodshed. Say "stop the war!"
1818
1919
## Introduction
@@ -43,9 +43,8 @@ $ php -S 0.0.0.0:8080 -t public
4343
$ composer serve
4444
```
4545

46-
This will start the cli-server on port 8080, and bind it to all network
47-
interfaces. You can then visit the site at http://localhost:8080/
48-
- which will bring up Laminas MVC Skeleton welcome page.
46+
This will start the cli-server on port 8080, and bind it to all network interfaces.
47+
You can then visit the site at http://localhost:8080/ which will bring up Laminas MVC Skeleton welcome page.
4948

5049
**Note:** The built-in CLI server is *for development only*.
5150

@@ -66,7 +65,7 @@ configuration in `config/autoload/development.local.php.dist`. Enabling
6665
development mode will copy these files to versions removing the `.dist` suffix,
6766
while disabling development mode will remove those copies.
6867

69-
Development mode is automatically enabled as part of the skeleton installation process.
68+
Development mode is automatically enabled as part of the skeleton installation process.
7069
After making changes to one of the above-mentioned `.dist` configuration files you will
7170
either need to disable then enable development mode for the changes to take effect,
7271
or manually make matching updates to the `.dist`-less copies of those files.
@@ -97,7 +96,7 @@ control. (If you want to make the modifications permanent, edit the
9796
## Running Psalm Static Analysis
9897

9998
To run the supplied skeleton static analysis, you need to do one of the following:
100-
It is recommended to install the test components from laminas (laminas/laminas-test),
99+
It is recommended to install the test components from laminas (laminas/laminas-test),
101100
as this is used in the tests supplied.
102101

103102
```bash
@@ -112,10 +111,8 @@ $ composer static-analysis
112111

113112
## Using docker-compose
114113

115-
This skeleton provides a `docker-compose.yml` for use with
116-
[docker-compose](https://docs.docker.com/compose/); it
117-
uses the provided `Dockerfile` to build a docker image
118-
for the `laminas` container created with `docker-compose`.
114+
This skeleton provides a `docker-compose.yml` for use with [docker-compose](https://docs.docker.com/compose/);
115+
it uses the provided `Dockerfile` to build a docker image for the `laminas` container created with `docker-compose`.
119116

120117
Build and start the image and container using:
121118

@@ -125,19 +122,16 @@ $ docker-compose up -d --build
125122

126123
At this point, you can visit http://localhost:8080 to see the site running.
127124

128-
You can also run commands such as `composer` in the container. The container
129-
environment is named "laminas" so you will pass that value to
130-
`docker-compose run`:
125+
You can also run commands such as `composer` in the container.
126+
The container environment is named "laminas" so you will pass that value to `docker-compose run`:
131127

132128
```bash
133129
$ docker-compose run laminas composer install
134130
```
135131

136-
Some composer packages optionally use additional PHP extensions.
137-
The Dockerfile contains several commented-out commands
138-
which enable some of the more popular php extensions.
139-
For example, to install `pdo-pgsql` support for `laminas/laminas-db`
140-
uncomment the lines:
132+
Some composer packages optionally use additional PHP extensions.
133+
The Dockerfile contains several commented-out commands which enable some of the more popular php extensions.
134+
For example, to install `pdo-pgsql` support for `laminas/laminas-db` uncomment the lines:
141135

142136
```sh
143137
# RUN apt-get install --yes libpq-dev \
@@ -153,8 +147,8 @@ then re-run the `docker-compose up -d --build` line as above.
153147

154148
### Apache setup
155149

156-
To setup apache, setup a virtual host to point to the public/ directory of the
157-
project and you should be ready to go! It should look something like below:
150+
To setup apache, setup a virtual host to point to the public/ directory of the project and you should be ready to go!
151+
It should look something like below:
158152

159153
```apache
160154
<VirtualHost *:80>
@@ -174,9 +168,7 @@ project and you should be ready to go! It should look something like below:
174168

175169
### Nginx setup
176170

177-
To setup nginx, open your `/path/to/nginx/nginx.conf` and add an
178-
[include directive](http://nginx.org/en/docs/ngx_core_module.html#include) below
179-
into `http` block if it does not already exist:
171+
To setup nginx, open your `/path/to/nginx/nginx.conf` and add an [include directive](http://nginx.org/en/docs/ngx_core_module.html#include) below into `http` block if it does not already exist:
180172

181173
```nginx
182174
http {
@@ -185,9 +177,8 @@ http {
185177
}
186178
```
187179

188-
189-
Create a virtual host configuration file for your project under `/path/to/nginx/sites-enabled/laminasapp.localhost.conf`
190-
it should look something like below:
180+
Create a virtual host configuration file for your project under `/path/to/nginx/sites-enabled/laminasapp.localhost.conf`.
181+
It should look something like below:
191182

192183
```nginx
193184
server {

0 commit comments

Comments
 (0)