Skip to content

Commit de00225

Browse files
authored
Merge pull request #100 from cod43156/php8.4-support
Php8.4 support
2 parents 5bbe6c8 + 9a361fc commit de00225

File tree

17 files changed

+667
-598
lines changed

17 files changed

+667
-598
lines changed

.laminas-ci.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"ignore_php_platform_requirements": {
3+
"8.4": true
4+
}
5+
}

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
[![Build Status](https://github.com/laminas/laminas-di/workflows/continuous-integration.yml/badge.svg)](https://github.com/laminas/laminas-di/actions/workflows/continuous-integration.yml)
44

55
> ## 🇷🇺 Русским гражданам
6-
>
6+
>
77
> Мы, участники Laminas, родились и живем в разных странах. У многих из нас есть друзья, родственники и коллеги как в России, так и в Украине. Некоторые из нас родились в России. Некоторые из нас живут в России. У некоторых бабушки и дедушки сражались с фашистами во Второй мировой войне. Здесь никто не поддерживает фашизм.
8-
>
8+
>
99
> У одного из нас есть украинская родственница, которая спаслась из дома вместе с сыном. Поезд задержался из-за бомбежки на дороге впереди. У нас есть друзья, которые прячутся в бомбоубежищах. Мы с тревогой ждем весточки от них после воздушных налетов, которые беспорядочно наносят удары и попадают по больницам, школам, детским садам и домам. Мы не берем это из каких-либо СМИ. Мы наблюдаем это напрямую.
10-
>
10+
>
1111
> Вы доверяете нам достаточно, чтоб использовать наши программы, и мы просим вас довериться нам вновь. Мы нуждаемся в помощи. Выходите и протестуйте против этой бесполезной войны. Остановите кровопролитие. Скажите "Нет войне!"
12-
>
12+
>
1313
> ## 🇺🇸 To Citizens of Russia
14-
>
14+
>
1515
> 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.
16-
>
16+
>
1717
> 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.
18-
>
18+
>
1919
> 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!"
2020
2121
laminas-di provides autowiring to implement Inversion of Control (IoC) containers.
@@ -27,19 +27,19 @@ laminas-di is designed to be simple, fast and reusable. It provides the followin
2727

2828
- Constructor injection
2929
- Autowiring:
30-
- Recursively through all dependencies
31-
- With configured type preferences
32-
- with configured injections
33-
- With injections passed in the create() call
30+
- Recursively through all dependencies
31+
- With configured type preferences
32+
- with configured injections
33+
- With injections passed in the create() call
3434
- Code generators to create factories usable by other IoC containers like Laminas\ServiceManager
3535

3636
It does __not__ provide:
3737

3838
- Setter, interface, property or any other injection method than constructor injection
3939
- Support for factories
4040
- Declaring shared/unshared instances
41-
- the injector always creates new instances
42-
- the default container always shares instances
41+
- the injector always creates new instances
42+
- the default container always shares instances
4343
- Support for variadic arguments in __construct
4444

4545
If you need these features combine it with another IoC container such as

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,26 @@
3232
}
3333
},
3434
"require": {
35-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
35+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
3636
"laminas/laminas-stdlib": "^3.18.0",
3737
"psr/container": "^1.1.1",
3838
"psr/log": "^1.1.4 || ^2.0.0 || ^3.0.0"
3939
},
4040
"require-dev": {
4141
"laminas/laminas-coding-standard": "~2.5.0",
4242
"laminas/laminas-servicemanager": "^3.22",
43-
"mikey179/vfsstream": "^1.6.11@alpha",
43+
"mikey179/vfsstream": "^1.6.12",
4444
"phpbench/phpbench": "^1.2.7",
45-
"phpunit/phpunit": "^9.5.26",
45+
"phpunit/phpunit": "^9.6.22",
4646
"psalm/plugin-phpunit": "^0.18.0",
4747
"squizlabs/php_codesniffer": "^3.7.1",
4848
"vimeo/psalm": "^5.0"
4949
},
5050
"conflict": {
5151
"zendframework/zend-di": "*",
5252
"laminas/laminas-servicemanager-di": "*",
53-
"laminas/laminas-servicemanager": "<3.13.0 || >=4.0.0"
53+
"laminas/laminas-servicemanager": "<3.13.0 || >=4.0.0",
54+
"amphp/amp": "<2.6.4"
5455
},
5556
"suggest": {
5657
"laminas/laminas-servicemanager": "An IoC container without auto wiring capabilities"

0 commit comments

Comments
 (0)