Skip to content

Commit

Permalink
Merge pull request #41 from gsteel/plugin-manager-type-inference
Browse files Browse the repository at this point in the history
Improve plugin manager type inference
  • Loading branch information
Ocramius authored Jul 12, 2022
2 parents 27248ad + 350e546 commit 2d6a9d2
Show file tree
Hide file tree
Showing 22 changed files with 456 additions and 455 deletions.
2 changes: 0 additions & 2 deletions .coveralls.yml

This file was deleted.

13 changes: 7 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
/.coveralls.yml export-ignore
/.gitattributes export-ignore
/.github/ export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/docs/ export-ignore
/mkdocs.yml export-ignore
/test/ export-ignore
/.gitignore export-ignore
/.laminas-ci.json export-ignore
/.gitattributes export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/test/ export-ignore
/psalm.xml export-ignore
/psalm-baseline.xml export-ignore
/mkdocs.yml export-ignore
14 changes: 7 additions & 7 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-paginator/workflows/Continuous%20Integration/badge.svg)](https://github.com/laminas/laminas-paginator/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-paginator is a flexible component for paginating collections of data and
Expand Down
11 changes: 7 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
"sort-packages": true,
"platform": {
"php": "7.4.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"extra": {
Expand All @@ -30,19 +33,19 @@
"require": {
"php": "^7.4 || ~8.0.0 || ~8.1.0",
"ext-json": "*",
"laminas/laminas-stdlib": "^3.6.2"
"laminas/laminas-stdlib": "^3.10.1"
},
"require-dev": {
"laminas/laminas-cache": "^3.1.2",
"laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
"laminas/laminas-coding-standard": "^2.3.0",
"laminas/laminas-config": "^3.7.0",
"laminas/laminas-filter": "^2.13.0",
"laminas/laminas-servicemanager": "^3.10.0",
"laminas/laminas-servicemanager": "^3.14.0",
"laminas/laminas-view": "^2.15.0",
"phpunit/phpunit": "^9.5.10",
"phpunit/phpunit": "^9.5.21",
"psalm/plugin-phpunit": "^0.16.1",
"vimeo/psalm": "^4.15.0"
"vimeo/psalm": "^4.24.0"
},
"suggest": {
"laminas/laminas-cache": "Laminas\\Cache component to support cache features",
Expand Down
Loading

0 comments on commit 2d6a9d2

Please sign in to comment.