Skip to content

Commit

Permalink
Merge pull request #37 from laminas/1.8.x-merge-up-into-2.0.x_CuxmMeqC
Browse files Browse the repository at this point in the history
Merge release 1.8.0 into 2.0.x
  • Loading branch information
Ocramius committed Nov 6, 2023
2 parents 1c9f8d8 + 669a00f commit 8069c46
Show file tree
Hide file tree
Showing 5 changed files with 492 additions and 498 deletions.
2 changes: 1 addition & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ignore_php_platform_requirements": {
"8.2": true
"8.3": true
}
}
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
[![Build Status](https://github.com/laminas/laminas-mvc-i18n/workflows/Continuous%20Integration/badge.svg)](https://github.com/laminas/laminas-mvc-i18n/actions?query=workflow%3A"Continuous+Integration")

> ## 🇷🇺 Русским гражданам
>
>
> Мы, участники Laminas, родились и живем в разных странах. У многих из нас есть друзья, родственники и коллеги как в России, так и в Украине. Некоторые из нас родились в России. Некоторые из нас живут в России. У некоторых бабушки и дедушки сражались с фашистами во Второй мировой войне. Здесь никто не поддерживает фашизм.
>
>
> У одного из нас есть украинская родственница, которая спаслась из дома вместе с сыном. Поезд задержался из-за бомбежки на дороге впереди. У нас есть друзья, которые прячутся в бомбоубежищах. Мы с тревогой ждем весточки от них после воздушных налетов, которые беспорядочно наносят удары и попадают по больницам, школам, детским садам и домам. Мы не берем это из каких-либо СМИ. Мы наблюдаем это напрямую.
>
>
> Вы доверяете нам достаточно, чтоб использовать наши программы, и мы просим вас довериться нам вновь. Мы нуждаемся в помощи. Выходите и протестуйте против этой бесполезной войны. Остановите кровопролитие. Скажите "Нет войне!"
>
>
> ## 🇺🇸 To Citizens of Russia
>
>
> 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.
>
>
> 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.
>
>
> 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!"
laminas-mvc-i18n provides integration between:
Expand All @@ -27,13 +27,13 @@ laminas-mvc-i18n provides integration between:
and replaces the i18n functionality found in the v2 releases of the latter
two components.

- File issues at https://github.com/laminas/laminas-mvc-i18n/issues
- Documentation is at https://docs.laminas.dev/laminas-mvc-i18n/
- File issues at <https://github.com/laminas/laminas-mvc-i18n/issues>
- Documentation is at <https://docs.laminas.dev/laminas-mvc-i18n/>

## Installation

```console
$ composer require laminas/laminas-mvc-i18n
composer require laminas/laminas-mvc-i18n
```

Assuming you are using the [component installer](https://docs.laminas.dev/laminas-component-installer/),
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"config": {
"sort-packages": true,
"platform": {
"php": "8.0.99"
"php": "8.1.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
Expand All @@ -32,7 +32,7 @@
}
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"ext-intl": "*",
"container-interop/container-interop": "^1.1",
"laminas/laminas-i18n": "^2.13.0",
Expand All @@ -42,11 +42,11 @@
"laminas/laminas-validator": "^2.19.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.4.0",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpunit/phpunit": "^9.5.26",
"psalm/plugin-phpunit": "^0.18.0",
"vimeo/psalm": "^5.0.0"
"laminas/laminas-coding-standard": "~2.5.0",
"phpspec/prophecy-phpunit": "^2.0.2",
"phpunit/phpunit": "^9.6.13",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.15"
},
"conflict": {
"laminas/laminas-mvc": "<3.0.0",
Expand Down
Loading

0 comments on commit 8069c46

Please sign in to comment.